From 9a166a10b8f15df08764473129fba9f8b7780974 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期五, 18 八月 2023 23:05:27 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopTotalServiceImpl.java | 92 +++++++++++++++++++++++----------------------
1 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopTotalServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopTotalServiceImpl.java
index ad7c586..df82334 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopTotalServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopTotalServiceImpl.java
@@ -61,52 +61,54 @@
ShopTotal shopTotal = this.getById(shopTotalChangeDto.getShopId());
//订单变化
BigDecimal payMoney = BigDecimal.ZERO;
- if(shopTotalChangeDto.getOrderType()==1){
- if(shopTotalChangeDto.getCycleMoney()!=null){
- shopTotal.setTotalCycleMoney(shopTotal.getTotalCycleMoney().add(shopTotalChangeDto.getCycleMoney()));
- payMoney = payMoney.add(shopTotalChangeDto.getCycleMoney());
- shopTotal.setTotalCycleOrder(shopTotal.getTotalCycleOrder()+1);
+ if(shopTotalChangeDto.getOrderType()!=null){
+ if(shopTotalChangeDto.getOrderType()==1){
+ if(shopTotalChangeDto.getCycleMoney()!=null){
+ shopTotal.setTotalCycleMoney(shopTotal.getTotalCycleMoney().add(shopTotalChangeDto.getCycleMoney()));
+ payMoney = payMoney.add(shopTotalChangeDto.getCycleMoney());
+ shopTotal.setTotalCycleOrder(shopTotal.getTotalCycleOrder()+1);
+ }
+ if(shopTotalChangeDto.getExperienceMoney()!=null){
+ shopTotal.setTotalExperienceMoney(shopTotal.getTotalExperienceMoney().add(shopTotalChangeDto.getExperienceMoney()));
+ payMoney = payMoney.add(shopTotalChangeDto.getExperienceMoney());
+ shopTotal.setTotalExperienceOrder(shopTotal.getTotalExperienceOrder()+1);
+ }
+ if(shopTotalChangeDto.getServiceMoney()!=null){
+ shopTotal.setTotalServiceMoney(shopTotal.getTotalServiceMoney().add(shopTotalChangeDto.getServiceMoney()));
+ payMoney = payMoney.add(shopTotalChangeDto.getServiceMoney());
+ shopTotal.setTotalServiceOrder(shopTotal.getTotalServiceOrder()+1);
+ }
+ if(shopTotalChangeDto.getGoodsMoney()!=null){
+ shopTotal.setTotalGoodsMoney(shopTotal.getTotalGoodsMoney().add(shopTotalChangeDto.getGoodsMoney()));
+ payMoney = payMoney.add(shopTotalChangeDto.getGoodsMoney());
+ shopTotal.setTotalGoodsOrder(shopTotal.getTotalGoodsOrder()+1);
+ }
+ shopTotal.setTotalOrderMoney(shopTotal.getTotalOrderMoney().add(payMoney));
+ shopTotal.setTotalOrder(shopTotal.getTotalOrder()+1);
+ }else{
+ if(shopTotalChangeDto.getCycleMoney()!=null){
+ shopTotal.setTotalCycleMoney(shopTotal.getTotalCycleMoney().subtract(shopTotalChangeDto.getCycleMoney()));
+ payMoney = payMoney.add(shopTotalChangeDto.getCycleMoney());
+ shopTotal.setTotalCycleOrder(shopTotal.getTotalCycleOrder()-1);
+ }
+ if(shopTotalChangeDto.getExperienceMoney()!=null){
+ shopTotal.setTotalExperienceMoney(shopTotal.getTotalExperienceMoney().subtract(shopTotalChangeDto.getExperienceMoney()));
+ payMoney = payMoney.add(shopTotalChangeDto.getExperienceMoney());
+ shopTotal.setTotalExperienceOrder(shopTotal.getTotalExperienceOrder()-1);
+ }
+ if(shopTotalChangeDto.getServiceMoney()!=null){
+ shopTotal.setTotalServiceMoney(shopTotal.getTotalServiceMoney().subtract(shopTotalChangeDto.getServiceMoney()));
+ payMoney = payMoney.add(shopTotalChangeDto.getServiceMoney());
+ shopTotal.setTotalServiceOrder(shopTotal.getTotalServiceOrder()-1);
+ }
+ if(shopTotalChangeDto.getGoodsMoney()!=null){
+ shopTotal.setTotalGoodsMoney(shopTotal.getTotalGoodsMoney().subtract(shopTotalChangeDto.getGoodsMoney()));
+ payMoney = payMoney.add(shopTotalChangeDto.getGoodsMoney());
+ shopTotal.setTotalGoodsOrder(shopTotal.getTotalGoodsOrder()-1);
+ }
+ shopTotal.setTotalOrderMoney(shopTotal.getTotalOrderMoney().subtract(payMoney));
+ shopTotal.setTotalOrder(shopTotal.getTotalOrder()-1);
}
- if(shopTotalChangeDto.getExperienceMoney()!=null){
- shopTotal.setTotalExperienceMoney(shopTotal.getTotalExperienceMoney().add(shopTotalChangeDto.getExperienceMoney()));
- payMoney = payMoney.add(shopTotalChangeDto.getExperienceMoney());
- shopTotal.setTotalExperienceOrder(shopTotal.getTotalExperienceOrder()+1);
- }
- if(shopTotalChangeDto.getServiceMoney()!=null){
- shopTotal.setTotalServiceMoney(shopTotal.getTotalServiceMoney().add(shopTotalChangeDto.getServiceMoney()));
- payMoney = payMoney.add(shopTotalChangeDto.getServiceMoney());
- shopTotal.setTotalServiceOrder(shopTotal.getTotalServiceOrder()+1);
- }
- if(shopTotalChangeDto.getGoodsMoney()!=null){
- shopTotal.setTotalGoodsMoney(shopTotal.getTotalGoodsMoney().add(shopTotalChangeDto.getGoodsMoney()));
- payMoney = payMoney.add(shopTotalChangeDto.getGoodsMoney());
- shopTotal.setTotalGoodsOrder(shopTotal.getTotalGoodsOrder()+1);
- }
- shopTotal.setTotalOrderMoney(shopTotal.getTotalOrderMoney().add(payMoney));
- shopTotal.setTotalOrder(shopTotal.getTotalOrder()+1);
- }else{
- if(shopTotalChangeDto.getCycleMoney()!=null){
- shopTotal.setTotalCycleMoney(shopTotal.getTotalCycleMoney().subtract(shopTotalChangeDto.getCycleMoney()));
- payMoney = payMoney.add(shopTotalChangeDto.getCycleMoney());
- shopTotal.setTotalCycleOrder(shopTotal.getTotalCycleOrder()-1);
- }
- if(shopTotalChangeDto.getExperienceMoney()!=null){
- shopTotal.setTotalExperienceMoney(shopTotal.getTotalExperienceMoney().subtract(shopTotalChangeDto.getExperienceMoney()));
- payMoney = payMoney.add(shopTotalChangeDto.getExperienceMoney());
- shopTotal.setTotalExperienceOrder(shopTotal.getTotalExperienceOrder()-1);
- }
- if(shopTotalChangeDto.getServiceMoney()!=null){
- shopTotal.setTotalServiceMoney(shopTotal.getTotalServiceMoney().subtract(shopTotalChangeDto.getServiceMoney()));
- payMoney = payMoney.add(shopTotalChangeDto.getServiceMoney());
- shopTotal.setTotalServiceOrder(shopTotal.getTotalServiceOrder()-1);
- }
- if(shopTotalChangeDto.getGoodsMoney()!=null){
- shopTotal.setTotalGoodsMoney(shopTotal.getTotalGoodsMoney().subtract(shopTotalChangeDto.getGoodsMoney()));
- payMoney = payMoney.add(shopTotalChangeDto.getGoodsMoney());
- shopTotal.setTotalGoodsOrder(shopTotal.getTotalGoodsOrder()-1);
- }
- shopTotal.setTotalOrderMoney(shopTotal.getTotalOrderMoney().subtract(payMoney));
- shopTotal.setTotalOrder(shopTotal.getTotalOrder()-1);
}
//活动变化
if(shopTotalChangeDto.getActivityCount()!=null){
--
Gitblit v1.7.1