收费明细调整

sp-admin/sa-view/tb-fee-statistics/tb-fee-details-list.html

@@ -53,7 +53,7 @@
 					<sa-td name="作业单位" prop="pickCustomerName" ></sa-td>
 					<sa-td name="项目金额" prop="itemPrice" ></sa-td>
 					<sa-td name="税率" prop="taxRate" ></sa-td>
-					<sa-td name="不含税金额" prop="noTaxPrice" ></sa-td>
+					<sa-td name="不含税金额" prop="noTaxPrice" ></sa-td> 
 					<sa-td name="支付日期" prop="payDay" ></sa-td>
 					<sa-td name="支付方式" prop="payType" type="enum" :jv="{3: '微信支付'}"></sa-td>
 <!--					<el-table-column label="操作" fixed="right"  width="240px">-->

sp-server/src/main/java/com/pj/api/jh/service/JhService.java

@@ -77,8 +77,8 @@ public class JhService {
 
         String paySecrit = jhConfig.getPaySecret();
         String sign = MerchantApiUtil.getSign(params, paySecrit);
-
         params.put("sign", sign);
+
         String jsonParam = JSONUtil.toJsonStr(params);
         String initPayUrl = "http://116.252.74.15:8081/uaps-web-gateway/cnpPay/initPay";
         String result = HttpUtil.createPost(initPayUrl).header("Content-Type", "application/json").body(jsonParam)

sp-server/src/main/java/com/pj/project/tb_business_item/TbBusinessItemService.java

@@ -117,11 +117,13 @@ public class TbBusinessItemService extends ServiceImpl<TbBusinessItemMapper, TbB
         TbBusinessItem tbBusinessItem = this.getById(id);
         tbBusinessItem.setConfirm(1).setConfirmTime(new Date());
         this.updateById(tbBusinessItem);
+
         TbFeeDetails feeDetails = tbFeeDetailsService.getByBusinessItemId(id + "");
         if(feeDetails != null){
             feeDetails.setPickCustomerName(tbBusinessItem.getPickCustomerName());
             tbFeeDetailsService.updateById(feeDetails);
         }
+
         //todo 通知作业方
         List<SpAdmin> spAdminList = spAdminService.findByCustomerId(tbBusinessItem.getPickCustomerId());
         TbBusiness tbBusiness = tbBusinessService.getById(tbBusinessItem.getBusinessId());

sp-server/src/main/java/com/pj/project/tb_fee_details/TbFeeDetails.java

@@ -104,7 +104,7 @@ public class TbFeeDetails implements Serializable {
     private String pickCustomerName;
 
     /**
-     * 不含税税款
+     * 不含税款
      */
     public BigDecimal noTaxPrice = new BigDecimal(0);
 

sp-server/src/main/java/com/pj/project/tb_fee_details/TbFeeDetailsService.java

@@ -113,6 +113,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
                 parkFee = new TbFeeDetails();
                 parkFee.setTaxRate(partConfig.getTaxRate());
             }
+
             BigDecimal noTaxPrice = car.getMoney().subtract(car.getMoney().multiply(parkFee.getTaxRate()));
             parkFee.setBusinessId(car.getBusinessId()).setBusinessNo(business.getNo())
                     .setCarNo(car.getCarNo())

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

@@ -173,6 +173,7 @@ public class TbFeeStatisticsService extends ServiceImpl<TbFeeStatisticsMapper, T
                 businessFeeDetail = new TbFeeDetails();
                 businessFeeDetail.setTaxRate(new BigDecimal(TbFeeStatistics.taxRate.BUSINESS.getValue()));
             }
+
             BigDecimal noTaxPrice = item.getItemPrice().subtract(item.getItemPrice().multiply(businessFeeDetail.getTaxRate()));
             businessFeeDetail.setBusinessId(item.getBusinessId()).setBusinessNo(business.getNo())
                     .setCarNo(business.getCardNo())