Merge branch 'dev' of http://47.101.143.145:8090/77975466/pco into dev

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

@@ -169,8 +169,9 @@ public class TbFeeStatisticsService extends ServiceImpl<TbFeeStatisticsMapper, T
                 businessFee = new TbFeeStatistics();
                 businessFee.setTaxRate(BigDecimal.valueOf(TbFeeStatistics.taxRate.BUSINESS.getValue()));
             }
-            businessFee.setTaxMoney(businessFee.getTaxMoney().add(item.getItemPrice()));//含税收入
-            businessFee.setNum(businessFee.getNum() + 1);
+            businessFee.setTaxMoney(businessFee.getTaxMoney().add(item.getTotal()));//含税收入
+            //businessFee.setNum(businessFee.getNum() + 1);
+            businessFee.setNum(businessFee.getNum() + Integer.valueOf(item.getNum()));
             BigDecimal taxes = businessFee.getTaxMoney()
                     .divide(BigDecimal.valueOf(1).add(businessFee.getTaxRate()),2, BigDecimal.ROUND_HALF_UP)
                     .multiply(businessFee.getTaxRate());
@@ -203,15 +204,17 @@ public class TbFeeStatisticsService extends ServiceImpl<TbFeeStatisticsMapper, T
             businessFeeDetail.setBusinessId(item.getBusinessId()).setBusinessNo(business.getNo())
                     .setBusinessItemNo(item.getNo()).setBusinessCarId(businessCar.getId()).setBusinessCarNo(businessCar.getNo())
                     .setCarNo(carNo)
-                    .setItemPrice(item.getItemPrice()).setUnitPrice(item.getItemPrice()).setNoTaxPrice(noTaxPrice).setTaxPrice(taxPrice)
+
+                    .setItemPrice(item.getTotal()).setUnitPrice(item.getItemPrice()).setNoTaxPrice(noTaxPrice).setTaxPrice(taxPrice)
                     .setFeeType(feeType)
                     .setItemTypeId(item.getItemTypeId()).setItemTypeName(item.getItemTypeName())
                     .setItemId(item.getItemId()).setItemName(item.getItemName())
                     .setPayDay(toDay).setPayType(3).setCreateTime(now)
                     .setBusinessItemId(item.getId() + "")
                     .setPickCustomerName(item.getPickCustomerName())
-                    .setNum(1).setIsSettle(1).setPayMode(1).setPayTime(nowStr).setWeight(business.getNetWeight())
-                    .setTransactionId(transactionId);
+                    .setIsSettle(1).setPayMode(1).setPayTime(nowStr).setWeight(business.getNetWeight())
+                    .setTransactionId(transactionId)
+                    .setNum(Integer.valueOf(item.getNum()));
             tbFeeDetailsService.saveOrUpdate(businessFeeDetail);
         }
     }