From 037b8cbf3ea7638be94de63e851b02389db956b5 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 27 Feb 2024 14:39:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=80=E5=94=AE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8D=95=E6=8D=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedistributor/BaseDistributorFeign.java | 8 +++- .../BaseDistributorFeignFallback.java | 5 +++ .../BaseDistributorMapper.java | 2 + .../basedistributor/BaseDistributorMapper.xml | 8 ++++ .../basedistributor/BaseDistributorRest.java | 5 +++ .../BaseDistributorService.java | 42 +++++++++++++++++++ .../bussalesorder/BusSalesOrderMapper.java | 6 +++ .../biz/bussalesorder/BusSalesOrderMapper.xml | 8 ++++ .../bussalesorder/BusSalesOrderService.java | 34 +++++++++++++-- 9 files changed, 113 insertions(+), 5 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java index 7ba6e1b64f..99b75d0715 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java @@ -138,7 +138,6 @@ public interface BaseDistributorFeign { @ApiOperation("移动端-销售订单-经销商分页列 表") @PostMapping("/getDistributorList") ResultBean> getDistributorList(@RequestBody PagerQuery pagerQuery); - @ApiOperation("移动端-经销商分页列表") @PostMapping("/getDistributorListOne") ResultBean> getDistributorListOne(@RequestBody PagerQuery pagerQuery); @@ -211,8 +210,13 @@ public interface BaseDistributorFeign { @GetMapping("/selectDisListBySid/{sid}") ResultBean selectDisListBySid(@PathVariable("sid") String sid); -// //---------------------------------------移动端流程---------------------------------------------// // @ApiOperation("经销商备案提交") // @PostMapping("/submitDistributor") // public ResultBean submitDistributor(@RequestBody @Valid AppSubmitDistributorApplyDto dto); + + + @ApiOperation("移动销售订单查询开票名称") + @GetMapping("/getInvoiceName") + ResultBean> getInvoiceName(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath, @RequestParam(value = "search", required = false) String search,@RequestParam("invoiceKey") String invoiceKey); + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java index 984dc6d9af..7ee992ebf5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java @@ -234,6 +234,11 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign { return null; } + @Override + public ResultBean> getInvoiceName(String userSid, String orgPath, String search, String invoiceKey) { + return null; + } + // @Override // public ResultBean submitDistributor(AppSubmitDistributorApplyDto dto) { // return null; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java index 7f576b943d..11cb92fccb 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java @@ -141,4 +141,6 @@ public interface BaseDistributorMapper extends BaseMapper { int updateFlowFiled(Map map); LoanCustomerRecord selectByRecord(String sid); + + List getInvoiceName(@Param("useOrgSid") String useOrgSid, @Param("s") String s); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml index c037f7db41..6f843b8538 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml @@ -306,4 +306,12 @@ and effectiveDate > NOW() order by id desc limit 1 + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java index 76d05988e0..0691ca4c6f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java @@ -368,6 +368,11 @@ public class BaseDistributorRest implements BaseDistributorFeign { return baseDistributorService.selectDisListBySid(sid); } + @Override + public ResultBean> getInvoiceName(String userSid, String orgPath, String search, String invoiceKey) { + return baseDistributorService.getInvoiceName(userSid,orgPath,search,invoiceKey); + } + // /*-----------------------------------移动端流程------------------------------------------------*/ // @Override // public ResultBean submitDistributor(AppSubmitDistributorApplyDto dto) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index abdfd30fad..044477e653 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -1529,6 +1529,48 @@ public class BaseDistributorService extends MybatisBaseService> getInvoiceName(String userSid, String orgPath, String search, String invoiceKey) { + ResultBean> rb = ResultBean.fireFail(); + List list = new ArrayList<>(); + if(StringUtils.isBlank(invoiceKey)){ + return rb.setMsg("请先选择开票类型"); + }else{ + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + list = baseMapper.getInvoiceName(useOrgSid,search); + list.removeAll(Collections.singleton(null)); + if(!list.isEmpty()){ + for (int i = 0; i < list.size(); i++) { + AppDisAndCustm appDisAndCustm = list.get(i); + Extra extra = new Extra(); + extra.setSid(appDisAndCustm.getId()); + extra.setName(appDisAndCustm.getDictValue()); + appDisAndCustm.setExtra(extra); + } + } + if("01".equals(invoiceKey)){ + CrmCustomerTempListQuery crmCustomerTempListQuery = new CrmCustomerTempListQuery(); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData(); + crmCustomerTempListQuery.setStaffSid(sysUserVo.getStaffSid()); + crmCustomerTempListQuery.setOrgPath(orgPath); + crmCustomerTempListQuery.setCertificateTypeKey("01"); + crmCustomerTempListQuery.setSearch(search); + List crmCustomerTempListVos = crmCustomerTempFeign.selectCustomerList(crmCustomerTempListQuery).getData(); + for (CrmCustomerTempListVo crmCustomerTempListVo : crmCustomerTempListVos) { + AppDisAndCustm appDisAndCustm = new AppDisAndCustm(); + Extra extra = new Extra(); + appDisAndCustm.setDictValue(crmCustomerTempListVo.getName()); + appDisAndCustm.setId(crmCustomerTempListVo.getSid()); + extra.setSid(appDisAndCustm.getId()); + extra.setName(appDisAndCustm.getDictValue()); + extra.setInfo(crmCustomerTempListVo.getIdCard()); + appDisAndCustm.setExtra(extra); + list.add(appDisAndCustm); + } + } + } + return rb.success().setData(list); + } + ////-------------------------------------流程------------------------------------------------/ // diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index d5972ba740..1223c5479d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -30,11 +30,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.base.api.basedistributor.BaseDistributor; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.buscenter.api.bussalesorder.*; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppModelInfoVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp; import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; import org.apache.ibatis.annotations.Mapper; @@ -230,4 +232,8 @@ public interface BusSalesOrderMapper extends BaseMapper { String selectByBusVinSid(String sid); LoanSolutions seletByOrderSid(String sid); + + BaseDistributor selectDis(String affiliatedOrgSid); + + CrmCustomerTemp selectCrm(String affiliatedOrgSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 332fed1a1a..45cd24aa33 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -619,4 +619,12 @@ + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 69f64b3669..e546936061 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -36,6 +36,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandMitQuery; import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitFeign; import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageFeign; +import com.yxt.anrui.base.api.basedistributor.BaseDistributor; import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanDetailsVo; import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanFeign; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; @@ -129,6 +130,7 @@ import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleServ import com.yxt.anrui.buscenter.biz.bussalesvehicleorder.BusSalesVehicleOrderService; import com.yxt.anrui.buscenter.biz.bussolutionschange.BusSolutionsChangeService; import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; import com.yxt.anrui.crm.api.crmvehicledemand.CrmOrderVo; @@ -2206,8 +2208,10 @@ public class BusSalesOrderService extends MybatisBaseService crmCustomerTempInfoVoResultBean = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(dto.getCustomerSid()); @@ -2246,7 +2255,8 @@ public class BusSalesOrderService extends MybatisBaseService