From 0a206f3acb9af0ec9db650861d34a256cda1c960 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 26 二月 2026 17:48:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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..29dd3f7 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){
@@ -378,7 +380,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;
@@ -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