From 24a2d37bcfcede05242ec10fa62c64b29856768f Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 3 Dec 2025 10:33:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/market/entity/MkShopCouponRecord.java | 6 ++++++ .../src/main/java/com/czg/market/entity/ShopCoupon.java | 3 +++ .../service/market/service/impl/ShopCouponServiceImpl.java | 3 +++ 3 files changed, 12 insertions(+) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopCouponRecord.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopCouponRecord.java index b509f4cc5..e8ad2a711 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopCouponRecord.java +++ b/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; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java index 04102c042..fe6652c08 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java +++ b/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; /** diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java index 312d0b2b0..11b827a9f 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java @@ -201,6 +201,9 @@ public class ShopCouponServiceImpl extends ServiceImpl Date: Wed, 3 Dec 2025 10:46:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/service/impl/MkShopCouponRecordServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java index b29798d3c..e8f2cad37 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java @@ -67,11 +67,12 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl TARGET_KEY = Arrays.asList("消费赠券", "充值赠券", "管理员赠送", "兑换码兑换", "生日赠券", "购买会员赠券", "短信发放", "公众号发放", "用户弹窗领取"); + private static final List TARGET_KEY = Arrays.asList("消费赠券", "充值赠券", "管理员赠送", "兑换码兑换", "群聊发放", "生日赠券", "购买会员赠券", "短信发放", "公众号发放", "用户弹窗领取"); private static final Map SOURCE_TO_CATEGORY = Map.of( "用户弹窗领取", "用户领取", "兑换码兑换", "用户领取", + "群聊发放", "群聊发放", "短信发放", "推广发放", "公众号发放", "推广发放", "管理员赠送", "管理员赠送",