he2802 2 years ago
parent
commit
262f047f69

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

@@ -3608,7 +3608,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             List<TopOldOrderVo> vos = baseMapper.queryListAll();
 //        BigDecimal price = vos.stream().filter(x -> ObjectUtils.isNotNull(x.getOrderPrice())).map(TopOldOrderVo::getOrderPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
 //        BigDecimal received = vos.stream().filter(x -> ObjectUtils.isNotNull(x.getOrderReceived())).map(TopOldOrderVo::getOrderReceived).reduce(BigDecimal.ZERO, BigDecimal::add);
-            BigDecimal uncollected = vos.stream().filter(x -> ObjectUtils.isNotNull(x.getOrderUncollected())).map(TopOldOrderVo::getOrderUncollected).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal uncollected = vos.stream().filter(x -> ObjectUtils.isNotNull(x.getOrderUncollected())&&x.getCheckStatus()==1).map(TopOldOrderVo::getOrderUncollected).reduce(BigDecimal.ZERO, BigDecimal::add);
 /*        map.put("orderPriceTotal", price);
         map.put("orderReceivedTotal", received);*/
             map.put("orderUncollectedTotal", uncollected); //未收账款

+ 2 - 2
zhongzheng-system/src/main/resources/mapper/modules/top/TopDivideLogMapper.xml

@@ -102,10 +102,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         ( pay_status = 1, dl.deduct_money, 0 )) AS deduct_money_total,
             sum(
                     IF
-                        ( pay_status = 0, dl.pay_money, 0 )) AS un_pay_money_total,
+                        ( pay_status !=1, dl.pay_money, 0 )) AS un_pay_money_total,
             sum(
                     IF
-                        ( pay_status = 0, dl.deduct_money, 0 )) AS un_deduct_money_total
+                        ( pay_status !=1, dl.deduct_money, 0 )) AS un_deduct_money_total
         FROM
             top_divide_log dl
         WHERE