From 18361198dab121d9b740f5e86206fda6d82bb426 Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Thu, 19 May 2022 17:34:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B=E6=8A=A5=E4=BB=B7bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicle/BaseVehicleFeign.java | 4 +- .../basevehicle/BaseVehicleFeignFallback.java | 2 +- .../BaseModelConfigService.java | 20 +++--- .../biz/basevehicle/BaseVehicleMapper.xml | 5 +- .../base/biz/basevehicle/BaseVehicleRest.java | 2 +- .../biz/basevehicle/BaseVehicleService.java | 9 ++- .../busdeposit/AppBusDepositBusDetailsVo.java | 3 + .../buscenter/api/busdeposit/BusDeposit.java | 4 ++ .../AppBusDepositBuscenterDto.java | 3 + .../busmaindeposit/AppBusMainDepositVo.java | 21 +++--- .../biz/busdeposit/BusDepositMapper.xml | 3 +- .../busmaindeposit/BusMainDepositMapper.java | 10 ++- .../busmaindeposit/BusMainDepositMapper.xml | 72 ++++++++++++------- .../busmaindeposit/BusMainDepositService.java | 36 +++++++--- .../AppCrmVehicleDemandParticularsVo.java | 2 +- .../AppCrmVehicledemandDetailsVo.java | 2 +- .../biz/crmcustomer/CrmCustomerService.java | 53 +++++++++----- .../CrmCustomerTempService.java | 20 ++++-- .../CrmVehicledemandMapper.xml | 1 + 19 files changed, 179 insertions(+), 93 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 2f1e831c88..a96c204138 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -235,8 +235,8 @@ public interface BaseVehicleFeign { public ResultBean> getNowModelList(@RequestBody PagerQuery pagerQuery); @ApiOperation("获取车型配置总结（即常用配置一句话描述）") - @GetMapping("/carConfigSummary/{modelSid}/{configSid}") - public ResultBean getCarConfigSummary(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid); + @GetMapping("/carConfigSummary") + public ResultBean getCarConfigSummary(@RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid,@RequestParam("userSid") String userSid); @ApiOperation("手机端-配置列表获取现车列表") @PostMapping("/getModelNowCarList") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 4c34d257af..1bd99caa25 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -161,7 +161,7 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { } @Override - public ResultBean getCarConfigSummary(String modelSid, String configSid) { + public ResultBean getCarConfigSummary(String modelSid, String configSid, String userSid) { return null; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java index 2e65d980f6..3ccb3f88e8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java @@ -635,34 +635,34 @@ public class BaseModelConfigService extends MybatisBaseService SELECT bmd.id, - bmd.sid, - bmd.billNo, - bmd.depositBillTypeKey, - bmd.depositBillType, - bmd.createDate, - bmd.staffName, - bd.deposit, - bd.usedDeposit, - IF(bd.id IS NOT NULL, bd.draweeName, bdvc.customerName) name, - IF(bd.id IS NOT NULL, bd.draweeMobile, bdvc.customerMobile) mobile, - IF(COUNT(bdv.id) = 0, '', COUNT(bdv.id)) depositVehicle + bmd.sid, + bmd.billNo, + bmd.depositBillTypeKey, + bmd.depositBillType, + bmd.createDate, + bmd.staffName, + bd.deposit, + bd.usedDeposit, + IF(bd.id IS NOT NULL, bd.draweeName, bdvc.customerName) name, + IF(bd.id IS NOT NULL, bd.draweeMobile, bdvc.customerMobile) mobile, + IF(COUNT(bdv.id) = 0, '', COUNT(bdv.id)) depositVehicle FROM bus_main_deposit bmd - LEFT JOIN bus_deposit bd on bmd.sid = bd.billSid - LEFT JOIN bus_deposit_vehicle_customer bdvc on bmd.sid = bdvc.billSid - LEFT JOIN bus_deposit_vehicle bdv on bmd.sid = bdv.billSid + LEFT JOIN bus_deposit bd on bmd.sid = bd.billSid + LEFT JOIN bus_deposit_vehicle_customer bdvc on bmd.sid = bdvc.billSid + LEFT JOIN bus_deposit_vehicle bdv on bmd.sid = bdv.billSid ${ew.sqlSegment} @@ -35,19 +35,15 @@ + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index 4f2fa6ba80..aa8a10853a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -587,6 +587,23 @@ public class BusMainDepositService extends MybatisBaseService qw = aaQueryWrapper(pagerQuery.getParams()); IPage iPage = baseMapper.getVirtualOrders(page, qw); for (AppBusMainDepositVo record : iPage.getRecords()) { + String virtualOrderSid = record.getVirtualOrderSid(); + int count = baseMapper.selByBillSidCount(virtualOrderSid); + record.setCarNumber(String.valueOf(count)); + if (record.getVirtualOrderType().equals("01")) { + BusDepositCustomer busDepositCustomer = baseMapper.selectDepositByBillSid(virtualOrderSid); + record.setCustomerSid(busDepositCustomer.getCustomerSid()); + record.setCustomerName(busDepositCustomer.getCustomerName()); + record.setMobile(busDepositCustomer.getCustomerMobile()); + + } else if (record.getVirtualOrderType().equals("02")) { + + BusDepositVehicleCustomer busDepositVehicleCustomer = baseMapper.selectVehicleCustomerByBillSid(virtualOrderSid); + record.setCustomerSid(busDepositVehicleCustomer.getCustomerSid()); + record.setCustomerName(busDepositVehicleCustomer.getCustomerName()); + record.setMobile(busDepositVehicleCustomer.getCustomerMobile()); + + } record.setDescribe("订金: 50.000.00元 已用: 0元"); ResultBean resultBean = sysFormLinkFeign.selectStateByBusinessSid(record.getVirtualOrderSid()); record.setShowUpdateBtn(false); @@ -621,7 +638,10 @@ public class BusMainDepositService extends MybatisBaseService wrapper.like("bd.draweeName", query.getName()).or().like("bdv.customerName", query.getName())); + qw.like("bd.draweeName", query.getName()); + } + if (StringUtils.isNotBlank(query.getName())) { + qw.like("bdvc.customerName", query.getName()); } if (StringUtils.isNotBlank(query.getType())) { qw.eq("bmd.depositBillTypeKey", query.getType()); @@ -649,8 +669,8 @@ public class BusMainDepositService extends MybatisBaseService map = JSONObject.parseObject(jsonObject.toJSONString(), new TypeReference>() { + + + JSONObject object = JSONObject.parseObject(resultOne); + Map mapOneResult = JSONObject.parseObject(object.toJSONString(), new TypeReference>() { }); - Map map1 = ConstantUtils.getMap(map, "Response"); - if (MLID_PASSPORTOCR.equals(type)) {//港澳居民台湾同胞通行证 - cardName = ConstantUtils.getString(map1, "Name", ""); - cardNum = ConstantUtils.getString(map1, "Number", ""); - } else if (PERMITOCR.equals(type)) {//护照 - cardName = ConstantUtils.getString(map1, "Name", ""); - cardNum = ConstantUtils.getString(map1, "ID", ""); - } else if (ID_CARDOCR.equals(type)) {//身份证 - cardName = ConstantUtils.getString(map1, "Name", ""); - cardNum = ConstantUtils.getString(map1, "IdNum", ""); + if (mapOneResult.containsKey("Response")) { + Map mapOneResultOne = ConstantUtils.getMap(mapOneResult, "Response"); + if (mapOneResultOne.containsKey("Error")) { + return new ResultBean().fail().setMsg("读取失败"); + } } - mapOne.put("Response", map1); - mapOne.put("cardName", cardName); - mapOne.put("cardNum", cardNum); + if (StringUtils.isNotBlank(resultOne)) { + + System.out.println(resultOne); + JSONObject jsonObject = JSONObject.parseObject(resultOne); + Map map = JSONObject.parseObject(jsonObject.toJSONString(), new TypeReference>() { + }); + Map map1 = ConstantUtils.getMap(map, "Response"); + if (MLID_PASSPORTOCR.equals(type)) {//港澳居民台湾同胞通行证 + cardName = ConstantUtils.getString(map1, "Name", ""); + cardNum = ConstantUtils.getString(map1, "Number", ""); + } else if (PERMITOCR.equals(type)) {//护照 + cardName = ConstantUtils.getString(map1, "Name", ""); + cardNum = ConstantUtils.getString(map1, "ID", ""); + } else if (ID_CARDOCR.equals(type)) {//身份证 + cardName = ConstantUtils.getString(map1, "Name", ""); + cardNum = ConstantUtils.getString(map1, "IdNum", ""); + } + mapOne.put("Response", map1); + mapOne.put("cardName", cardName); + mapOne.put("cardNum", cardNum); + } + return ResultBean.fireSuccess().setData(mapOne); } return new ResultBean().fail().setMsg("上传失败"); @@ -959,8 +974,8 @@ public class CrmCustomerService extends MybatisBaseService list = crmVisitService.selVisitMaterials(sid, staffSid); - if (list != null) { - vo.setMaterialsList(list); + List list = new ArrayList<>(); + List crmVisitVos = crmVisitService.selectListByCustomerSid(sid, staffSid); + for (CrmVisitVo crmVisitVo : crmVisitVos) { + String visitSid = crmVisitVo.getSid(); + List data = commonAppendixFeign.selByLinkSid(visitSid).getData(); + for (CommonAppendixVo datum : data) { + list.add(fileUploadComponent.getUrlPrefix() + datum.getFilePath()); + } } + vo.setMaterialsList(list); + + //获取客户运营信息 AppCrmBusinessInfoVo appCrmBusinessInfoVo = crmBusinessService.selByCustomerSid(sid); if (appCrmBusinessInfoVo != null) { diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml index 7259093081..aedcc769b9 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml @@ -112,6 +112,7 @@ cv.saleReferencePrice AS price, cv.vehicleModelOffer AS quotation, cv.comonConfigSid AS configSid, + cv.number, cv.remarks, cv.estimatedPickupDate AS `date` FROM crm_vehicledemand cv