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

cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopCouponRecord.java

@@ -1,5 +1,6 @@
 package com.czg.market.entity;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
@@ -105,17 +106,21 @@ public class MkShopCouponRecord implements Serializable {
      * 领取时间
      */
     @Column(onInsertValue = "now()")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     /**
      * 使用时间
      */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime useTime;
 
     /**
      * 过期时间
      */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime useEndTime;
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime useStartTime;
     /**
      * 有效期类型：fixed（固定时间），custom（自定义时间）
@@ -134,6 +139,7 @@ public class MkShopCouponRecord implements Serializable {
     private Integer daysToTakeEffect;
 
     @Column(onInsertValue = "now()", onUpdateValue = "now()")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
     private String couponJson;

cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java

@@ -1,5 +1,6 @@
 package com.czg.market.entity;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
@@ -87,11 +88,13 @@ public class ShopCoupon implements Serializable {
     /**
      * 有效期开始时间
      */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime validStartTime;
 
     /**
      * 有效期结束时间
      */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime validEndTime;
 
     /**

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java

@@ -67,11 +67,12 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
     @Resource
     private ShopCouponMapper couponService;
 
-    private static final List<String> TARGET_KEY = Arrays.asList("消费赠券", "充值赠券", "管理员赠送", "兑换码兑换", "生日赠券", "购买会员赠券", "短信发放", "公众号发放", "用户弹窗领取");
+    private static final List<String> TARGET_KEY = Arrays.asList("消费赠券", "充值赠券", "管理员赠送", "兑换码兑换", "群聊发放", "生日赠券", "购买会员赠券", "短信发放", "公众号发放", "用户弹窗领取");
 
     private static final Map<String, String> SOURCE_TO_CATEGORY = Map.of(
             "用户弹窗领取", "用户领取",
             "兑换码兑换", "用户领取",
+            "群聊发放", "群聊发放",
             "短信发放", "推广发放",
             "公众号发放", "推广发放",
             "管理员赠送", "管理员赠送",

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java

@@ -201,6 +201,9 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
     @Override
     public void addCoupon(ShopCouponDTO param) {
         ShopCoupon coupon = BeanUtil.toBean(param, ShopCoupon.class);
+        if (coupon.getValidEndTime() != null) {
+            coupon.setValidEndTime(coupon.getValidEndTime().with(LocalTime.MAX));
+        }
         save(coupon);
         param.setId(coupon.getId());
     }