Merge remote-tracking branch 'origin/dev_member_voucher_refund' into dev_member_voucher_refund

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/pom.xml

@@ -33,11 +33,12 @@
             <artifactId>liquidnet-service-adam-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.liquidnet</groupId>-->
-<!--            <artifactId>liquidnet-service-adam-api</artifactId>-->
-<!--            <version>1.0-SNAPSHOT</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-candy-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
 
         <dependency>
             <groupId>com.liquidnet</groupId>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/candy/service/ICandyMgtCouponAdminService.java

+package com.liquidnet.client.admin.zhengzai.candy.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.candy.dto.admin.CandyMgtCouponInfoDto;
+import com.liquidnet.service.candy.dto.admin.CandyMgtCouponListParam;
+import com.liquidnet.service.candy.entity.CandyMgtCoupon;
+
+import java.util.List;
+
+public interface ICandyMgtCouponAdminService extends IService<CandyMgtCoupon> {
+
+    List<CandyMgtCouponInfoDto> listForMgtCouponInfoDto(CandyMgtCouponListParam listParam);
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/candy/service/impl/CandyMgtCouponAdminServiceImpl.java

+package com.liquidnet.client.admin.zhengzai.candy.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.client.admin.zhengzai.candy.service.ICandyMgtCouponAdminService;
+import com.liquidnet.service.candy.dto.admin.CandyMgtCouponInfoDto;
+import com.liquidnet.service.candy.dto.admin.CandyMgtCouponListParam;
+import com.liquidnet.service.candy.entity.CandyMgtCoupon;
+import com.liquidnet.service.candy.mapper.CandyCouponMapper;
+import com.liquidnet.service.candy.mapper.CandyMgtCouponMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Slf4j
+@Service
+public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMapper, CandyMgtCoupon> implements ICandyMgtCouponAdminService {
+    @Autowired
+    private CandyMgtCouponMapper candyMgtCouponMapper;
+    @Autowired
+    private CandyCouponMapper candyCouponMapper;
+
+    @Override
+    public List<CandyMgtCouponInfoDto> listForMgtCouponInfoDto(CandyMgtCouponListParam listParam) {
+        return candyMgtCouponMapper.selectMultiForMgtCouponInfoDto(listParam);
+    }
+}

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/CandyUserCouponBasicDto.java

@@ -5,13 +5,14 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 @Data
 public class CandyUserCouponBasicDto implements Serializable {
     private static final long serialVersionUID = 4073256621782131605L;
 
-    /* --- --- --- CandyCoupon */
+    /* com.liquidnet.service.candy.entity.CandyCoupon */
     private String couponId;
     //private Integer state;
     private String title;
@@ -33,21 +34,23 @@ public class CandyUserCouponBasicDto implements Serializable {
     private LocalDateTime redeemStop;
     private LocalDateTime effectAt;
     private LocalDateTime expireAt;
+    //private String operator;
+    //private Date createdAt;
+    //private Date updatedAt;
     //private String comment;
 
-    /* --- --- --- CandyUserCoupon */
+    /* com.liquidnet.service.candy.entity.CandyUserCoupon */
     private String ucouponId;
     //private String mcouponId;
     private String uid;
     //private String couponId;
     private Integer state;
-    private LocalDateTime bindAt;
     private String redeemCode;
-    private LocalDateTime redeemAt;
+    private LocalDateTime bindAt;
     private LocalDateTime usedAt;
     private String usedFor;
     //private String comment;
 
-    /* --- --- --- CandyCouponRule */
+    /* com.liquidnet.service.candy.entity.CandyCouponRule */
     private List<CandyCouponRuleDto> useRules;
 }

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/admin/CandyMgtCouponInfoDto.java

+package com.liquidnet.service.candy.dto.admin;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class CandyMgtCouponInfoDto implements Serializable {
+    private static final long serialVersionUID = -7067688702993697665L;
+
+    /* com.liquidnet.service.candy.entity.CandyCoupon */
+    private String couponId;
+    //private Integer state;
+    private String title;
+    private String label;
+    private String notice;
+    private Integer exclusive;
+    private Integer busiType;
+    private Integer couType;
+    private Integer bindType;
+    private BigDecimal discount;
+    private BigDecimal valFace;
+    private BigDecimal valOver;
+    private BigDecimal valMinus;
+    private Integer overlay;
+    private Integer overlayLevel;
+    private Integer validity;
+    private Integer redeemValidity;
+    private LocalDateTime redeemStart;
+    private LocalDateTime redeemStop;
+    private LocalDateTime effectAt;
+    private LocalDateTime expireAt;
+    //private String operator;
+    //private Date createdAt;
+    //private Date updatedAt;
+    //private String comment;
+
+    /* com.liquidnet.service.candy.entity.CandyMgtCoupon */
+    private String mcouponId;
+    //private String couponId;
+    private Integer state;
+    private Integer eventAmt;
+    private Integer eventType;
+    private String eventLimit;
+    private LocalDateTime eventAt;
+    private String operator;
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
+    //private String comment;
+}

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/admin/CandyMgtCouponListParam.java

+package com.liquidnet.service.candy.dto.admin;
+
+import lombok.Data;
+
+@Data
+public class CandyMgtCouponListParam {
+    /**
+     * 券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券]
+     */
+    private Integer couType;
+    /**
+     * 搜索关键字
+     */
+    private String keyword;
+    /**
+     * 领取方式[0-用户输入兑换｜1-发放至用户]
+     */
+    private Integer bindType;
+    /**
+     * 业务类别[0-全场｜1-演出｜2-商品｜3-优先购|4-会员]
+     */
+    private Integer busiType;
+}

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/entity/CandyCoupon.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -127,6 +129,15 @@ public class CandyCoupon implements Serializable {
      */
     private LocalDateTime expireAt;
 
+    /**
+     * 操作人
+     */
+    private String operator;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
     private String comment;
 
 

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/entity/CandyMgtCoupon.java

@@ -36,11 +36,6 @@ public class CandyMgtCoupon implements Serializable {
      */
     private Integer state;
 
-    /**
-     * 领取方式[0-用户输入兑换｜1-发放至用户]
-     */
-    private Integer bindType;
-
     /**
      * 发放量
      */

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/entity/CandyUserCoupon.java

@@ -46,20 +46,15 @@ public class CandyUserCoupon implements Serializable {
      */
     private Integer state;
 
-    /**
-     * 入账时间
-     */
-    private LocalDateTime bindAt;
-
     /**
      * 兑换码
      */
     private String redeemCode;
 
     /**
-     * 兑换时间
+     * 激活时间
      */
-    private LocalDateTime redeemAt;
+    private LocalDateTime bindAt;
 
     /**
      * 使用时间

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/mapper/CandyMgtCouponMapper.java

 package com.liquidnet.service.candy.mapper;
 
-import com.liquidnet.service.candy.entity.CandyMgtCoupon;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.candy.dto.admin.CandyMgtCouponInfoDto;
+import com.liquidnet.service.candy.dto.admin.CandyMgtCouponListParam;
+import com.liquidnet.service.candy.entity.CandyMgtCoupon;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CandyMgtCouponMapper extends BaseMapper<CandyMgtCoupon> {
 
+    /**
+     * <p>
+     * 查取券发放列表
+     * </p>
+     *
+     * @param listParam CandyMgtCouponListParam
+     * @return List<CandyMgtCouponInfoDto>
+     */
+    List<CandyMgtCouponInfoDto> selectMultiForMgtCouponInfoDto(CandyMgtCouponListParam listParam);
 }

liquidnet-bus-do/liquidnet-service-candy-do/src/main/resources/com/liquidnet/service/candy/mapper/CandyMgtCouponMapper.xml

@@ -2,4 +2,86 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.liquidnet.service.candy.mapper.CandyMgtCouponMapper">
 
-</mapper>
+    <resultMap id="Rst_MgtCouponInfoDto" type="com.liquidnet.service.candy.dto.admin.CandyMgtCouponInfoDto">
+        <result column="coupon_id" jdbcType="VARCHAR" property="couponId"/>
+        <!--        <result column="state" jdbcType="TINYINT" property="state" />-->
+        <result column="title" jdbcType="VARCHAR" property="title"/>
+        <result column="label" jdbcType="VARCHAR" property="label"/>
+        <result column="notice" jdbcType="VARCHAR" property="notice"/>
+        <result column="exclusive" jdbcType="SMALLINT" property="exclusive"/>
+        <result column="busi_type" jdbcType="SMALLINT" property="busiType"/>
+        <result column="cou_type" jdbcType="SMALLINT" property="couType"/>
+        <result column="bind_type" jdbcType="SMALLINT" property="bindType"/>
+        <result column="discount" jdbcType="DECIMAL" property="discount"/>
+        <result column="val_face" jdbcType="DECIMAL" property="valFace"/>
+        <result column="val_over" jdbcType="DECIMAL" property="valOver"/>
+        <result column="val_minus" jdbcType="DECIMAL" property="valMinus"/>
+        <result column="overlay" jdbcType="TINYINT" property="overlay"/>
+        <result column="overlay_level" jdbcType="TINYINT" property="overlayLevel"/>
+        <result column="validity" jdbcType="INTEGER" property="validity"/>
+        <result column="redeem_validity" jdbcType="INTEGER" property="redeemValidity"/>
+        <result column="redeem_start" jdbcType="TIMESTAMP" property="redeemStart"/>
+        <result column="redeem_stop" jdbcType="TIMESTAMP" property="redeemStop"/>
+        <result column="effect_at" jdbcType="TIMESTAMP" property="effectAt"/>
+        <result column="expire_at" jdbcType="TIMESTAMP" property="expireAt"/>
+        <!--        <result column="operator" jdbcType="VARCHAR" property="operator" />-->
+        <!--        <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />-->
+        <!--        <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />-->
+        <!--        <result column="comment" jdbcType="VARCHAR" property="comment" />-->
+
+        <result column="mcoupon_id" jdbcType="VARCHAR" property="mcouponId"/>
+        <!--        <result column="coupon_id" jdbcType="VARCHAR" property="couponId" />-->
+        <result column="state" jdbcType="TINYINT" property="state"/>
+        <result column="bind_type" jdbcType="SMALLINT" property="bindType"/>
+        <result column="event_amt" jdbcType="INTEGER" property="eventAmt"/>
+        <result column="event_type" jdbcType="TINYINT" property="eventType"/>
+        <result column="event_limit" jdbcType="VARCHAR" property="eventLimit"/>
+        <result column="event_at" jdbcType="TIMESTAMP" property="eventAt"/>
+        <result column="operator" jdbcType="VARCHAR" property="operator"/>
+        <result column="created_at" jdbcType="TIMESTAMP" property="createdAt"/>
+        <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt"/>
+        <!--        <result column="comment" jdbcType="VARCHAR" property="comment" />-->
+    </resultMap>
+
+    <sql id="Rst_MgtCouponInfoDto_Column_List">
+
+    </sql>
+
+    <select id="selectMultiForMgtCouponInfoDto" resultMap="Rst_MgtCouponInfoDto">
+        SELECT cc.coupon_id,
+               cc.title,
+               cc.`label`,
+               cc.notice,
+               cc.`exclusive`,
+               cc.busi_type,
+               cc.cou_type,
+               cc.bind_type,
+               cc.discount,
+               cc.val_face,
+               cc.val_over,
+               cc.val_minus,
+               cc.`overlay`,
+               cc.overlay_level,
+               cc.validity,
+               cc.redeem_validity,
+               cc.redeem_start,
+               cc.redeem_stop,
+               cc.effect_at,
+               cc.expire_at,
+
+               cmc.mcoupon_id,
+               cmc.coupon_id,
+               cmc.`state`,
+               cmc.bind_type,
+               cmc.event_amt,
+               cmc.event_type,
+               cmc.event_limit,
+               cmc.event_at,
+               cmc.`operator`,
+               cmc.created_at,
+               cmc.updated_at
+        FROM candy_mgt_coupon cmc
+                 LEFT JOIN candy_coupon cc ON cmc.coupon_id = cc.coupon_id
+        WHERE cmc.state <![CDATA[<>]] 2
+        ORDER BY cmc.created_at DESC </
+        select> </mapper>

liquidnet-bus-do/liquidnet-service-candy-do/src/main/resources/com/liquidnet/service/candy/mapper/CandyUserCouponMapper.xml

@@ -24,6 +24,9 @@
         <result column="redeem_stop" jdbcType="TIMESTAMP" property="redeemStop"/>
         <result column="effect_at" jdbcType="TIMESTAMP" property="effectAt"/>
         <result column="expire_at" jdbcType="TIMESTAMP" property="expireAt"/>
+        <!--        <result column="operator" jdbcType="VARCHAR" property="operator" />-->
+        <!--        <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />-->
+        <!--        <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />-->
         <!--        <result column="comment" jdbcType="VARCHAR" property="comment" />-->
 
         <result column="ucoupon_id" jdbcType="VARCHAR" property="ucouponId"/>
@@ -31,16 +34,18 @@
         <result column="uid" jdbcType="VARCHAR" property="uid"/>
         <!--        <result column="coupon_id" jdbcType="VARCHAR" property="couponId" />-->
         <result column="state" jdbcType="TINYINT" property="state"/>
-        <result column="bind_at" jdbcType="TIMESTAMP" property="bindAt"/>
         <result column="redeem_code" jdbcType="VARCHAR" property="redeemCode"/>
-        <result column="redeem_at" jdbcType="TIMESTAMP" property="redeemAt"/>
+        <result column="bind_at" jdbcType="TIMESTAMP" property="bindAt"/>
         <result column="used_at" jdbcType="TIMESTAMP" property="usedAt"/>
         <result column="used_for" jdbcType="VARCHAR" property="usedFor"/>
         <!--        <result column="comment" jdbcType="VARCHAR" property="comment" />-->
     </resultMap>
 
     <sql id="Rst_UserCouponBasicDto_Column_List">
-        cc.coupon_id, cc.title, cc.`label`, cc.notice, cc.`exclusive`, cc.busi_type, cc.cou_type,cc.bind_type,
+        cc
+        .
+        coupon_id
+        , cc.title, cc.`label`, cc.notice, cc.`exclusive`, cc.busi_type, cc.cou_type,cc.bind_type,
         cc.discount, cc.val_face, cc.val_over, cc.val_minus, cc.`overlay`, cc.overlay_level,
         cc.validity,cc.redeem_validity, cc.redeem_start, cc.redeem_stop, cc.effect_at, cc.expire_at,
 

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/docu/db_ln_candy_initialdata.sql

@@ -10,7 +10,7 @@ create table candy_mgt_coupon
     coupon_id   varchar(64) not null comment '~candy_coupon.coupon_id',
     state       tinyint comment '发放状态[0-未发放|1-已发放|2-无效｜9-发放中]',
 
-    bind_type   smallint comment '领取方式[0-用户输入兑换｜1-发放至用户]',
+#     bind_type   smallint comment '领取方式[0-用户输入兑换｜1-发放至用户]',
     event_amt   int comment '发放量',
     event_type  tinyint comment '发放类型[10-全体用户｜1-会员｜2-手机号]',
     event_limit text comment '`发放类型`为2-手机号时发放手机号以,分隔',
@@ -56,6 +56,10 @@ create table candy_coupon
     effect_at       datetime(3) comment '生效时间',
     expire_at       datetime(3) comment '过期时间',
 
+    operator        varchar(64) not null comment '操作人',
+    created_at      datetime(3) not null,
+    updated_at      datetime(3),
+
     comment         varchar(255)
 ) engine = InnoDB comment '券基础信息';
 create unique index uidx_candy_coupon_id on candy_coupon (coupon_id);
@@ -109,9 +113,8 @@ create table candy_user_coupon
     coupon_id   varchar(64) not null comment '~candy_coupon.coupon_id',
     state       tinyint comment '用户券状态[1-可用|2-无效｜3-已过期｜5-已使用]',
 
-    bind_at     datetime(3) comment '入账时间',
     redeem_code varchar(64) comment '兑换码',
-    redeem_at   datetime(3) comment '兑换时间',
+    bind_at     datetime(3) comment '激活时间',
     used_at     datetime(3) comment '使用时间',
     used_for    varchar(255) comment '用于记录购买的内容',
     comment     varchar(255)