From fa668c325f2dac348fb9f80c0c6c679f9ce1e41b Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 10 三月 2026 18:28:17 +0800
Subject: [PATCH] 小程序 接口开发
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/IntegralServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/IntegralServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/IntegralServiceImpl.java
index abb185f..3b1fa6a 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/IntegralServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/IntegralServiceImpl.java
@@ -68,6 +68,9 @@
private GoodsorderMapper goodsorderMapper;
@Autowired
+ private GoodsorderDetailMapper goodsorderDetailMapper;
+
+ @Autowired
private NoticeService noticeService;
@Autowired
@@ -160,7 +163,7 @@
integral.setIsdeleted(Constants.ZERO);
integral.setTitle(dealIntegralRequest.getIntegralObjType().getName());
String info = dealIntegralRequest.getIntegralObjType().getNoteinfo();
- info = info.replace("${param}",dealIntegralRequest.getIntegralNum().intValue()+"");
+ info = info.replace("${param}",dealIntegralRequest.getIntegralNum()+"");
if(StringUtils.isNotBlank(dealIntegralRequest.getParam1())){
info = info .replace("${param1}",dealIntegralRequest.getParam1());
}
@@ -185,7 +188,7 @@
//绔欏唴淇�
noticeService.saveMemberIntegralNotice(
- dealIntegralRequest.getIntegralObjType(),Constants.ONE,member.getId(),dealIntegralRequest.getIntegralNum(),
+ dealIntegralRequest.getIntegralObjType(),Constants.ZERO,member.getId(),dealIntegralRequest.getIntegralNum(),
integral.getId(), info
);
return integral.getId();
@@ -268,9 +271,9 @@
shopMapper.update(null,new UpdateWrapper<Shop>().lambda()
.eq(Shop::getId,shop.getId())
.set(Shop::getEditDate,new Date())
- .setSql(dealIntegralRequest.getDealType().equals(Constants.ZERO),"total_integral = ifnull(total_integral,0)+" + dealIntegralRequest.getIntegralNum())//绱澧炲姞
- .setSql(dealIntegralRequest.getDealType().equals(Constants.ZERO),"integral = ifnull(integral,0)+" + dealIntegralRequest.getIntegralNum())
- .setSql(dealIntegralRequest.getDealType().equals(Constants.ONE),"integral = ifnull(integral,0)-" + dealIntegralRequest.getIntegralNum()));
+ .setSql(dealIntegralRequest.getDealType().equals(Constants.ZERO),"TOTAL_AMOUNT = ifnull(TOTAL_AMOUNT,0)+" + dealIntegralRequest.getIntegralNum())//绱澧炲姞
+ .setSql(dealIntegralRequest.getDealType().equals(Constants.ZERO),"AMOUNT = ifnull(AMOUNT,0)+" + dealIntegralRequest.getIntegralNum())
+ .setSql(dealIntegralRequest.getDealType().equals(Constants.ONE),"AMOUNT = ifnull(AMOUNT,0)-" + dealIntegralRequest.getIntegralNum()));
return integral.getId();
}
@@ -615,12 +618,14 @@
.reduce(BigDecimal.ZERO, BigDecimal::add)
);
integralDataResponse.setWaitPayAmount(
- goodsorderMapper.selectList(new QueryWrapper<Goodsorder>().lambda()
+ goodsorderDetailMapper.selectJoinList(GoodsorderDetail.class,new MPJLambdaWrapper<GoodsorderDetail>()
+ .selectAll(GoodsorderDetail.class)
+ .leftJoin(Goodsorder.class,Goodsorder::getId,GoodsorderDetail::getOrderId)
.eq(Goodsorder::getDistributionShopId,model.getMemberId())
.in(Goodsorder::getStatus,Constants.OrderStatus.WAIT_PAY.getKey(),
Constants.OrderStatus.PAY_DONE.getKey(),
Constants.OrderStatus.WAIT_RECEIVE.getKey())
- ).stream().map(Goodsorder::getShopSettlement)
+ ).stream().map(GoodsorderDetail::getShopSettlement)
.reduce(BigDecimal.ZERO, BigDecimal::add)
);
}
--
Gitblit v1.9.3