Merge remote-tracking branch 'origin/master'

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

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<PagerVo<AppDeliveredApplyPageVo>> getRetrievalApplyList(PagerQuery<AppDeliveredApplyPageQuery> pagerQuery) {
         return null;

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<PagerVo<AppDeliveredApplyPageVo>> getRetrievalApplyList(PagerQuery<AppDeliveredApplyPageQuery> pagerQuery) {
         ResultBean rb = ResultBean.fireFail();

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<BusDeliveredApp
         flowFeign.delegate(delegateQuery);
         return rb.success();
     }
+
+    public ResultBean ckxstz(String ckSid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusDeliveredApply busDeliveredApply = fetchBySid(ckSid);
+        List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(busDeliveredApply.getSid());
+        ResultBean<AppOrderDetailsVo> orderDetailsVoResultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(busDeliveredApply.getContractNo());
+        if (!orderDetailsVoResultBean.getSuccess()) {
+            log.error("获取销售订单详情出错啦！！！");
+        }
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(busDeliveredApply.getStaffUserSid());
+        pushOutApply(busDeliveredApply, detailsList, orderDetailsVoResultBean.getData(), userVoResultBean.getData());
+        return rb.success();
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java

@@ -168,4 +168,4 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
         List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selByLoanContractSid(loanContractSid);
         return rb.success().setData(busSalesOrderVehicles);
     }
-}
+}