Merge branch 'dev' into debug

sp-server/src/main/java/com/pj/api/wx/service/WxService.java

@@ -199,7 +199,7 @@ public class WxService {
         if (StrUtil.isNotEmpty(attachStr)) {
             Attach attach = JSONUtil.toBean(attachStr, Attach.class);
             List<PriceBO> cars = JSONUtil.toList(attach.getC(), PriceBO.class);
-
+            tbFeeStatisticsService.countParkFee(cars);//停车费日统计
             for (PriceBO bo1 : cars) {
                 TbBusinessCar car = tbBusinessCarService.getById(bo1.getId());
                 BigDecimal price = bo1.getP();
@@ -212,7 +212,6 @@ public class WxService {
                     tbBusinessService.updateById(business);
                 }
             }
-            tbFeeStatisticsService.countParkFee(cars);//停车费日统计
             tbFeeDetailsService.chargeParkFee(cars, transactionId);//添加cars的收费明细
             String businessId = attach.getB();
             if (StrUtil.isNotEmpty(businessId)) {

sp-server/src/main/java/com/pj/project/tb_fee_statistics/TbFeeStatisticsService.java

@@ -120,7 +120,7 @@ public class TbFeeStatisticsService extends ServiceImpl<TbFeeStatisticsMapper, T
             if(price.compareTo(BigDecimal.valueOf(0)) != 0){
                 totalPrice = totalPrice.add(price);
                 TbBusinessCar car = tbBusinessCarService.getById(bo1.getId());
-                if(car.getMoney().compareTo(partConfig.getBasePrice()) == -1 || car.getMoney().compareTo(partConfig.getBasePrice()) == 0){
+                if(car.getMoney().compareTo(BigDecimal.valueOf(0)) == 0){
                     totalNum++;
                 }
             }