From 56fcde8c93a1a10bc50fac775e370a2db57f520e Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 20 一月 2026 17:08:30 +0800
Subject: [PATCH] 小程序 接口开发
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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..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
@@ -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<>();
@@ -88,21 +87,19 @@
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));
}
- num++;
}
index++;
}
-
-
if(addList.size()>0){
//鎵归噺鎻掑叆鏁版嵁
memberCouponMapper.insert(addList);
}
- return "鎿嶄綔鎴愬姛,鎴愬姛浜哄憳鏁伴噺锛�"+num+",鍏卞彂鏀句紭鎯犲埜鏁伴噺锛�"+addList.size();
+ return "鎿嶄綔鎴愬姛,鎴愬姛浜哄憳鏁伴噺锛�"+memberList.size()+",鍏卞彂鏀句紭鎯犲埜鏁伴噺锛�"+addList.size();
}
+/*
private MemberCoupon initMemberCouponByParam(Coupon coupon, Member member, LoginUserInfo loginUserInfo ,Date now) {
MemberCoupon insert = new MemberCoupon();
@@ -115,6 +112,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)){
@@ -137,6 +135,7 @@
insert.setCouponId(coupon.getId());
return insert;
}
+*/
private Coupon getCouponFromListById(Integer id, List<Coupon> couponList) {
for(Coupon c : couponList){
@@ -176,12 +175,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 +194,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 +316,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 +341,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())){
@@ -657,11 +659,6 @@
}
-
-
-
-
-
/**
* 璁＄畻褰撳墠宸查�夋嫨浼樻儬鍒告瘡涓晢鍝佸崰姣旈噾棰�
* @param coupon 浼樻儬鍒镐俊鎭�
@@ -718,6 +715,9 @@
response.setUseCoupon(idList.contains(Constants.equalsInteger(vaildType,Constants.ZERO)?response.getId().toString():response.getCategoryId().toString())?true:false);
}
}
+
+
+
// public Set<Integer> isVaildUse(List<String> idList,List<OrderGoodsCalculateResponse> goodsList,Integer vaildType){
// List<OrderGoodsCalculateResponse> resultList = new ArrayList<>();
// for (String id:idList) {
--
Gitblit v1.9.3