From 7b223c4dfdc960a6172bac87e47ab1b86b90ba1a Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 21 一月 2026 09:47:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index e9eb54b..0663bae 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -1726,6 +1726,8 @@
List<JSONObject> shareCouponRewardList = platformConfigDTO.getShareCouponRewardList();
//[{"num":"2","couponId":6},{"num":"3","couponId":5}]
+ String couponIds = "";
+ String couponNames = "";
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(shareCouponRewardList)){
List<MemberCoupon> memberCouponList = new ArrayList<>();
for (JSONObject jsonObject:shareCouponRewardList) {
@@ -1739,6 +1741,8 @@
for (int i = 0; i < num; i++) {
memberCouponList.add(memberCoupon);
}
+ couponIds = couponIds + (StringUtils.isBlank(couponIds)? ",":"" )+ couponId ;
+ couponNames = couponNames + (StringUtils.isBlank(couponNames)? ",":"" )+ coupon.getName() ;
}
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberCouponList)){
memberCouponJoinMapper.insert(memberCouponList);
@@ -1747,6 +1751,8 @@
inviteRecordMapper.update(new UpdateWrapper<InviteRecord>().lambda()
.set(InviteRecord::getFirstOrderStatus,Constants.ONE)
.set(InviteRecord::getFirstFinishDate,new Date())
+ .set(InviteRecord::getCouponIds,couponIds)
+ .set(InviteRecord::getCouponNames,couponNames)
.eq(InviteRecord::getId,inviteRecord.getId())
);
}
--
Gitblit v1.9.3