From cc21e1edcd06cd9fcece59c83f568f3bd3dd65ef Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 4 Dec 2025 15:29:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=B8=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/service/impl/MkShopCouponRecordServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 a7dec33ba..bf3d57b21 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 @@ -520,6 +520,7 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl Date: Thu, 4 Dec 2025 15:57:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8F=91=E6=94=BE=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/market/entity/ChatMessage.java | 113 ++++++++++++++++++ .../service/MkShopCouponRecordService.java | 5 +- .../market/mapper/ChatMessageMapper.java | 14 +++ .../impl/MkShopCouponRecordServiceImpl.java | 21 +++- .../resources/mapper/ChatMessageMapper.xml | 7 ++ 5 files changed, 157 insertions(+), 3 deletions(-) create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/market/entity/ChatMessage.java create mode 100644 cash-service/market-service/src/main/java/com/czg/service/market/mapper/ChatMessageMapper.java create mode 100644 cash-service/market-service/src/main/resources/mapper/ChatMessageMapper.xml diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ChatMessage.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ChatMessage.java new file mode 100644 index 000000000..ddd82d195 --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ChatMessage.java @@ -0,0 +1,113 @@ +package com.czg.market.entity; + +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.annotation.Table; +import java.io.Serializable; +import java.math.BigInteger; +import java.time.LocalDateTime; + +import java.io.Serial; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +/** + * 聊天消息表 实体类。 + * + * @author ww + * @since 2025-12-04 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Table("chat_message") +@Accessors(chain = true) +public class ChatMessage implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 消息ID + */ + @Id(keyType = KeyType.Auto) + private BigInteger id; + + /** + * 发送者ID + */ + private String fromId; + + /** + * 接收者ID（单聊=对方ID，群聊=群ID） + */ + private String toId; + + /** + * 群ID + */ + private String groupId; + + /** + * 聊天类型：1=单聊，2=群聊 + */ + private Integer chatType; + + /** + * 消息类型：1=文本/常用语/表情，2=图片，3=订单, 4 优惠券 5视频 + */ + private Integer msgType; + + /** + * 文本/表情代码/常用语ID（仅msg_type=1） + */ + private String content; + + /** + * 图片URL（仅msg_type=2） + */ + private String imageUrl; + + /** + * 订单ID（仅msg_type=3） + */ + private String orderId; + + /** + * 优惠券信息 （仅msg_type=4） + */ + private String coupon; + + /** + * 是否已读：0=未读，1=已读 + */ + private Integer isRead; + + /** + * 发送时间 + */ + private LocalDateTime sendTime; + + /** + * 会话ID：单聊=min(from,to)_max(from,to)，群聊=group_群ID + */ + private String sessionId; + + private Long shopId; + + /** + * chat_coupon的 id + */ + private Long chatCouponId; + + /** + * 1 领取 + */ + private Integer couponClaim; + +} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java index 7aabfa0d7..32541c33c 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java @@ -66,10 +66,13 @@ public interface MkShopCouponRecordService extends IService Boolean grant(Long shopId, MkRewardCouponDTO rewardCouponDTO, String source); + /** + * 组装 群聊活动优惠券 + */ MkShopCouponRecord assembleRecord(Long chatCouponId, ShopCoupon coupon); /** - * 优惠券发放 + * 群聊活动优惠券发放 */ void grantChatCoupon(MkShopCouponRecord record, Integer number); diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/ChatMessageMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/ChatMessageMapper.java new file mode 100644 index 000000000..a6dbf835d --- /dev/null +++ b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/ChatMessageMapper.java @@ -0,0 +1,14 @@ +package com.czg.service.market.mapper; + +import com.mybatisflex.core.BaseMapper; +import com.czg.market.entity.ChatMessage; + +/** + * 聊天消息表 映射层。 + * + * @author ww + * @since 2025-12-04 + */ +public interface ChatMessageMapper extends BaseMapper { + +} 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 bf3d57b21..cad2a5cda 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 @@ -19,12 +19,14 @@ import com.czg.account.vo.CouponReceiveVo; import com.czg.account.vo.UserCouponVo; import com.czg.exception.CzgException; import com.czg.market.dto.*; +import com.czg.market.entity.ChatMessage; import com.czg.market.entity.MkShopCouponRecord; import com.czg.market.entity.ShopCoupon; import com.czg.market.entity.SmsPushEventUser; import com.czg.market.service.MkShopCouponRecordService; import com.czg.market.vo.CouponRecordCountVO; import com.czg.market.vo.UserCouponVO; +import com.czg.service.market.mapper.ChatMessageMapper; import com.czg.service.market.mapper.MkShopCouponRecordMapper; import com.czg.service.market.mapper.ShopCouponMapper; import com.czg.utils.AssertUtil; @@ -37,6 +39,7 @@ import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboService; +import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.time.LocalTime; @@ -66,6 +69,8 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl TARGET_KEY = Arrays.asList("消费赠券", "充值赠券", "管理员赠送", "兑换码兑换", "群聊发放", "生日赠券", "购买会员赠券", "短信发放", "公众号发放", "用户弹窗领取"); @@ -544,6 +549,7 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl { q.eq(ShopCoupon::getId, coupon.getSyncId()).or(q1 -> { diff --git a/cash-service/market-service/src/main/resources/mapper/ChatMessageMapper.xml b/cash-service/market-service/src/main/resources/mapper/ChatMessageMapper.xml new file mode 100644 index 000000000..910747060 --- /dev/null +++ b/cash-service/market-service/src/main/resources/mapper/ChatMessageMapper.xml @@ -0,0 +1,7 @@ + + + + + From 0501fc24e843e28375b87fa1a5247dd1efef6fb2 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 4 Dec 2025 16:33:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9C=89=E6=95=88=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/service/impl/MkShopCouponRecordServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 cad2a5cda..4f272a9d9 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 @@ -538,6 +538,7 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl Date: Thu, 4 Dec 2025 17:28:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8F=91=E6=94=BE=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E8=AE=B0=E5=BD=95=E5=9B=9E=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/mapper/ChatMessageMapper.java | 14 ------------- .../service/impl/ChatCouponServiceImpl.java | 10 ++++++++- .../impl/MkShopCouponRecordServiceImpl.java | 21 +++++-------------- .../resources/mapper/ChatMessageMapper.xml | 7 ------- 4 files changed, 14 insertions(+), 38 deletions(-) delete mode 100644 cash-service/market-service/src/main/java/com/czg/service/market/mapper/ChatMessageMapper.java delete mode 100644 cash-service/market-service/src/main/resources/mapper/ChatMessageMapper.xml diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/ChatMessageMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/ChatMessageMapper.java deleted file mode 100644 index a6dbf835d..000000000 --- a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/ChatMessageMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.czg.service.market.mapper; - -import com.mybatisflex.core.BaseMapper; -import com.czg.market.entity.ChatMessage; - -/** - * 聊天消息表 映射层。 - * - * @author ww - * @since 2025-12-04 - */ -public interface ChatMessageMapper extends BaseMapper { - -} diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java index ab4e98d70..992e1d57c 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java @@ -3,6 +3,7 @@ package com.czg.service.market.service.impl; import com.alibaba.fastjson2.JSONObject; import com.czg.exception.CzgException; import com.czg.market.dto.ChatCouponDTO; +import com.czg.market.dto.MkShopCouponGiftDTO; import com.czg.market.entity.MkShopCouponRecord; import com.czg.market.entity.ShopCoupon; import com.czg.market.service.MkShopCouponRecordService; @@ -128,7 +129,14 @@ public class ChatCouponServiceImpl extends ServiceImpl TARGET_KEY = Arrays.asList("消费赠券", "充值赠券", "管理员赠送", "兑换码兑换", "群聊发放", "生日赠券", "购买会员赠券", "短信发放", "公众号发放", "用户弹窗领取"); @@ -313,6 +309,7 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl recordList = new ArrayList<>(); for (int i = 0; i < number; i++) { MkShopCouponRecord record = new MkShopCouponRecord(); record.setShopId(giftDTO.getShopId()); @@ -385,8 +383,9 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl - - - -