From fb50ad072c860d59afd0741e0f6be42b325a663d Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 30 Oct 2023 16:44:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B5=84=E6=96=B9=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E7=AE=80=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bussalesordervehicle/BusSalesOrderVehicleRest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java index e458038b71..5fc10ea8bc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java @@ -161,4 +161,4 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign { List busSalesOrderVehicles = busSalesOrderVehicleService.selectListByOrderSidAndXdConSid(saleOrderSid, loanContractSid); return rb.success().setData(busSalesOrderVehicles); } -} +} \ No newline at end of file From f304c1d6e548dc1e46a0e25dbfc989c61b2b6da5 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 31 Oct 2023 11:07:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=AD=E5=A2=9E=E5=8A=A0=E9=87=8D=E6=8E=A8?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8F=B0=E8=B4=A6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busdeliveredapply/BusDeliveredApplyFeign.java | 5 +++++ .../BusDeliveredApplyFeignFallback.java | 5 +++++ .../busdeliveredapply/BusDeliveredApplyRest.java | 5 +++++ .../busdeliveredapply/BusDeliveredApplyService.java | 13 +++++++++++++ 4 files changed, 28 insertions(+) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java index cdbf8a7cf2..79f10270c1 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java @@ -136,6 +136,11 @@ public interface BusDeliveredApplyFeign { @ResponseBody public ResultBean breakProcess(@Valid @RequestBody BusDeliveredApplyTaskQuery query); + @ApiOperation(value = "重推销售台账") + @PostMapping(value = "/ckxstz") + @ResponseBody + public ResultBean ckxstz(@RequestParam("ckSid") String ckSid); + @ApiOperation("手机端-获取 出库申请列表") @PostMapping("/getRetrievalApplyList") @ResponseBody diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java index 2738da7fa3..c6dd7e1cbd 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java @@ -221,6 +221,11 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign { return null; } + @Override + public ResultBean ckxstz(String ckSid) { + return null; + } + @Override public ResultBean> getRetrievalApplyList(PagerQuery pagerQuery) { return null; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java index 143c985daf..7ab5478323 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java @@ -295,6 +295,11 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign { return busDeliveredApplyService.breakProcess(query); } + @Override + public ResultBean ckxstz(String ckSid) { + return busDeliveredApplyService.ckxstz(ckSid); + } + @Override public ResultBean> getRetrievalApplyList(PagerQuery pagerQuery) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 65d5e49d9f..548e59d578 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -4701,4 +4701,17 @@ public class BusDeliveredApplyService extends MybatisBaseService detailsList = busDeliveredApplyDetailsService.selectByApplySid(busDeliveredApply.getSid()); + ResultBean orderDetailsVoResultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(busDeliveredApply.getContractNo()); + if (!orderDetailsVoResultBean.getSuccess()) { + log.error("获取销售订单详情出错啦！！！"); + } + ResultBean userVoResultBean = sysUserFeign.fetchBySid(busDeliveredApply.getStaffUserSid()); + pushOutApply(busDeliveredApply, detailsList, orderDetailsVoResultBean.getData(), userVoResultBean.getData()); + return rb.success(); + } } \ No newline at end of file