优惠券使用

src/main/java/com/dk/oauth/entity/CompanyVO.java

@@ -403,6 +403,19 @@ public class CompanyVO extends PageInfo<CompanyVO> implements Serializable {
     @TableField(typeHandler = TimestampTypeHandler.class)
     private LocalDateTime shareEndDate;
 
+    /**
+     * @desc : -功能包 授权 续费的优惠券使用ID
+     */
+    @ApiModelProperty(value = "优惠券使用ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String couponUseId;
+
+    /**
+     * 积分-功能包 授权 续费的使用积分
+     */
+    @ApiModelProperty(value = "积分")
+    private Integer integral;
+
 
     /*
      * 相关属性

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

@@ -37,6 +37,7 @@
         <result column="cp_name" property="cpName"/>
         <result column="coupon_id" property="couponId" typeHandler="UuidTypeHandler"/>
         <result column="coupon_name" property="couponName" />
+        <result column="discount" property="discount"/>
         <result column="use_valid_days" property="useValidDays"/>
         <result column="receive_date" property="receiveDate" typeHandler="TimestampTypeHandler"/>
         <result column="use_date" property="useDate" typeHandler="TimestampTypeHandler"/>
@@ -98,6 +99,7 @@
         SELECT
         <include refid="Base_Column_List_Response"/>
         ,tmc.coupon_name
+        ,tmc.discount
         ,tac.cp_name
         FROM dkic_a.t_mst_coupon_use tmcu
         left join dkic_a.t_mst_coupon tmc on tmc.coupon_id = tmcu.coupon_id

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

@@ -78,9 +78,9 @@ public class CouponUseVO{
      */
     @Excel(name = "获取日期")
     @ApiModelProperty(value = "获取日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime receiveDate;
+    private LocalDate receiveDate;
 
 
     /**
@@ -88,9 +88,9 @@ public class CouponUseVO{
      */
     @Excel(name = "核销日期")
     @ApiModelProperty(value = "核销日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime useDate;
+    private LocalDate useDate;
 
 
     /**

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

@@ -84,9 +84,9 @@ public class CouponUse extends PageInfo<CouponUse> implements Serializable {
      */
     @Excel(name = "获取日期")
     @ApiModelProperty(value = "获取日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime receiveDate;
+    private LocalDate receiveDate;
 
 
     /**
@@ -94,9 +94,9 @@ public class CouponUse extends PageInfo<CouponUse> implements Serializable {
      */
     @Excel(name = "核销日期")
     @ApiModelProperty(value = "核销日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime useDate;
+    private LocalDate useDate;
 
 
     /**

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

@@ -69,9 +69,9 @@ public class CouponUseQuery extends PageInfo<CouponUseQuery>  {
      */
     @Excel(name = "获取日期")
     @ApiModelProperty(value = "获取日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime receiveDate;
+    private LocalDate receiveDate;
 
 
     /**
@@ -79,9 +79,9 @@ public class CouponUseQuery extends PageInfo<CouponUseQuery>  {
      */
     @Excel(name = "核销日期")
     @ApiModelProperty(value = "核销日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime useDate;
+    private LocalDate useDate;
 
 
     /**

src/main/java/com/dk/oauth/model/response/integral/CouponUseResponse.java

@@ -17,6 +17,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
@@ -78,9 +79,9 @@ public class CouponUseResponse {
      */
     @Excel(name = "获取日期")
     @ApiModelProperty(value = "获取日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime receiveDate;
+    private LocalDate receiveDate;
 
 
     /**
@@ -88,9 +89,9 @@ public class CouponUseResponse {
      */
     @Excel(name = "核销日期")
     @ApiModelProperty(value = "核销日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime useDate;
+    private LocalDate useDate;
 
 
     /**
@@ -150,6 +151,12 @@ public class CouponUseResponse {
     @ApiModelProperty(value = "优惠券名称")
     private String couponName;
 
+    /**
+     * 折扣
+     */
+    @ApiModelProperty(value = "折扣")
+    private BigDecimal discount;
+
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/oauth/service/impl/CompanyServiceImpl.java

@@ -272,12 +272,12 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         UserLogin userLogin = userMapper.selectById(companyVO.getOwner());
 
         //  来源公司Id 分享的截止日期时间 是否超过 当前的日期时间 说明过期了，过期不加积分 240724
-        log.info("邀请分享的记录：原公司id：{},截止日期：{},当前时间：{},",companyVO.getCpIdFrom(),companyVO.getShareEndDate(),LocalDateTime.now());
+        log.info("邀请分享的记录：原公司id：{},截止日期：{},当前时间：{},", companyVO.getCpIdFrom(), companyVO.getShareEndDate(), LocalDateTime.now());
         if (companyVO.getCpIdFrom() != null && companyVO.getShareEndDate() != null
                 && companyVO.getShareEndDate().compareTo(LocalDateTime.now()) > 0) {
             // 积分策略 share_reg_integral	 分享注册积分
             List<IntegralTacticResponse> integralTacticResponses = integralTacticMapper.selectByCond(new IntegralTacticQuery());
-            log.info("积分策略：{},",integralTacticResponses);
+            log.info("积分策略：{},", integralTacticResponses);
             if (integralTacticResponses != null && integralTacticResponses.size() > 0) {
                 IntegralTacticResponse integralTactic = integralTacticResponses.get(0);
                 // 积分明细 新公司的
@@ -300,13 +300,13 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
                 integralQuery.setFlgValid(true);
                 List<IntegralResponse> integralResponses = integralMapper.selectByCond(integralQuery);
                 if (integralResponses != null && integralResponses.size() > 0) {
-                    integral.setIntegral(integralTactic.getRegIntegral()  );
+                    integral.setIntegral(integralTactic.getRegIntegral());
                     integralMapper.updateById(integral);
-                }else{
+                } else {
                     integral.setIntegral(integralTactic.getRegIntegral());
                     integralMapper.insert(integral);
                 }
-                log.info("积分 新公司的：{},",integral);
+                log.info("积分 新公司的：{},", integral);
                 // 积分明细 来源公司公司的
                 integralItem = new IntegralItem();
 //                邀请的注册
@@ -329,11 +329,11 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
                 if (integralResponses != null && integralResponses.size() > 0) {
                     integral.setIntegral(integralTactic.getShareRegIntegral());
                     integralMapper.updateById(integral);
-                }else{
+                } else {
                     integral.setIntegral(integralTactic.getShareRegIntegral());
                     integralMapper.insert(integral);
                 }
-                log.info("积分 来源公司公司的：{},",integral);
+                log.info("积分 来源公司公司的：{},", integral);
             }
         }
 
@@ -609,6 +609,8 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         trade.setActivityItemIds(companyVO.getActivityItemIds());
         // 前台传入 暂时用这个字段
         trade.setStaffName(companyVO.getStaffNameFrom());
+        trade.setIntegral(companyVO.getIntegral() != null ? companyVO.getIntegral() : 0);
+        trade.setCouponUseId(companyVO.getCouponUseId());
         tradeMapper.insert(trade);
 
         return ResponseResultUtil.success(trade);
@@ -655,6 +657,8 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         trade.setTradeDesc(companyVO.getRemarks());
         // 前台传入 暂时用这个字段
         trade.setStaffName(companyVO.getStaffNameFrom());
+        trade.setIntegral(companyVO.getIntegral() != null ? companyVO.getIntegral() : 0);
+        trade.setCouponUseId(companyVO.getCouponUseId());
         tradeMapper.insert(trade);
         return ResponseResultUtil.success(trade);
     }
@@ -730,9 +734,9 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
      */
     public ResponseResultVO<Map<String, Object>> getCurrentDate(Map<String, Object> param) {
         Map<String, Object> res = new HashMap<>();
-        if (param.get("flgTime") !=null){
+        if (param.get("flgTime") != null) {
             res.put("currentDate", LocalDateTime.now());
-        }else{
+        } else {
             res.put("currentDate", LocalDate.now());
         }
         return ResponseResultUtil.success(res);

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

@@ -138,7 +138,7 @@ public class CouponReceiveService extends BaseService<CouponReceive> {
                     CouponResponse couponResponse = couponMapper.selectById(couponSendResponse.getCouponId());
                     couponUse.setUseValidDays(couponResponse.getUseValidDays());
                     //获取日期
-                    couponUse.setReceiveDate(LocalDateTime.now());
+                    couponUse.setReceiveDate(LocalDate.now());
                     //优惠券状态
                     couponUse.setCouponStatus(Constant.couponStatus.WEI_SHI_YONG.getName());
                     //获取用户

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

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.List;
@@ -96,7 +97,7 @@ public class CouponUseService extends BaseService<CouponUse> {
                 //优惠券状态
                 couponUse.setCouponStatus(Constant.couponStatus.YI_SHI_YONG.getName());
                 //核销日期
-                couponUse.setUseDate(LocalDateTime.now());
+                couponUse.setUseDate(LocalDate.now());
                 //更新
                 couponUseMapper.update(couponUse,
                         new UpdateWrapper<CouponUse>().lambda()
@@ -125,12 +126,14 @@ public class CouponUseService extends BaseService<CouponUse> {
         if (couponUseResponseList != null && couponUseResponseList.size() > 0) {
             for (CouponUseResponse couponUseResponse : couponUseResponseList) {
                 //过期时间
-                long beOverdueTime = couponUseResponse.getReceiveDate().plusDays(couponUseResponse.getUseValidDays()).toInstant(ZoneOffset.of("+8")).toEpochMilli();
+                LocalDate beOverdueTime = couponUseResponse.getReceiveDate().plusDays(couponUseResponse.getUseValidDays())
+                         ;
                 //当前时间
-                long nowTime = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+//                long nowTime = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+                LocalDate nowTime = LocalDate.now();
                 log.info("过期时间:{},当前时间:{}",beOverdueTime,nowTime);
                 //当前时间大于过期时间   优惠券已过期
-                if ((nowTime / 1000) > (beOverdueTime / 1000)) {
+                if (nowTime.compareTo(beOverdueTime) >= 0) {
                     //类型转换
                     CouponUse couponUse = new CouponUse();
                     //优惠券使用id
@@ -138,7 +141,7 @@ public class CouponUseService extends BaseService<CouponUse> {
                     //优惠券状态
                     couponUse.setCouponStatus(Constant.couponStatus.YI_SHI_XIAO.getName());
                     //核销日期
-                    couponUse.setUseDate(LocalDateTime.now());
+                    couponUse.setUseDate(LocalDate.now());
                     //更新
                     couponUseMapper.update(couponUse,
                             new UpdateWrapper<CouponUse>().lambda()

src/main/java/com/dk/oauth/service/wxapi/basic/WechatPayService.java

@@ -188,7 +188,7 @@ public class WechatPayService {
             //优惠券状态
             couponUse.setCouponStatus(Constant.couponStatus.YI_SHI_YONG.getName());
             //核销日期
-            couponUse.setUseDate(LocalDateTime.now());
+            couponUse.setUseDate(LocalDate.now());
             // 使用员工
             couponUse.setUseStaff(trade.getStaffName());
             //更新