xuq

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/OrderBaseController.java

@@ -346,12 +346,10 @@ public class OrderBaseController {
     @PostMapping("/import")
     @ApiOperation(value = "导入工单，模板名：工单导入模板.xlsx")
     public ResponseHelper importData(
-            @RequestParam MultipartFile file,
-            @RequestParam String createWebsitId,
-            @RequestParam String createWebsitName
+            @RequestParam MultipartFile file
     ) throws IOException {
         List<Object> objects = ExcelUtils.importExcel(file);
-        orderBaseExcelLogic.importOrder(objects,createWebsitId,createWebsitName);
+        orderBaseExcelLogic.importOrder(objects);
         return ResponseHelper.success();
     }
 
@@ -359,12 +357,11 @@ public class OrderBaseController {
     @PostMapping("/import2")
     @ApiOperation(value = "导入工单，模板名：工单导入模板2.xlsx")
     public ResponseHelper importData2(
-            @RequestParam MultipartFile file,
-                     @RequestParam String createWebsitId,
-            @RequestParam String createWebsitName
+            @RequestParam MultipartFile file
+
     ) throws IOException {
         List<Object> objects = ExcelUtils.importExcel(file);
-        orderBaseExcelLogic.importOrder2(objects,createWebsitId,createWebsitName);
+        orderBaseExcelLogic.importOrder2(objects);
         return ResponseHelper.success();
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseExcelLogic.java

@@ -78,7 +78,7 @@ public class OrderBaseExcelLogic {
      * @param rows
      */
     @Transactional
-    public void importOrder(List<Object> rows, String createWebsitId, String createWebsitName) {
+    public void importOrder(List<Object> rows) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         //品牌map
         Map<String, Brand> brandMap = sysDictCompanyLogic.brandMapOfName(adminUser.getCompanyWechatId());
@@ -328,8 +328,10 @@ public class OrderBaseExcelLogic {
             pgOrderBase.setSource(source);
             pgOrderBase.setOrderChannelId(orderChannelDict.getDictCode());
             pgOrderBase.setOrderChannelText(orderChannelDict.getDictValue());
-            pgOrderBase.setCreateWebsitId(createWebsitId);
-            pgOrderBase.setCreateWebsitName(createWebsitName);
+            if (!StringUtil.isEmpty(pgOrderBase.getWebsitId())) {
+                pgOrderBase.setCreateWebsitId(pgOrderBase.getWebsitId());
+                pgOrderBase.setCreateWebsitName(pgOrderBase.getWebsitName());
+            }
             if (importBaseStatusEnum != null) {
                 pgOrderBase.setOrderStatus(importBaseStatusEnum.getKey());
                 pgOrderBase.setOrderStatusText(importBaseStatusEnum.getRemark());
@@ -443,7 +445,7 @@ public class OrderBaseExcelLogic {
      *
      * @param rows
      */
-    public void importOrder2(List<Object> rows, String createWebsitId, String createWebsitName) {
+    public void importOrder2(List<Object> rows) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         //品牌map
         Map<String, Brand> brandMap = sysDictCompanyLogic.brandMapOfName(adminUser.getCompanyWechatId());
@@ -672,8 +674,10 @@ public class OrderBaseExcelLogic {
             pgOrderBase.setSource("导入");
             pgOrderBase.setOrderChannelId(orderChannelDict.getDictCode());
             pgOrderBase.setOrderChannelText(orderChannelDict.getDictValue());
-            pgOrderBase.setCreateWebsitId(createWebsitId);
-            pgOrderBase.setCreateWebsitName(createWebsitName);
+            if (!StringUtil.isEmpty(pgOrderBase.getWebsitId())) {
+                pgOrderBase.setCreateWebsitId(pgOrderBase.getWebsitId());
+                pgOrderBase.setCreateWebsitName(pgOrderBase.getWebsitName());
+            }
             if (importBaseStatusEnum != null) {
                 pgOrderBase.setOrderStatus(importBaseStatusEnum.getKey());
                 pgOrderBase.setOrderStatusText(importBaseStatusEnum.getRemark());