From 28db820caf0ed90f4326d29cb0fa7a19cba92775 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 27 二月 2026 16:33:03 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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..f51ae78 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){
@@ -330,6 +332,9 @@
queryWrapper.eq( MemberCoupon::getStatus, Constants.ZERO);
queryWrapper.lt( MemberCoupon::getEndDate, new Date());
}
+
+ queryWrapper.in(pageWrap.getModel().getMethodList()!=null,MemberCoupon::getGetMethod, pageWrap.getModel().getMethodList());
+ queryWrapper.eq(pageWrap.getModel().getCouponId()!=null,MemberCoupon::getCouponId, pageWrap.getModel().getCouponId());
queryWrapper.eq(pageWrap.getModel().getOrderCode()!=null,Goodsorder::getCode, pageWrap.getModel().getOrderCode());
queryWrapper.eq(pageWrap.getModel().getGetMethod()!=null,MemberCoupon::getGetMethod, pageWrap.getModel().getGetMethod());
queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getNikeName()),ms -> ms.like( Member::getNickname, pageWrap.getModel().getNikeName()).
@@ -378,7 +383,7 @@
.apply(Objects.nonNull(status)&&Constants.equalsInteger(status,Constants.TWO),"m.STATUS = 0 and m.END_DATE < now() " )
.eq("TYPE",couponType)
.apply(!Objects.isNull(price)," m.LIMIT_PRICE >= "+price+" ")
- .apply(" now() between m.START_DATE and m.END_DATE ")
+// .apply(" now() between m.START_DATE and m.END_DATE ")
.orderByDesc(" m.PRICE ")
);
return page;
@@ -518,10 +523,7 @@
memberCoupon.setBackIntegral(BigDecimal.ZERO);
memberCoupon.setName(coupon.getName());
memberCouponMapper.insert(memberCoupon);
- //TODO 娣诲姞绉垎鍙樺姩璁板綍
- //鏇存柊鐢ㄦ埛绉垎
- memberMapper.subtractIntegral(memberId,memberCoupon.getIntegral());
}
@@ -542,6 +544,7 @@
//鏌ヨ鍟嗗搧鍒楄〃
List<Goods> goodsList = goodsMapper.selectJoinList(Goods.class,
new MPJLambdaWrapper<Goods>()
+ .selectAll(Goods.class)
.selectAs(GoodsSku::getPrice,Goods::getSkuPrice)
.selectAs(GoodsSku::getId,Goods::getSkuId)
.leftJoin(GoodsSku.class,GoodsSku::getGoodsId,Goods::getId)
--
Gitblit v1.9.3