From e68e324f91d1a4eb2d4c5f07d27ca105a308bc0c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 20 一月 2026 18:05:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java
index f146ea2..2d94d81 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java
@@ -87,7 +87,7 @@
for(Member member : memberList){
for (int i = 0; i < Constants.formatLongNum(param.getNum()); i++) {
//鎸ㄤ釜閫�
- addList.add(initMemberCouponByParam(coupon,member,loginUserInfo,now));
+ addList.add(MemberCoupon.couponToBean(coupon,member,now,Constants.TWO,loginUserInfo));
}
}
index++;
@@ -99,6 +99,7 @@
return "鎿嶄綔鎴愬姛,鎴愬姛浜哄憳鏁伴噺锛�"+memberList.size()+",鍏卞彂鏀句紭鎯犲埜鏁伴噺锛�"+addList.size();
}
+/*
private MemberCoupon initMemberCouponByParam(Coupon coupon, Member member, LoginUserInfo loginUserInfo ,Date now) {
MemberCoupon insert = new MemberCoupon();
@@ -134,6 +135,7 @@
insert.setCouponId(coupon.getId());
return insert;
}
+*/
private Coupon getCouponFromListById(Integer id, List<Coupon> couponList) {
for(Coupon c : couponList){
--
Gitblit v1.9.3