From 8fe5f041dc11630bfdc36e6698f0dc67616cf91d Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 15 一月 2026 10:45:15 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 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 ad565c4..ae76be3 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
@@ -11,6 +11,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.dto.CouponDTO;
import com.doumee.dao.web.dto.MemberCouponDTO;
import com.doumee.dao.web.request.PayDetailRequest;
@@ -173,20 +174,39 @@
IPage<MemberCoupon> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<MemberCoupon> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
-
queryWrapper.selectAll(MemberCoupon.class);
queryWrapper.selectAs(Member::getNickname,MemberCoupon::getNikeName);
-
+ queryWrapper.selectAs(Goodsorder::getCode,MemberCoupon::getOrderCode);
+ queryWrapper.selectAs(Goodsorder::getCouponPrice,MemberCoupon::getCouponPrice);//浼樻儬閲戦
+ queryWrapper.selectAs(SystemUser::getUsername,MemberCoupon::getCreatorName);
queryWrapper.leftJoin(Member.class,Member::getId,MemberCoupon::getMemberId);
-
+ queryWrapper.leftJoin(Goodsorder.class,Goodsorder::getId,MemberCoupon::getOrderId);
+ queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,MemberCoupon::getCreator);
queryWrapper.eq(MemberCoupon::getIsdeleted, Constants.ZERO);
- queryWrapper.eq(pageWrap.getModel().getStatus()!=null,MemberCoupon::getStatus, pageWrap.getModel().getStatus());
+ if(pageWrap.getModel().getStatus()!=null && pageWrap.getModel().getStatus()!=2){
+ queryWrapper.eq(pageWrap.getModel().getStatus()!=null,MemberCoupon::getStatus, pageWrap.getModel().getStatus());
+ } else if (pageWrap.getModel().getStatus()!=null && pageWrap.getModel().getStatus()==2) {
+ //鏌ヨ宸茶繃鏈�(鏈娇鐢紝鍒囧凡杩囦簡浣跨敤鏈熼檺锛�
+ queryWrapper.eq( MemberCoupon::getStatus, Constants.ZERO);
+ queryWrapper.lt( MemberCoupon::getEndDate, new Date());
+ }
+ 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()).
or().eq( Member::getName, pageWrap.getModel().getNikeName()).
or().eq( Member::getPhone, pageWrap.getModel().getNikeName()));
queryWrapper.orderByDesc(MemberCoupon::getCreateDate);
IPage<MemberCoupon> result = memberCouponJoinMapper.selectJoinPage(page, MemberCoupon.class, queryWrapper);
+ if(result!=null && result.getRecords()!=null){
+ for(MemberCoupon model :result.getRecords()){
+ if(Constants.equalsInteger(model.getStatus(),Constants.ZERO)
+ && model.getEndDate()!=null
+ && model.getEndDate().before(new Date())){
+ //宸茶繃鏈�
+ model.setStatus(Constants.TWO);
+ }
+ }
+ }
return PageData.from(result);
}
@@ -252,7 +272,6 @@
}
}
}
-
return memberCouponResponse;
}
--
Gitblit v1.9.3