From 82203a196fa700adfc379b2b453b2266266c940c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 15 一月 2026 18:14:25 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 c1c50ca..f2b1bdb 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
@@ -73,7 +73,6 @@
public String addBatch(MemberCouponAddDTO memberCoupon){
checkAddBatchParamValid(memberCoupon);
- int num = 0;
List<Coupon> couponList = getCouponListByParam(memberCoupon);
List<Member> memberList = getMemberListByParam(memberCoupon);
List<MemberCoupon> addList = new ArrayList<>();
@@ -90,17 +89,14 @@
//鎸ㄤ釜閫�
addList.add(initMemberCouponByParam(coupon,member,loginUserInfo,now));
}
- num++;
}
index++;
}
-
-
if(addList.size()>0){
//鎵归噺鎻掑叆鏁版嵁
memberCouponMapper.insert(addList);
}
- return "鎿嶄綔鎴愬姛,鎴愬姛浜哄憳鏁伴噺锛�"+num+",鍏卞彂鏀句紭鎯犲埜鏁伴噺锛�"+addList.size();
+ return "鎿嶄綔鎴愬姛,鎴愬姛浜哄憳鏁伴噺锛�"+memberList.size()+",鍏卞彂鏀句紭鎯犲埜鏁伴噺锛�"+addList.size();
}
@@ -115,6 +111,7 @@
insert.setMemberId(member.getId());
insert.setShopId(coupon.getShopId());
insert.setType(coupon.getType());
+ insert.setCouponType(coupon.getType());
insert.setLimitPrice(coupon.getLimitPrice());
insert.setPrice(coupon.getPrice());
if(Constants.equalsObject(coupon.getUseType(),Constants.ZERO)){
@@ -176,12 +173,13 @@
if(list == null || list.size()==0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈煡璇㈠埌鏈夋晥浼樻儬鍒告暟鎹�,璇峰埛鏂伴〉闈㈤噸璇曪紒");
}
-
return list;
}
private void checkAddBatchParamValid(MemberCouponAddDTO memberCoupon) {
- if(memberCoupon.getAddType() == null || memberCoupon.getAddCouponList()==null || memberCoupon.getAddCouponList().size()==0){
+ if(memberCoupon.getAddType() == null
+ || memberCoupon.getAddCouponList()==null
+ || memberCoupon.getAddCouponList().size()==0){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
if(Constants.equalsObject(memberCoupon.getAddType(),Constants.ZERO)){
@@ -194,7 +192,7 @@
if( StringUtils.isBlank(memberCoupon.getAddMemberPhones())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- String[] ss =memberCoupon.getAddMemberPhones().split("\n");
+ String[] ss =memberCoupon.getAddMemberPhones().replace(" ","").split("\n");
if(ss == null ||ss.length==0){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -316,6 +314,7 @@
MPJLambdaWrapper<MemberCoupon> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.selectAll(MemberCoupon.class);
+ queryWrapper.selectAs(Member::getPhone,MemberCoupon::getMemberPhone);
queryWrapper.selectAs(Member::getNickname,MemberCoupon::getNikeName);
queryWrapper.selectAs(Goodsorder::getCode,MemberCoupon::getOrderCode);
queryWrapper.selectAs(Goodsorder::getCouponPrice,MemberCoupon::getCouponPrice);//浼樻儬閲戦
@@ -340,6 +339,7 @@
IPage<MemberCoupon> result = memberCouponJoinMapper.selectJoinPage(page, MemberCoupon.class, queryWrapper);
if(result!=null && result.getRecords()!=null){
for(MemberCoupon model :result.getRecords()){
+ model.setNikeName(StringUtils.defaultString(model.getNikeName(),"")+" "+StringUtils.defaultString(model.getMemberPhone(),""));
if(Constants.equalsInteger(model.getStatus(),Constants.ZERO)
&& model.getEndDate()!=null
&& model.getEndDate().before(new Date())){
--
Gitblit v1.9.3