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

# Conflicts:
#	sp-server/app.pid

app/pages/index/index.vue

@@ -117,7 +117,7 @@
 					{
 						auth: false,
 						icon: '../../static/home-icon-06.jpg',
-						text: '灵活业务',
+						text: '其他业务',
 						url: '/pages/onely-disinfect/Index',
 						customer:true
 					},
@@ -161,7 +161,7 @@
 					{
 						auth: false,
 						icon: '../../static/home-icon-06.jpg',
-						text: '灵活业务',
+						text: '其他业务',
 						url: '/pages/onely-disinfect/Index',
 						customer:true
 					},

app/utils/request.js

@@ -1,6 +1,6 @@
 // const server = 'http://127.0.0.1:8099/pro';
-const server = 'https://pco.aseanbusiness.cn/pro';
-// const server = 'https://dxkaa1.bgigc.com/pro';
+// const server = 'https://pco.aseanbusiness.cn/pro';
+const server = 'https://dxkaa1.bgigc.com/pro';
 
 import common from '../common/js/common.js';
 

sp-admin/sa-view/tb-business/tb-business-list.html

@@ -70,11 +70,7 @@
 								&&s.row.payStatus==1
 								&&sa.isAuth('tb-business-confirm')
 								&&currentCustomerId=='1'" @click="confirmFn(s.row)">确认账单</el-button>
-							<el-button class="c-btn" type="success" v-if="sa.isAuth('tb-business-pay')
-								&&s.row.payStatus==1
-								&&s.row.adminConfirmInput==1
-								&&currentCustomerId!='1'" @click="payFn(s.row)">
-								马上支付</el-button>
+							
 							<el-button class="c-btn" type="primary" @click="itemFn(s.row)"
 								v-if="currentCustomerId=='1'">业务项</el-button>
 							<el-button v-if="sa.isAuth('tb-business-add')" class="c-btn" type="primary"

sp-server/app.pid

@@ -1 +1 @@
-23504
+22332

sp-server/src/main/java/com/pj/api/h5/ApiController.java

@@ -83,7 +83,7 @@ public class ApiController {
     @RequestMapping(value = "getCustomerList")
     public AjaxJson getCustomerList() {
         SoMap so = SoMap.getRequestSoMap();
-        if (StpUserUtil.isLogin()){
+        if (StpUserUtil.isLogin()) {
             String currentCustomerId = StpUserUtil.getCustomerId();
             if (!currentCustomerId.equals(UserTypeEnum.PLATFORM_ADMIN.getCustomerId())) {
                 so.put("id", currentCustomerId);
@@ -109,7 +109,7 @@ public class ApiController {
 
     @GetMapping(value = "searchPartCar")
     public AjaxJson searchPartCar(String carNo) {
-        carNo=carNo.toUpperCase();
+        carNo = carNo.toUpperCase();
         List<TbBusinessCar> list = apiService.searchPartCar(carNo);
         return AjaxJson.getSuccessData(list);
     }
@@ -121,13 +121,17 @@ public class ApiController {
 
     @GetMapping(value = "getPartCarByChannel")
     public AjaxJson getPartCarByChannel(String channel) {
-        StaticLog.error("查询通道车辆：{}",channel);
+        StaticLog.error("查询通道车辆：{}", channel);
         return AjaxJson.getSuccessData(apiService.getPartCarByChannel(channel));
     }
 
     @GetMapping(value = "getDeclareList")
     public AjaxJson getDeclareList() {
         SoMap so = SoMap.getRequestSoMap();
+        String customerId = StpUserUtil.getCustomerId();
+        if (!StrUtil.equals(customerId, UserTypeEnum.PLATFORM_ADMIN.getCustomerId())) {
+            so.put("customerId", customerId);
+        }
         return AjaxJson.getSuccessData(apiService.getDeclareList(so.startPage()));
     }
 
@@ -208,17 +212,20 @@ public class ApiController {
         apiService.addCarDisinfect(otherBusinessBO);
         return AjaxJson.getSuccess();
     }
+
     @RequestMapping(value = "editCarDisinfect")
     public AjaxJson editCarDisinfect(@RequestBody OtherBusinessBO otherBusinessBO) {
         apiService.editOtherBusiness(otherBusinessBO);
         return AjaxJson.getSuccess();
     }
+
     @RequestMapping("addOtherBusiness")
     public AjaxJson addOtherBusiness(OtherBusinessBO otherBusinessBO) {
         otherBusinessBO.setItems(JSONUtil.toList(otherBusinessBO.getItemJson(), TbItem.class));
         apiService.addCarDisinfect(otherBusinessBO);
         return AjaxJson.getSuccess();
     }
+
     @RequestMapping("editOtherBusiness")
     public AjaxJson editOtherBusiness(OtherBusinessBO otherBusinessBO) {
         otherBusinessBO.setItems(JSONUtil.toList(otherBusinessBO.getItemJson(), TbItem.class));
@@ -227,5 +234,4 @@ public class ApiController {
     }
 
 
-
 }

sp-server/src/main/java/com/pj/project/tb_business_car/TbBusinessCarService.java

@@ -358,8 +358,8 @@ public class TbBusinessCarService extends ServiceImpl<TbBusinessCarMapper, TbBus
     }
 
     public AjaxJson deleteRecord(String id) {
-        TbFeeDetails tbFeeDetails = tbFeeDetailsService.findByBusinessCarId(id, TbFeeDetails.fee.PARK_FEE.getCode());
-        if (tbFeeDetails != null) {
+        List<TbFeeDetails> tbFeeDetails = tbFeeDetailsService.findByBusinessCarId(id, TbFeeDetails.fee.PARK_FEE.getCode());
+        if (!tbFeeDetails.isEmpty()) {
             return AjaxJson.getError("该车有付款记录，不能删除");
         }
         this.removeById(id);

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

@@ -346,10 +346,10 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
         return list != null ? list.size() : 0;
     }
 
-    public TbFeeDetails findByBusinessCarId(String businessCarId,int feeType) {
+    public List<TbFeeDetails> findByBusinessCarId(String businessCarId, int feeType) {
         QueryWrapper<TbFeeDetails>ew=new QueryWrapper<>();
         ew.eq("business_car_id",businessCarId);
         ew.eq("fee_type",feeType);
-        return getOne(ew);
+        return list(ew);
     }
 }