销售订单重启发起更换客户

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -173,6 +173,12 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     public ResultBean rePublishSaleOrder(@PathVariable("saleOrderSid") String saleOrderSid) throws InvocationTargetException, IllegalAccessException;
 
+
+    @ApiOperation("重新发起")
+    @GetMapping("/rePublishSaleOrder")
+    @ResponseBody
+    public ResultBean rePublishSaleOrder(@RequestParam("saleOrderSid")String saleOrderSid,@RequestParam(value = "customerSid",required = false)String customerSid,@RequestParam(value = "customerName",required = false)String customerName,@RequestParam(value = "customerMobile",required = false)String customerMobile) throws InvocationTargetException, IllegalAccessException;
+
     /**
      * 新增保存销售订单信息
      *

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -156,6 +156,11 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean rePublishSaleOrder(String saleOrderSid, String customerSid, String customerName, String customerMobile) {
+        return null;
+    }
+
     @Override
     public ResultBean saveBillInfo(AppBusSalesOrderAllDto dto) {
         return null;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java

@@ -219,7 +219,12 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     @Override
     public ResultBean<String> rePublishSaleOrder(String saleOrderSid) throws InvocationTargetException, IllegalAccessException {
 
-        return busSalesOrderService.rePublishSaleOrder(saleOrderSid);
+        return busSalesOrderService.rePublishSaleOrder(saleOrderSid,"","","");
+    }
+
+    @Override
+    public ResultBean rePublishSaleOrder(String saleOrderSid, String customerSid, String customerName, String customerMobile) throws InvocationTargetException, IllegalAccessException {
+        return busSalesOrderService.rePublishSaleOrder(saleOrderSid,customerSid,customerName,customerMobile);
     }
 
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -6553,7 +6553,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     }
 
 
-    public ResultBean rePublishSaleOrder(String saleOrderSid) throws InvocationTargetException, IllegalAccessException {
+    public ResultBean rePublishSaleOrder(String saleOrderSid, String customerSid, String customerName, String customerMobile) throws InvocationTargetException, IllegalAccessException {
         ResultBean rb = ResultBean.fireFail();
         String newSalesOrderSid = "";
         boolean saleOrderSave = false;
@@ -6578,6 +6578,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             newSalesOrder.setContractNo(null);
             newSalesOrder.setCreateTime(createTime);
             newSalesOrder.setModifyTime(modifyTime);
+            if(StringUtils.isNotBlank(customerSid)){
+                newSalesOrder.setCustomerSid(customerSid);
+                newSalesOrder.setCustomerName(customerName);
+                newSalesOrder.setMobile(customerMobile);
+                ResultBean<CrmCustomerTempVo> crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(customerSid);
+                if(crmCustomerTempVoResultBean.getData() != null){
+                    newSalesOrder.setCustomerClass(crmCustomerTempVoResultBean.getData().getCustomerClass());
+                    newSalesOrder.setCustomerClassKey(crmCustomerTempVoResultBean.getData().getCustomerClassKey());
+                }
+            }
             saleOrderSave = this.save(newSalesOrder);
         }
         //根据销售订单sid 复制销售订单-订金信息

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@@ -112,6 +112,12 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     public ResultBean rePublishSaleOrder(@PathVariable String saleOrderSid) throws InvocationTargetException, IllegalAccessException;
 
+
+    @ApiOperation("重新发起")
+    @GetMapping("rePublishSaleOrder")
+    @ResponseBody
+    public ResultBean rePublishSaleOrder(@RequestParam("saleOrderSid")String saleOrderSid,@RequestParam(value = "customerSid",required = false)String customerSid,@RequestParam(value = "customerName",required = false)String customerName,@RequestParam(value = "customerMobile",required = false)String customerMobile) throws InvocationTargetException, IllegalAccessException;
+
     /*-----------------------------------------车型信息------------------------------------------*/
 
     @ApiOperation("初始化销售订单车型信息")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@@ -99,6 +99,11 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean rePublishSaleOrder(String saleOrderSid, String customerSid, String customerName, String customerMobile) {
+        return null;
+    }
+
     @Override
     public ResultBean<BusSaleOrderInitModelInfoVo> getInitModelInfo(String saleOrderSid, String customerSid, String userSid) {
         return null;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -118,7 +118,12 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
     @Override
     @ApiOperation("重新提交")
     public ResultBean rePublishSaleOrder(String saleOrderSid) throws InvocationTargetException, IllegalAccessException {
-        return appBusSalesOrderService.rePublishSaleOrder(saleOrderSid);
+        return appBusSalesOrderService.rePublishSaleOrder(saleOrderSid,"","","");
+    }
+
+    @Override
+    public ResultBean rePublishSaleOrder(String saleOrderSid, String customerSid, String customerName, String customerMobile) throws InvocationTargetException, IllegalAccessException {
+        return  appBusSalesOrderService.rePublishSaleOrder(saleOrderSid,customerSid,customerName,customerMobile);
     }
 
     @Override

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -694,9 +694,9 @@ public class AppBusSalesOrderService {
     }
 
 
-    public ResultBean<String> rePublishSaleOrder(String saleOrderSid) throws InvocationTargetException, IllegalAccessException {
+    public ResultBean<String> rePublishSaleOrder(String saleOrderSid,String customerSid, String customerName, String customerMobile) throws InvocationTargetException, IllegalAccessException {
         ResultBean rb = ResultBean.fireFail();
-        ResultBean resultBean = busSalesOrderFeign.rePublishSaleOrder(saleOrderSid);
+        ResultBean resultBean = busSalesOrderFeign.rePublishSaleOrder(saleOrderSid,customerSid,customerName,customerMobile);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }