Browse Source

收费明细增加outTradeNo字段

qzyReal 3 năm trước cách đây
mục cha
commit
867dd7c7d6

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

@@ -209,7 +209,7 @@ public class WxService {
                     tbBusinessService.updateById(business);
                 }
             }
-            tbFeeDetailsService.chargeParkFee(cars, transactionId);//添加cars的收费明细
+            tbFeeDetailsService.chargeParkFee(cars, transactionId,outTradeNo);//添加cars的收费明细
             String businessId = attach.getB();
             if (StrUtil.isNotEmpty(businessId)) {
                 List<TbBusinessItem> items = tbBusinessItemService.findByBusinessId(businessId);

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

@@ -173,6 +173,7 @@ public class TbFeeDetails implements Serializable {
     private String businessCarId;
 
     private String businessCarNo;
+    private String outTradeNo;
 
 
 

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

@@ -132,7 +132,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
     }
 
 
-    public void chargeParkFee(List<PriceBO> cars, String transactionId) {
+    public void chargeParkFee(List<PriceBO> cars, String transactionId,String outTradeNo) {
         Date now = new Date();
         String nowStr = DateUtil.format(now, "yyyy-MM-dd HH:mm:ss");
         String toDay = DateUtil.format(now, "yyyy-MM-dd");
@@ -156,7 +156,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
             BigDecimal taxPrice = bo1.getP().divide(BigDecimal.valueOf(1).add(parkFee.getTaxRate()),2, BigDecimal.ROUND_HALF_UP).multiply(parkFee.getTaxRate());
             BigDecimal noTaxPrice = bo1.getP().subtract(taxPrice);
             parkFee.setBusinessId(car.getBusinessId()).setBusinessCarId(car.getId())
-                    .setCarNo(car.getCarNo())
+                    .setCarNo(car.getCarNo()).setOutTradeNo(outTradeNo)
                     .setItemPrice(bo1.getP()).setUnitPrice(bo1.getP()).setNoTaxPrice(noTaxPrice).setTaxPrice(taxPrice)
                     .setFeeType(TbFeeDetails.fee.PARK_FEE.getCode()).setItemTypeName("停车业务")
                     .setPayDay(toDay).setPayType(3).setCreateTime(now)