审核->修改->审核导致重复扣装卸业务问题+商品名称以车牌号开头

app-ui/pages/wx/pay.vue

@@ -272,13 +272,13 @@
 				if(manager&&manager.id){
 					p.i=JSON.stringify(manager);
 				}
-				let con = 'A1-停车费-' + carBusinessNo;
+				let con = 'A1-'+carNos+'-停车费-' + carBusinessNo;
 				let tradeType = 'PORT_PARKING_FEE';
 				if (carIds.length == 0 || businessSelect.length > 0) { //交业务费
-					con = 'A1-' + this.goodsName + '-' + this.businessNos;
+					con = 'A1-'+carNos+'-' + this.goodsName;
 					tradeType = 'PORT_OPERATION_FEE';
 				}
-				p.desc = con + '-' + carNos;
+				p.desc = con;
 				p.businessType = tradeType;
 				p.calculateId = this.item.calculateId;
 				this.$common.showLoading('正在请求...');

app-ui/utils/request.js

@@ -1,5 +1,5 @@
-const server = 'http://127.0.0.1:8099/pro';
-// const server = 'https://pco.aseanbusiness.cn/pro';
+// const server = 'http://127.0.0.1:8099/pro';
+const server = 'https://pco.aseanbusiness.cn/pro';
 
 
 // const server = 'https://dxkaa1.gxbtka.com/pro';

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

@@ -1719,7 +1719,8 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
                         item.setPayTime(now).setPayStatus(1).setPayType(PayEnum.PayType.PER_PAY.getCode())
                                 .setPayTypeName(PayEnum.PayType.PER_PAY.getDesc());
                         tbBusinessItemService.updateById(item);
-                        tbBusiness.setPayMoney(price.add(tbBusiness.getPayMoney())).setPayTime(now);
+                        tbBusiness.setPayMoney(price.add(tbBusiness.getPayMoney())).setPayTime(now)
+                                .setPayStatus(PayEnum.PayStatusEnum.HAS_PAY_CONFIRM.getCode());
                         BigDecimal afterBalance = balance.subtract(price);
                         tbAccount.setTotalMoney(afterBalance);//增加累计扣款
                         tbAccountService.updateById(tbAccount);
@@ -1734,6 +1735,7 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
         //其他费项 装卸业务管理费” 进行预存款扣除
         for (TbBusinessItem item : tbBusinessItems) {
             String aliasName = item.getItemAlias();
+            String itemName = item.getItemName();
             //充电打冷，正面吊(取柜)必须得有开始时间+结束时间
             if (StrUtil.equals(aliasName, SystemObject.config.getColdItemAlias())
                     || (StrUtil.equals(aliasName, SystemObject.config.getEmptyStoreItemAlias())
@@ -1745,8 +1747,9 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
                     throw new AjaxError("请先点击【修改】，然后录入业务开始/结束时间");
                 }
             }
-            //业务类型是装卸业务管理费且未支付的进行扣款
-            if (item.getPayStatus() == 0 && SystemObject.config.getUnLoadItem().contains(item.getItemTypeName())) {
+            //其他业务类型是装卸业务管理费且未支付的进行扣款
+            if (item.getPayStatus() == 0 && SystemObject.config.getUnLoadItem().contains(item.getItemTypeName())
+                    && !SystemObject.config.getEveryCarPay().contains(itemName)) {
                 List<IOrderItem> expenses = new ArrayList<>();
                 IOrderItem orderItem = new IOrderItem();
                 orderItem.setExpenseNum(Integer.parseInt(item.getNum()))
@@ -1764,7 +1767,8 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
                     item.setPayTime(now).setPayStatus(1).setPayType(PayEnum.PayType.PER_PAY.getCode())
                             .setPayTypeName(PayEnum.PayType.PER_PAY.getDesc());
                     tbBusinessItemService.updateById(item);
-                    tbBusiness.setPayMoney(price.add(tbBusiness.getPayMoney())).setPayTime(now);
+                    tbBusiness.setPayMoney(price.add(tbBusiness.getPayMoney())).setPayTime(now)
+                            .setPayStatus(PayEnum.PayStatusEnum.HAS_PAY_CONFIRM.getCode());
                     //查找越南车--->统计以--->重车对集装箱吊装 (重 柜 ) =====空车 vs 集装箱吊装 (空 柜 )
                     String itemAlias = item.getItemAlias();
                     TbBusinessCar tbBusinessCar = tbBusinessCars.stream().filter(car -> car.getCarType().equals(CarEnum.CarTypeEnum.EMPTY_TYPE.getType()))

sp-server/src/main/resources/application-dev.yml

@@ -6,9 +6,9 @@ spring:
     # 数据源配置
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
-        url: jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://47.101.143.145:3306/pco?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: 123456
+        password: 1qaz@WSX
         # 是否打开sql监控台  (生产环境请务必关闭此选项)
         druid:
             stat-view-servlet: