From d8c814e2b94dff3b606648be30cb30fdd61e5513 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 10 Jul 2024 16:13:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=8C=89=E7=85=A7=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E5=AE=A2=E6=88=B7=E4=B8=8B=E5=B7=B2=E5=8A=9E?= =?UTF-8?q?=E7=BB=93=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=AE=8C=E6=88=90?= =?UTF-8?q?=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=94=80=E5=94=AE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=BB=8F=E9=94=80?= =?UTF-8?q?=E5=95=86=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5=E5=AE=8C=E6=88=90?= =?UTF-8?q?=20=E5=88=9B=E5=BB=BA=E5=AE=A2=E6=88=B7=E6=97=B6=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=88=9B=E5=BB=BA=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=20=E5=AE=A2=E6=88=B7=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AE=8C=E5=96=84=E5=92=8C=E8=BA=AB=E4=BB=BD=E8=AF=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=98=AF=E5=90=A6=E5=AE=8C=E5=96=84=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=AD=97=E6=AE=B5=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bussalesorder/BusSalesOrderFeign.java | 7 + .../app/order/AppBusSalesOrderQuery.java | 3 - .../app/order/AppBusSalesOrderVo.java | 3 + .../biz/bussalesorder/BusSalesOrderRest.java | 7 + .../bussalesorder/BusSalesOrderService.java | 165 +++++++++++++----- .../CrmCustomerTempService.java | 10 +- .../portal/api/sysuser/SysUserFeign.java | 4 + .../api/sysuser/SysUserFeignFallback.java | 5 + .../portal/api/sysuser/wx/WxHomePageVo.java | 5 + .../anrui/portal/biz/sysuser/SysUserRest.java | 28 +++ .../saleOrders/AppBusSalesOrderFeign.java | 7 + .../saleOrders/order/BusOrderSalesVo.java | 3 + .../saleOrders/AppBusSalesOrderRest.java | 6 + .../saleOrders/AppBusSalesOrderService.java | 8 + 14 files changed, 210 insertions(+), 51 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 9b734f1a7d..675c5c51bf 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -403,4 +403,11 @@ public interface BusSalesOrderFeign { @PostMapping("/saveList") @ResponseBody void saveList(@RequestBody() List orders); + + /**********************************************小程序订单列表********************************************************/ + + @ApiOperation("小程序销售订单分页列表") + @PostMapping("/getSaleOrdersWx") + @ResponseBody + public ResultBean> getSaleOrdersWx(@RequestBody PagerQuery pq); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderQuery.java index fbc25a0ea8..39360ba0ae 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderQuery.java @@ -63,7 +63,4 @@ public class AppBusSalesOrderQuery implements Query { private String staffSid; @ApiModelProperty("当前组织机构全路径sid") private String orgPath; - - - } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java index e043f3a3fc..7b13ef56bb 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java @@ -53,6 +53,9 @@ import lombok.Data; public class AppBusSalesOrderVo implements Vo { private static final long serialVersionUID = -5570433499942792774L; + + @ApiModelProperty("经销商") + private String dealer; /** * 销售订单sid */ diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index 0d1273db11..78939f316a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -456,4 +456,11 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { public void saveList(List orders) { busSalesOrderService.saveList(orders); } + + @Override + public ResultBean> getSaleOrdersWx(PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = busSalesOrderService.getSaleOrdersWx(pq); + return rb.success().setData(pv); + } } 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 1e2a1dd67a..e27b50ee7b 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 @@ -430,7 +430,7 @@ public class BusSalesOrderService extends MybatisBaseService busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(sid); - if (busSalesOrderTrailerDetailsVos.size() == 1){ + if (busSalesOrderTrailerDetailsVos.size() == 1) { BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo = busSalesOrderTrailerDetailsVos.get(0); BusSalesOrderTrailer busSalesOrderTrailer = busSalesOrderTrailerService.fetchBySid(busSalesOrderTrailerDetailsVo.getSid()); String certFile = busSalesOrderTrailer.getCertFile(); - if (StringUtils.isNotBlank(certFile)){ + if (StringUtils.isNotBlank(certFile)) { String[] certFiles = certFile.split(","); List certFiless = new ArrayList<>(); for (String path : certFiles) { @@ -497,7 +497,7 @@ public class BusSalesOrderService extends MybatisBaseService contractFiless = new ArrayList<>(); for (String path : contractFiles) { @@ -509,12 +509,12 @@ public class BusSalesOrderService extends MybatisBaseService certFiless1 = new ArrayList<>(); for (String path : certFiles1) { @@ -526,7 +526,7 @@ public class BusSalesOrderService extends MybatisBaseService contractFiless1 = new ArrayList<>(); for (String path : contractFiles1) { @@ -541,7 +541,7 @@ public class BusSalesOrderService extends MybatisBaseService certFiless2 = new ArrayList<>(); for (String path : certFiles2) { @@ -553,7 +553,7 @@ public class BusSalesOrderService extends MybatisBaseService contractFiless2 = new ArrayList<>(); for (String path : contractFiles2) { @@ -709,9 +709,9 @@ public class BusSalesOrderService extends MybatisBaseService 0){ + if (i > 0) { vo.setTrailerInfoState(1); - }else { + } else { vo.setTrailerInfoState(0); } - }else { + } else { vo.setTrailerState(false); vo.setTrailerInfoState(0); } @@ -2150,6 +2150,26 @@ public class BusSalesOrderService extends MybatisBaseService appCreateQueryWrapperWx(AppBusSalesOrderQuery query) { + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + if (StringUtils.isNotBlank(query.getUserSid())) { + SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData(); + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.selByMobile(sysUserVo.getMobile()).getData(); + qw.eq("bo.customerSid", crmCustomerTempVo.getSid()); + } + qw.eq("bo.nodeState", "已办结"); + } + return qw; + } + /** * App销售订单分页列表 * @@ -2510,9 +2530,9 @@ public class BusSalesOrderService extends MybatisBaseService appOrderTrailerInfoVos = new ArrayList<>(); for (BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo : busSalesOrderTrailerDetailsVos) { AppOrderTrailerInfoVo appOrderTrailerInfoVo = new AppOrderTrailerInfoVo(); - BeanUtil.copyProperties(busSalesOrderTrailerDetailsVo,appOrderTrailerInfoVo,"contractFile","certFile"); + BeanUtil.copyProperties(busSalesOrderTrailerDetailsVo, appOrderTrailerInfoVo, "contractFile", "certFile"); List contractFile = busSalesOrderTrailerDetailsVo.getContractFile(); List certFile = busSalesOrderTrailerDetailsVo.getCertFile(); ArrayList contractFileString = new ArrayList<>(); @@ -3909,9 +3929,9 @@ public class BusSalesOrderService extends MybatisBaseService busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(busSalesOrder.get().getSid()); BigDecimal total = new BigDecimal("0"); @@ -5221,10 +5241,10 @@ public class BusSalesOrderService extends MybatisBaseService busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(busSalesOrder.getSid()); //获取挂车金额 BigDecimal gcMoney = new BigDecimal("0"); - if ("1".equals(busSalesOrder.getPayTypeKey())){ - if (busSalesOrderTrailerDetailsVos.size() == 1){ + if ("1".equals(busSalesOrder.getPayTypeKey())) { + if (busSalesOrderTrailerDetailsVos.size() == 1) { gcMoney = gcMoney.add(busSalesOrderTrailerDetailsVos.get(0).getSingleFinalPrice().multiply(new BigDecimal(busSalesOrderTrailerDetailsVos.get(0).getTrailerCount()))); - }else if (busSalesOrderTrailerDetailsVos.size() == 2){ + } else if (busSalesOrderTrailerDetailsVos.size() == 2) { BigDecimal gc1 = busSalesOrderTrailerDetailsVos.get(0).getSingleFinalPrice().multiply(new BigDecimal(busSalesOrderTrailerDetailsVos.get(0).getTrailerCount())); BigDecimal gc2 = busSalesOrderTrailerDetailsVos.get(1).getSingleFinalPrice().multiply(new BigDecimal(busSalesOrderTrailerDetailsVos.get(1).getTrailerCount())); gcMoney = gcMoney.add(gc1).add(gc2); @@ -6136,10 +6156,10 @@ public class BusSalesOrderService extends MybatisBaseService busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(busSalesOrder.getSid()); //获取挂车金额 BigDecimal gcMoney = new BigDecimal("0"); - if ("1".equals(busSalesOrder.getPayTypeKey())){ - if (busSalesOrderTrailerDetailsVos.size() == 1){ + if ("1".equals(busSalesOrder.getPayTypeKey())) { + if (busSalesOrderTrailerDetailsVos.size() == 1) { gcMoney = gcMoney.add(busSalesOrderTrailerDetailsVos.get(0).getSingleFinalPrice().multiply(new BigDecimal(busSalesOrderTrailerDetailsVos.get(0).getTrailerCount()))); - }else if (busSalesOrderTrailerDetailsVos.size() == 2){ + } else if (busSalesOrderTrailerDetailsVos.size() == 2) { BigDecimal gc1 = busSalesOrderTrailerDetailsVos.get(0).getSingleFinalPrice().multiply(new BigDecimal(busSalesOrderTrailerDetailsVos.get(0).getTrailerCount())); BigDecimal gc2 = busSalesOrderTrailerDetailsVos.get(1).getSingleFinalPrice().multiply(new BigDecimal(busSalesOrderTrailerDetailsVos.get(1).getTrailerCount())); gcMoney = gcMoney.add(gc1).add(gc2); @@ -7681,9 +7701,9 @@ public class BusSalesOrderService extends MybatisBaseService busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(saleOrderSid); - if (null != busSalesOrderTrailerDetailsVos){ + if (null != busSalesOrderTrailerDetailsVos) { for (BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo : busSalesOrderTrailerDetailsVos) { - if (null != busSalesOrderTrailerDetailsVo){ + if (null != busSalesOrderTrailerDetailsVo) { BusSalesOrderTrailer newBusSalesOrderTrailer = new BusSalesOrderTrailer(); String makeupSid = newBusSalesOrderTrailer.getSid(); Date makeupCreateTime = newBusSalesOrderTrailer.getCreateTime(); @@ -8272,6 +8292,63 @@ public class BusSalesOrderService extends MybatisBaseService orders) { - baseMapper.saveList(orders); + baseMapper.saveList(orders); + } + + public PagerVo getSaleOrdersWx(PagerQuery pq) { + QueryWrapper qw = appCreateQueryWrapperWx(pq.getParams()); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), ""); + for (AppBusSalesOrderVo record : pagging.getRecords()) { + record.setShowFinancialBtn(false); + record.setShowStopBtn(false); + record.setShowContractBtn(false); + record.setShowBorrowBtn(false); + record.setShowInputBtn(false); + record.setShowApplyBtn(false); + if (StringUtils.isBlank(record.getClosingDate())) { + record.setClosingDate("-"); + } + if (StringUtils.isNotBlank(record.getCustomerImage())) { + record.setCustomerImage(fileUploadComponent.getUrlPrefix() + record.getCustomerImage()); + } + //已交定金 + String deposit = "-"; + BigDecimal depositBig = new BigDecimal("0"); + if (StringUtils.isNotBlank(record.getDepositAll())) { + //需补交订金 + if (StringUtils.isNotBlank(record.getMakeUpDeposit())) { + depositBig = new BigDecimal(record.getDepositAll()).subtract(new BigDecimal(record.getMakeUpDeposit())); + } else { + depositBig = new BigDecimal(record.getDepositAll()); + } + //将已交订金转为string + deposit = depositBig.toString(); + } + record.setDeposit(deposit); + //查询车型信息 + AppModelInfoVo appModelInfo = baseMapper.selectModelInfoByOrderSid(record.getSaleOrderSid()); + if (appModelInfo != null) { + if (StringUtils.isBlank(appModelInfo.getPrice())) { + appModelInfo.setPrice("-"); + } + //根据车型查询车型图片 + ResultBean imageString = baseVehicleModelAppendixFeign.selectImage(appModelInfo.getModelSid()); + if (imageString.getSuccess()) { + appModelInfo.setCarImage(imageString.getData().toString()); + } + record.setModelInfo(appModelInfo); + } + //是否保险 + String insuranceInfo = record.getInsuranceInfo(); + if (StringUtils.isBlank(insuranceInfo)) { + record.setInsuranceInfo("-"); + } + if (StringUtils.isBlank(record.getSaleOrderState())) { + record.setSaleOrderState("待提交"); + } + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; } } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index 4da467a42b..9953b4abae 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -43,10 +43,7 @@ import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; -import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; -import com.yxt.anrui.portal.api.sysuser.SysUserFeign; -import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; -import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.portal.api.sysuser.*; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; import com.yxt.anrui.portal.config.DictCommonType; import com.yxt.common.base.config.component.FileUploadComponent; @@ -935,6 +932,11 @@ public class CrmCustomerTempService extends MybatisBaseService().fail().setMsg("手机号不能为空"); + } else { + SysUser one = sysUserService.fetchByUserName(mobile); + if (null != one) { + return new ResultBean().fail().setMsg("手机号重复!`"); + } + } + if (userType == 0) { + return new ResultBean().fail().setMsg("用户类型不能为空"); + } + String password = mobile.substring(5, 11); + String md5 = Encodes.md5(password); + SysUser su = new SysUser(); + dto.fillEntity(su); + su.setUserName(mobile); + su.setPassword(md5); + sysUserService.save(su); + return rb.success(); + } + @Override public ResultBean delSysUserByMobile(String mobile) { int i = sysUserService.delSysUserByMobile(mobile); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java index 59f8fefdde..33ec51045a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java @@ -81,6 +81,13 @@ import java.util.List; fallback = AppBusSalesOrderFeignFallback.class) public interface AppBusSalesOrderFeign { + /*-------------------------------------小程序销售订单接口----------------------------------------------*/ + + @ApiOperation("小程序销售订单分页列表") + @PostMapping("/getSaleOrdersWx") + @ResponseBody + public ResultBean> getSaleOrdersWx(@RequestBody PagerQuery pq); + /*-------------------------------------App销售订单接口------------------------------------------------*/ @ApiOperation("初始化销售订单状态") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java index eca7e1927f..a8686f24ff 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java @@ -15,6 +15,9 @@ import lombok.Data; public class BusOrderSalesVo implements Vo { private static final long serialVersionUID = 6162163732173109484L; + @ApiModelProperty("经销商") + private String dealer; + /** * 销售订单sid */ diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java index 6a24505f49..0d5bde0557 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java @@ -83,6 +83,12 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign { @Autowired AppBusSalesOrderService appBusSalesOrderService; + /************************************ 小程序订单接口 *********************************************/ + + @Override + public ResultBean> getSaleOrdersWx(PagerQuery pq) { + return appBusSalesOrderService.getSaleOrdersWx(pq); + } /************************************* 销售订单接口 *********************************************/ diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index d3c5e5bddb..dd6d580af5 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -1021,4 +1021,12 @@ public class AppBusSalesOrderService { appSalesOrderTrailerDetailsVo.setContractFile(contractFiless); return rb.success().setData(appSalesOrderTrailerDetailsVo); } + + public ResultBean> getSaleOrdersWx(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); + ResultBean> resultBean = busSalesOrderFeign.getSaleOrdersWx(pq); + PagerVo vo = CoverUtils.selectPagerVo(resultBean.getData()); + return rb.success().setMsg("当前共查询到" + vo.getTotal() + "条记录").setData(vo); + } } \ No newline at end of file