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

sp-server/src/main/java/com/pj/project/tb_business/TbBusinessService.java

@@ -217,14 +217,15 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
         String chinaCarNo = carList.stream().map(TbBusinessCar::getCarNo).collect(Collectors.joining("、"));
         t.setChinaCarNo(StrUtil.isNotEmpty(chinaCarNo) ? chinaCarNo.toUpperCase() : "");
         carList.forEach(tbBusinessCar -> {
+            tbBusinessCar.setIsLock(0);
             String carNo = tbBusinessCar.getCarNo().toUpperCase();
             TbBusinessCar db = tbBusinessCarService.findByBusinessIdAndCarNo(t.getId(), carNo);
             if (db != null) {
-                tbBusinessCar.setId(db.getId());
+                tbBusinessCar.setId(db.getId()).setIsLock(db.getIsLock());
             }
             TbBusinessCar car = tbBusinessCarService.findInAndNoBusinessCar(carNo);
             if (car != null) {
-                tbBusinessCar.setId(car.getId()).setRealInTime(car.getRealInTime());
+                tbBusinessCar.setId(car.getId()).setRealInTime(car.getRealInTime()).setIsLock(car.getIsLock());
             }
             TbCar tbCar = tbCarService.findByCardNo(carNo);
             tbBusinessCar.setBusinessId(t.getId()).setBusinessType(TbBusiness.BusinessType.HOLD_CAR.getCode());
@@ -241,6 +242,7 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
             yueCar = tbBusinessCarService.findByBusinessIdAndCarNo(t.getId(), yueCarNo);
             if (yueCar == null) {
                 yueCar = new TbBusinessCar();
+                yueCar.setIsLock(0);
             }
         }
         yueCar.setBusinessId(t.getId()).setCarSize(t.getCardSize()).setCarNo(yueCarNo).setCustomerId(t.getCustomerId());

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

@@ -147,7 +147,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
                 continue;
             }
             TbBusinessCar car = tbBusinessCarService.getById(bo1.getId());
-            TbBusiness business = tbBusinessService.getById(car.getBusinessId());
+//            TbBusiness business = tbBusinessService.getById(car.getBusinessId());
             BigDecimal paidMoney  = car.getMoney();
 
             List<TbFeeDetails> oldFeeList = getByBusinessCarIdAndCarNoAndFeeType(car.getId(), car.getCarNo(), TbFeeDetails.fee.PARK_FEE.getCode());
@@ -175,7 +175,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
             if(nightFeeNum.compareTo(BigDecimal.valueOf(0)) > 0){
                     nightParkFee.setNum(nightFeeNum.intValue()).setItemTypeName("夜间停车")
                             .setUnitPrice(baseNightPrice).setItemPrice(baseNightPrice.multiply(nightFeeNum));
-                    setFee(nightParkFee, car, business, transactionIdStr, outTradeNoStr);
+                    setFee(nightParkFee, car, transactionIdStr, outTradeNoStr);
                     saveOrUpdate(nightParkFee);
                     if(qr[1].compareTo(BigDecimal.valueOf(0)) == 0 && dayParkFee.getId() != null){
                         delete(Long.valueOf(dayParkFee.getId()));
@@ -183,14 +183,14 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
             }
             if(qr[1].compareTo(BigDecimal.valueOf(0)) > 0){
                 dayParkFee.setNum(1).setItemTypeName("白天停车").setUnitPrice(qr[1]).setItemPrice(qr[1]);
-                setFee(dayParkFee, car, business, transactionIdStr, outTradeNoStr);
+                setFee(dayParkFee, car, transactionIdStr, outTradeNoStr);
                 saveOrUpdate(dayParkFee);
             }
 
         }
     }
 
-    private void setFee(TbFeeDetails parkFee, TbBusinessCar car, TbBusiness business, String transactionId, String outTradeNo){
+    private void setFee(TbFeeDetails parkFee, TbBusinessCar car, 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");
@@ -207,9 +207,9 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
                 .setIsSettle(1).setPayMode(1).setPayTime(nowStr)
                 .setTransactionId(transactionId).setOutTradeNo(outTradeNo)
                 .setBusinessCarNo(car.getNo());
-        if (business!=null){
-            parkFee.setWeight(business.getNetWeight()).setBusinessNo(business.getNo());
-        }
+//        if (business!=null){
+//            parkFee.setWeight(business.getNetWeight()).setBusinessNo(business.getNo());
+//        }
     }
 
     public String export(SoMap so) throws Exception{