From cc6ab7021c3aef6ca3bbf05f8bcb5bfe0e6f6096 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 16:52:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 73e444b..0b3c4a2 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -1016,6 +1016,7 @@
model.setPayMoney(new BigDecimal(0.00));
model.setRefundMoney(new BigDecimal(0.00));
model.setClosedMoney(new BigDecimal(0.00));
+ model.setDiscountMoney(new BigDecimal(0.00));
model.setUnClosedMoney(new BigDecimal(0.00));
model.setClosedNum(0);
model.setUnClosedNum(0);
@@ -1030,28 +1031,36 @@
}
queryWrapper.lambda().eq(Goodsorder::getPayStatus, Constants.ONE);//宸叉敮浠�
queryWrapper.lambda().eq(Goodsorder::getIsdeleted, Constants.ZERO);
- queryWrapper.lambda().groupBy(Goodsorder::getStatus);
- queryWrapper.select( "status ","count(id) as count_num"
+ queryWrapper.lambda().groupBy(Goodsorder::getStatus,Goodsorder::getType);
+ queryWrapper.select( "type","status ","count(id) as count_num"
,"sum(money) as money","sum(close_money) as close_money" );
//鎸夎鍗曠姸鎬佸垎缁勭粺璁�
List<Goodsorder> detailList = goodsorderMapper.selectList(queryWrapper);
for(Goodsorder goodsorder : detailList){
- if(Constants.formatIntegerNum(goodsorder.getStatus()) == Constants.GOODSORDER_STATUS.CLOSE.getKey()){
- //宸茬粨绠�
- model.setClosedNum(model.getClosedNum()+goodsorder.getCountNum());
- //淇敼bug 缁撶畻鏀跺叆 = 鏀粯閲戦-閫�娆�-鏈粨绠�
+ if(Constants.equalsInteger(goodsorder.getType(),Constants.ZERO)){
+ //濡傛灉鏄獞琛岃鍗曟娂閲戯紝璁＄畻楠戣鏀跺叆
+ if(Constants.formatIntegerNum(goodsorder.getStatus()) == Constants.GOODSORDER_STATUS.CLOSE.getKey()){
+ //宸茬粨绠�
+ model.setClosedNum(model.getClosedNum()+goodsorder.getCountNum());
+ //淇敼bug 缁撶畻鏀跺叆 = 鏀粯閲戦-閫�娆�-鏈粨绠�
// model.setClosedMoney(model.getClosedMoney().add(Constants.translateMoney(goodsorder.getCloseMoney())));
- model.setPayNum(model.getPayNum()+goodsorder.getCountNum());
- model.setPayMoney(model.getPayMoney().add(Constants.translateMoney(goodsorder.getMoney())));
- }else if(Constants.formatIntegerNum(goodsorder.getStatus()) == Constants.GOODSORDER_STATUS.HAVING_PAY.getKey()){
- //宸叉敮浠樻湭缁撶畻
- model.setUnClosedNum(model.getUnClosedNum()+goodsorder.getCountNum());
- model.setUnClosedMoney(model.getUnClosedMoney().add(Constants.translateMoney(goodsorder.getMoney())));
+ model.setPayNum(model.getPayNum()+goodsorder.getCountNum());
+ model.setPayMoney(model.getPayMoney().add(Constants.translateMoney(goodsorder.getMoney())));
+ }else if(Constants.formatIntegerNum(goodsorder.getStatus()) == Constants.GOODSORDER_STATUS.HAVING_PAY.getKey()){
+ //宸叉敮浠樻湭缁撶畻
+ model.setUnClosedNum(model.getUnClosedNum()+goodsorder.getCountNum());
+ model.setUnClosedMoney(model.getUnClosedMoney().add(Constants.translateMoney(goodsorder.getMoney())));
- model.setPayNum(model.getPayNum()+goodsorder.getCountNum());
- model.setPayMoney(model.getPayMoney().add(Constants.translateMoney(goodsorder.getMoney())));
+ model.setPayNum(model.getPayNum()+goodsorder.getCountNum());
+ model.setPayMoney(model.getPayMoney().add(Constants.translateMoney(goodsorder.getMoney())));
+ }
+ }else{
+ //濂楅鍗℃敹鍏ョ疮璁� (浜ゆ槗绗旀暟鍜屼氦鏄撻噾棰濓級
+ model.setDiscountNum(model.getDiscountNum()+goodsorder.getCountNum());
+ model.setDiscountMoney(model.getDiscountMoney().add(Constants.translateMoney(goodsorder.getMoney())));
}
+
}
QueryWrapper<Refund> queryWrapper2 = new QueryWrapper<>();
if(Objects.nonNull(param.getStartDate())) {
--
Gitblit v1.9.3