From 89db4d5dd1888c9c89875b25b6192d7f357ae840 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 7 May 2024 10:59:16 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisCommonController.java    | 30 ++++++++++++++++---
 .../erp/emis/service/EmisBaseService.java     | 21 +++++++++----
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
index 4cdef90ea..7c335d2fc 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
@@ -25,10 +25,7 @@ import com.xdadan.erp.emis.domain.vo.AddressParseResult;
 import com.xdadan.erp.emis.domain.vo.Reciever;
 import com.xdadan.erp.emis.domain.vo.Sender;
 import com.xdadan.erp.emis.domain.vo.WaybillOrder;
-import com.xdadan.erp.emis.service.IEmisBrandService;
-import com.xdadan.erp.emis.service.IEmisElectronicPagService;
-import com.xdadan.erp.emis.service.IEmisRegionService;
-import com.xdadan.erp.emis.service.IEmisWaybillService;
+import com.xdadan.erp.emis.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -53,6 +50,10 @@ public class EmisCommonController extends BaseController
     private IEmisRegionService emisRegionService;
 
 
+    @Autowired
+    private EmisBaseService emisBaseService;
+
+
     /**
      * 获取电子面单单号
      */
@@ -89,5 +90,26 @@ public class EmisCommonController extends BaseController
         }
     }
 
+    /**
+     * 获取解析地址
+     */
+    @RequestMapping(value = "/testGenCustomer")
+    public AjaxResult testGenCustomer()
+    {
+        try {
+//            AddressParseResult addressParseResult = emisRegionService.parseAddress(content);
+            emisBaseService.batchGenCustomerCode();
+            return AjaxResult.success("解析成功");
+        }catch (Exception ex){
+            ex.printStackTrace();
+            // 返回子定义异常
+            if(ex instanceof EmisBizError){
+                return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
+            }
+
+            return AjaxResult.error("服务器异常，联系客服");
+        }
+    }
+
 
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 448f8c761..531951561 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -91,7 +91,6 @@ public class EmisBaseService {
      @Autowired
      private EmisRegionMapper emisRegionMapper;
 
-
      /**
       * 获取当前登录用户
       * @return
@@ -156,11 +155,21 @@ public class EmisBaseService {
          }
          return newCode.toString();
      }
-     /**
-      *  创建客户
-      * @param emisCustomerUser
-      * @return
-      */
+
+
+     public void batchGenCustomerCode() {
+         EmisCustomerUser queryEmisCustomerUser = new EmisCustomerUser();
+         List<EmisCustomerUser> emisCustomerUserList=emisCustomerUserMapper.selectEmisCustomerUserList(queryEmisCustomerUser);
+         for(EmisCustomerUser user:emisCustomerUserList){
+             EmisCustomerUser crt=createCustomerUser(user);
+         }
+     }
+
+         /**
+          *  创建客户
+          * @param emisCustomerUser
+          * @return
+          */
      public EmisCustomerUser createCustomerUser(EmisCustomerUser emisCustomerUser) {
 
          // 直接返回客户