折扣 优惠券 使用

src/main/java/com/dk/oauth/mapper/integral/CouponUseMapper.xml

@@ -6,12 +6,12 @@
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
         use_id, cp_id, send_id, coupon_id, use_valid_days, receive_date, use_date, coupon_status, receive_user,
-        flg_valid,use_staff
+        flg_valid,use_staff,discount
     </sql>
     <!-- 通用查询列Response -->
     <sql id="Base_Column_List_Response">
         tmcu.use_id, tmcu.cp_id, tmcu.send_id, tmcu.coupon_id, tmcu.use_valid_days, tmcu.receive_date, tmcu.use_date,
-        tmcu.coupon_status, tmcu.receive_user, tmcu.flg_valid,tmcu.use_staff
+        tmcu.coupon_status, tmcu.receive_user, tmcu.flg_valid,tmcu.use_staff,tmcu.discount
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -27,6 +27,7 @@
         <result column="receive_user" property="receiveUser" typeHandler="UuidTypeHandler"/>
         <result column="flg_valid" property="flgValid"/>
         <result column="use_staff" property="useStaff"/>
+        <result column="discount" property="discount"/>
 
     </resultMap>
     <!-- 通用查询映射结果Response -->
@@ -101,7 +102,7 @@
         SELECT
         <include refid="Base_Column_List_Response"/>
         ,tmc.coupon_name
-        ,tmc.discount
+        ,tmcu.discount
         ,tac.cp_name
         ,tct.staff_name
         ,sys.f_get_name_i18n(tdk.kind_name_i18n, #{i18n}) as "trade_type"

src/main/java/com/dk/oauth/model/VO/integral/CouponReceiveVO.java

@@ -16,6 +16,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -115,6 +116,12 @@ public class CouponReceiveVO  {
     @ApiModelProperty(value = "发出的员工")
     private String staffName;
 
+    /**
+     * 折扣
+     */
+    @ApiModelProperty(value = "折扣")
+    private BigDecimal discount;
+
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/oauth/model/VO/integral/CouponUseVO.java

@@ -19,6 +19,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
@@ -131,6 +132,13 @@ public class CouponUseVO{
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
+    /**
+     * 折扣
+     */
+    @Excel(name = "折扣")
+    @ApiModelProperty(value = "折扣")
+    private BigDecimal discount;
+
 
     /*
      * 相关属性

src/main/java/com/dk/oauth/model/pojo/integral/CouponUse.java

@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.alibaba.fastjson.JSONObject;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.List;
 import java.time.LocalDateTime;
@@ -131,7 +132,12 @@ public class CouponUse extends PageInfo<CouponUse> implements Serializable {
     @ApiModelProperty(value = "积分")
     private Integer integral;
 
-
+    /**
+     * 折扣
+     */
+    @Excel(name = "折扣")
+    @ApiModelProperty(value = "折扣")
+    private BigDecimal discount;
 
     /**
      * 有效标识 (1：正常 0：停用)

src/main/java/com/dk/oauth/model/query/integral/CouponUseQuery.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
@@ -141,6 +142,13 @@ public class CouponUseQuery extends PageInfo<CouponUseQuery>  {
     @ApiModelProperty(value = "优惠券名称")
     private String couponName;
 
+    /**
+     * 折扣
+     */
+    @Excel(name = "折扣")
+    @ApiModelProperty(value = "折扣")
+    private BigDecimal discount;
+
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/oauth/service/integral/CouponReceiveService.java

@@ -152,6 +152,8 @@ public class CouponReceiveService extends BaseService<CouponReceive> {
                     couponUse.setReceiveUser(couponReceiveVO.getReceiveUser());
                     //  使用员工-发出的员工是同一个字段
                     couponUse.setUseStaff(couponReceiveVO.getStaffName());
+                    //   折扣
+                    couponUse.setDiscount(couponReceiveVO.getDiscount());
                     couponUseMapper.insert(couponUse);
                     //endregion