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/dao/business/model/InviteRecord.java | 9 +++++++--
server/dmmall_service/src/main/java/com/doumee/service/business/impl/InviteRecordServiceImpl.java | 2 +-
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 11 +++++++++++
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java
index 0d1893a..e0ac58b 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java
@@ -64,8 +64,13 @@
@ApiModelProperty(value = "閭�璇峰鍔辩Н鍒�")
private BigDecimal rewardIntegral;
- @ApiModelProperty(value = "瀹屾垚棣栧崟濂栧姳绉垎")
- private BigDecimal firstRewardIntegral;
+ @ApiModelProperty(value = "閭�璇峰畬鎴愰鍗曞鍔变紭鎯犲埜涓婚敭 澶氫釜浠�,鍒嗗壊")
+ private String couponIds;
+
+ @ApiModelProperty(value = "閭�璇峰畬鎴愰鍗曞鍔变紭鎯犲埜鍚嶇О 澶氫釜浠�,鍒嗗壊")
+ private String couponNames;
+
+
@ApiModelProperty(value = "琚個璇蜂汉澶村儚")
@TableField(exist = false)
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 80590c6..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,11 +1741,20 @@
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);
}
}
+ 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())
+ );
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/InviteRecordServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/InviteRecordServiceImpl.java
index 1cac388..ea1979b 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/InviteRecordServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/InviteRecordServiceImpl.java
@@ -91,7 +91,7 @@
if(StringUtils.isNotBlank(inviteRecord.getImgUrl())){
inviteRecord.setImgUrl(path + inviteRecord.getImgUrl());
}
- num = num.add(inviteRecord.getRewardIntegral()).add(inviteRecord.getFirstRewardIntegral());
+ num = num.add(inviteRecord.getRewardIntegral());
}
inviteInfoResponse.setNum(num.longValue());
}
--
Gitblit v1.9.3