MERGE

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -3252,7 +3252,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         if (ObjectUtils.isNotNull(totalVoTwo)){
             BigDecimal money = totalVoTwo.getMoneyTotal();
             if (ObjectUtils.isNull(money)){
-                resultVo.setMoneyYearRate(moneyTotal);
+                resultVo.setMoneyWeekRate(moneyTotal);
             }else if (money.compareTo(BigDecimal.ZERO) > 0){
                 BigDecimal subtract = moneyTotal.subtract(money);
                 BigDecimal divide = subtract.divide(money,2, RoundingMode.HALF_UP);
@@ -3260,7 +3260,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             }
             Long num = totalVoTwo.getOrderNumTotal();
             if (ObjectUtils.isNull(num)){
-                resultVo.setYearRate(new BigDecimal(numTotal));
+                resultVo.setWeekRate(new BigDecimal(numTotal));
             }else if (num > 0){
                 Long subtract = numTotal - num;
                 BigDecimal divide = new BigDecimal(subtract).divide(new BigDecimal(num),2, RoundingMode.HALF_UP);
@@ -5809,11 +5809,11 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         }
         //更新订单已收金额
         order.setOrderReceived(bo.getOrderReceived());
-//        if (ObjectUtils.isNotNull(order.getOrderReceived())) {
-//            order.setOrderReceived(bo.getOrderReceived().add(order.getOrderReceived()));
-//        } else {
-//            order.setOrderReceived(bo.getOrderReceived());
-//        }
+        if (ObjectUtils.isNotNull(order.getOrderReceived())) {
+            order.setOrderReceived(bo.getOrderReceived().add(order.getOrderReceived()));
+        } else {
+            order.setOrderReceived(bo.getOrderReceived());
+        }
         order.setOrderUncollected(order.getPayPrice().subtract(order.getOrderReceived()));
         order.setOrderStatus(1);//已支付
         Integer payStatus = 0;