From 13115972947c0c537e13a01525cda9f129ae09e4 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 2 Sep 2022 15:58:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9=E4=BB=A5=E5=8F=8Apc?= =?UTF-8?q?=E7=AB=AF=E5=8E=82=E5=AE=B6=E9=87=87=E8=B4=AD=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicle/BaseVehicleReturnQuery.java | 2 + .../biz/basevehicle/BaseVehicleService.java | 3 + .../api/bussalesorder/BusSalesOrderFeign.java | 4 +- .../BusSalesOrderFeignFallback.java | 2 +- .../app/order/AppOrderInitQuery.java | 20 +++++ .../biz/bussalesorder/BusSalesOrderRest.java | 4 +- .../bussalesorder/BusSalesOrderService.java | 43 ++++++---- .../crm/api/crmvehicledemand/CrmOrderVo.java | 42 ++++++++++ .../CrmVehicledemandFeign.java | 4 + .../CrmVehicledemandFeignFallback.java | 5 ++ .../CrmVehicledemandMapper.java | 2 + .../CrmVehicledemandMapper.xml | 7 ++ .../CrmVehicledemandRest.java | 5 ++ .../CrmVehicledemandService.java | 6 ++ .../FinPaymentrecordService.java | 82 +++++++++++++++++++ .../saleOrders/AppBusSalesOrderFeign.java | 4 +- .../AppBusSalesOrderFeignFallback.java | 2 +- .../saleOrders/order/OrderInitQuery.java | 20 +++++ .../saleOrders/AppBusSalesOrderRest.java | 4 +- .../saleOrders/AppBusSalesOrderService.java | 6 +- 20 files changed, 240 insertions(+), 27 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderInitQuery.java create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmOrderVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderInitQuery.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java index 9757986591..31312ff0cf 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java @@ -49,6 +49,8 @@ public class BaseVehicleReturnQuery implements Query { private String userSid; @ApiModelProperty(value = "orgSid") private String orgSid; + @ApiModelProperty("厂家采购订单编号") + private String orderingNo; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index b91ca010dc..3e64ddcc31 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -1420,6 +1420,9 @@ public class BaseVehicleService extends MybatisBaseService getBillInfo(@PathVariable("saleOrderSid") String saleOrderSid); + public ResultBean getBillInfo(@SpringQueryMap AppOrderInitQuery appOrderInitQuery); /** * 新增保存销售订单信息 diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java index a91f881bc0..10847c0872 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java @@ -131,7 +131,7 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign { } @Override - public ResultBean getBillInfo(String saleOrderSid) { + public ResultBean getBillInfo(AppOrderInitQuery appOrderInitQuery) { return null; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderInitQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderInitQuery.java new file mode 100644 index 0000000000..1dc44cb4c7 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderInitQuery.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.buscenter.api.bussalesorder.app.order; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/2 14:11 + * @Description + */ +@Data +public class AppOrderInitQuery implements Query { + private static final long serialVersionUID = 7113663851206157068L; + + @ApiModelProperty("销售订单sid") + private String saleOrderSid; + @ApiModelProperty("意向车型sid") + private String intentionSid; +} 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 995da96fca..6f6abb009a 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 @@ -191,9 +191,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { @Override @ApiOperation("App初始化销售订单单据信息") - public ResultBean getBillInfo(String saleOrderSid) { + public ResultBean getBillInfo(AppOrderInitQuery appOrderInitQuery) { ResultBean rb = ResultBean.fireFail(); - AppBusSalesOrderBillInfoVo vo = busSalesOrderService.getBillInfo(saleOrderSid); + AppBusSalesOrderBillInfoVo vo = busSalesOrderService.getBillInfo(appOrderInitQuery); return rb.success().setData(vo); } 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 a4d2b2fb0a..f92a3783ea 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 @@ -88,6 +88,7 @@ import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleServ import com.yxt.anrui.buscenter.biz.bussalesvehicleorder.BusSalesVehicleOrderService; import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; +import com.yxt.anrui.crm.api.crmvehicledemand.CrmOrderVo; import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicleDemandOrderVo; import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign; @@ -1263,23 +1264,35 @@ public class BusSalesOrderService extends MybatisBaseService resultBean = crmVehicledemandFeign.selectCrmDemand(intentionSid); + CrmOrderVo crmOrderVo = resultBean.getData(); + BeanUtil.copyProperties(crmOrderVo,vo); + vo.setIntentionSid(intentionSid); + vo.setAffiliatedType("1"); + + } + } return vo; diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmOrderVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmOrderVo.java new file mode 100644 index 0000000000..d61e9f9331 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmOrderVo.java @@ -0,0 +1,42 @@ +package com.yxt.anrui.crm.api.crmvehicledemand; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/8/31 16:39 + * @Description + */ +@Data +public class CrmOrderVo implements Vo { + private static final long serialVersionUID = 441436313342084907L; + + @ApiModelProperty("客户名称") + private String customerName; + + @ApiModelProperty("客户手机号") + private String customerMobile; + + @ApiModelProperty("付款类型") + private String payType; + + @ApiModelProperty("付款类型") + private String payValue; + + + @ApiModelProperty(value = "金融方案") + private String financePlan; + + @ApiModelProperty(value = "金融方案value") + private String financePlanValue; + + @ApiModelProperty("客户sid") + private String customerSid; + + + + + +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java index 5536d35240..f1b7dbb3e7 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java @@ -154,5 +154,9 @@ public interface CrmVehicledemandFeign { @GetMapping("/getInfo/{intentionSid}") ResultBean getInfo(@PathVariable("intentionSid") String intentionSid); + @ApiOperation("根据意向车型sid查询客户的车辆需求") + @GetMapping("/selectCrmDemand/{intentionSid}") + ResultBean selectCrmDemand(@PathVariable("intentionSid") String intentionSid); + } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeignFallback.java index bf56a6dfa8..2437d585e6 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeignFallback.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeignFallback.java @@ -99,6 +99,11 @@ public class CrmVehicledemandFeignFallback implements CrmVehicledemandFeign { return null; } + @Override + public ResultBean selectCrmDemand(String intentionSid) { + return null; + } + //app diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java index 0c4d4bf783..9d225b83e8 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java @@ -112,4 +112,6 @@ public interface CrmVehicledemandMapper extends BaseMapper { CrmVehicledemand selectOneBySid(String vehicSid); CrmVehicleDemandOrderVo getInfo(String intentionSid); + + CrmOrderVo selectCrmDemand(String intentionSid); } \ No newline at end of file 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 7aed51f2a5..5839cd7f29 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 @@ -183,4 +183,11 @@ from crm_vehicledemand where sid = #{intentionSid} + + \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java index 2b927663be..a7c2fcc625 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java @@ -197,4 +197,9 @@ public class CrmVehicledemandRest implements CrmVehicledemandFeign { public ResultBean getInfo(String intentionSid) { return crmVehicledemandService.getInfo(intentionSid); } + + @Override + public ResultBean selectCrmDemand(String intentionSid) { + return crmVehicledemandService.selectCrmDemand(intentionSid); + } } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java index 9c4e2eca99..211e9c468b 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java @@ -487,4 +487,10 @@ public class CrmVehicledemandService extends MybatisBaseService selectCrmDemand(String intentionSid) { + ResultBean rb = ResultBean.fireFail(); + CrmOrderVo crmOrderVo = baseMapper.selectCrmDemand(intentionSid); + return rb.success().setData(crmOrderVo); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index e4a0790220..20e6b37270 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -26,13 +26,18 @@ package com.yxt.anrui.fin.biz.finpaymentrecord; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufUpdateDto; import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionFeign; +import com.yxt.anrui.base.common.enums.ManPurOrderType; import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply; import com.yxt.anrui.fin.api.finpaymentrecord.*; +import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill; import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService; +import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; +import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -69,6 +74,10 @@ public class FinPaymentrecordService extends MybatisBaseService listPageVo(PagerQuery pq) { FinPaymentrecordQuery query = pq.getParams(); @@ -145,7 +154,80 @@ public class FinPaymentrecordService extends MybatisBaseService FPAYBILLENTRYs = new ArrayList<>(); + if (finPaymentrecord.getCost() != null + && finPaymentrecord.getCost() > 0) { + ApPayBill.FPAYBILLENTRY fpaybillentry = new ApPayBill.FPAYBILLENTRY(); + //应付金额 + fpaybillentry.setFPAYTOTALAMOUNTFOR(Double.valueOf(finPaymentrecord.getCost())); + //付款金额 + fpaybillentry.setFPAYAMOUNTFOR_E(Double.valueOf(finPaymentrecord.getCost())); + //折后金额 + fpaybillentry.setFSETTLEPAYAMOUNTFOR(Double.valueOf(finPaymentrecord.getCost())); + //实付金额 + fpaybillentry.setFREALPAYAMOUNTFOR_D(Double.valueOf(finPaymentrecord.getCost())); + //付款金额本位币 + fpaybillentry.setFPAYAMOUNT_E(Double.valueOf(finPaymentrecord.getCost())); + //登账日期 + fpaybillentry.setFPOSTDATE(DateUtil.formatDate(finPaymentrecord.getPayDate())); + //入账类型 + fpaybillentry.setFRuZhangType("1"); + //我方银行账号 + fpaybillentry.setFACCOUNTID(finPaymentrecord.getReceiveBankAccount()); + //支付类型 + fpaybillentry.setFPayType("A"); + //付款用途 + if(ManPurOrderType.CostTitle.DJ_COSTTITLE.getRemarks().equals(finPaymentrecord.getCostTitleValue())){ + //订金 + fpaybillentry.setFPURPOSEID("SFKYT09_SYS"); + }else{ + //车款 + fpaybillentry.setFPURPOSEID("SFKYT08_SYS"); + } + //结算方式 + if("承兑".equals(finPaymentrecord.getPayWayValue())){ + fpaybillentry.setFSETTLETYPEID("09"); + } + FPAYBILLENTRYs.add(fpaybillentry); + } + if (FPAYBILLENTRYs.size() > 0) { + apPayBill.setFPAYBILLENTRY(FPAYBILLENTRYs); + return apPayBill; + } else { + return null; + } + + } } \ No newline at end of file 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 3f239c3ccf..75b95982fd 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 @@ -97,9 +97,9 @@ public interface AppBusSalesOrderFeign { public ResultBean deleteSaleOrder(@PathVariable("saleOrderSid") String saleOrderSid, @PathVariable("userSid") String userSid); @ApiOperation("初始化销售订单单据信息") - @GetMapping("/init/billInfo/{saleOrderSid}") + @GetMapping("/init/billInfo") @ResponseBody - public ResultBean getBillInfo(@PathVariable("saleOrderSid") String saleOrderSid); + public ResultBean getBillInfo(@SpringQueryMap OrderInitQuery orderInitQuery); @ApiOperation("新增/修改销售订单单据") @PostMapping("/save/billInfo") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java index adf06ab009..f64f05e11b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java @@ -84,7 +84,7 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign { } @Override - public ResultBean getBillInfo(String saleOrderSid) { + public ResultBean getBillInfo(OrderInitQuery orderInitQuery) { return null; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderInitQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderInitQuery.java new file mode 100644 index 0000000000..e696e6e90e --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderInitQuery.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.order; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/2 14:02 + * @Description + */ +@Data +public class OrderInitQuery implements Query { + private static final long serialVersionUID = -6375976467529224306L; + + @ApiModelProperty("销售订单sid") + private String saleOrderSid; + @ApiModelProperty("意向车型sid") + private String intentionSid; +} 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 71cb68037d..c78f923383 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 @@ -101,8 +101,8 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign { @Override @ApiOperation("初始化销售订单单据信息") - public ResultBean getBillInfo(String saleOrderSid) { - return appBusSalesOrderService.getBillInfo(saleOrderSid); + public ResultBean getBillInfo(OrderInitQuery orderInitQuery) { + return appBusSalesOrderService.getBillInfo(orderInitQuery); } @Override 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 acd99661c9..622c6339be 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 @@ -187,10 +187,12 @@ public class AppBusSalesOrderService { * @param userSid * @return */ - public ResultBean getBillInfo(String saleOrderSid) { + public ResultBean getBillInfo(OrderInitQuery orderInitQuery) { ResultBean rb = ResultBean.fireFail(); BusSalesOrderBillInfoVo vo = new BusSalesOrderBillInfoVo(); - ResultBean resultBean = busSalesOrderFeign.getBillInfo(saleOrderSid); + AppOrderInitQuery appOrderInitQuery = new AppOrderInitQuery(); + BeanUtil.copyProperties(orderInitQuery,appOrderInitQuery); + ResultBean resultBean = busSalesOrderFeign.getBillInfo(appOrderInitQuery); AppBusSalesOrderBillInfoVo appBusSalesOrderBillInfoVo = resultBean.getData(); BeanUtil.copyProperties(appBusSalesOrderBillInfoVo, vo); return rb.success().setData(vo);