需求

src/main/java/com/zfire/mall/manager/logic/k3/K3CustomerLogic.java

@@ -468,34 +468,45 @@ public class K3CustomerLogic {
             if (StringUtils.isEmpty((String) row.get(0)) || StringUtils.isEmpty((String) row.get(1)))
                 throw new RemoteServiceException("第"+index+"行,经销商名称编号有误，请检查");
 
-            kingDeeCustomer.setSaleDeptNumber((String)row.get(2));
-            kingDeeCustomer.setSaleDeptName((String)row.get(3));
+            kingDeeCustomer.setUseOrgId((String)row.get(2));
+            kingDeeCustomer.setUseOrgName((String)row.get(3));
+            kingDeeCustomer.setUseOrgNumber((String)row.get(4));
 
 
-            if (StringUtils.isEmpty((String)row.get(4)))
+            kingDeeCustomer.setMobile((String)row.get(5));
+
+            kingDeeCustomer.setSaleDeptNumber((String)row.get(6));
+            kingDeeCustomer.setSaleDeptName((String)row.get(7));
+
+
+            if (StringUtils.isEmpty((String)row.get(8)))
                 throw new RemoteServiceException("第"+index+"行,状态填入有误");
 
-            kingDeeCustomer.setForbidStatus(((String)row.get(4)).equals("启用")?"A":"B");
+            kingDeeCustomer.setForbidStatus(((String)row.get(8)).equals("启用")?"A":"B");
 
-            kingDeeCustomer.setInvoiceTitle((String)row.get(5));
-            kingDeeCustomer.setTaxNo((String)row.get(6));
-            kingDeeCustomer.setBank((String)row.get(7));
-            kingDeeCustomer.setBankAccount((String)row.get(8));
-            kingDeeCustomer.setInvoicePhone((String)row.get(9));
-            kingDeeCustomer.setInvoiceAddress((String)row.get(10));
-            kingDeeCustomer.setEmail((String)row.get(11));
+            kingDeeCustomer.setInvoiceTitle((String)row.get(9));
+            kingDeeCustomer.setTaxNo((String)row.get(10));
+            kingDeeCustomer.setBank((String)row.get(11));
+            kingDeeCustomer.setBankAccount((String)row.get(12));
+            kingDeeCustomer.setInvoicePhone((String)row.get(13));
+            kingDeeCustomer.setInvoiceAddress((String)row.get(14));
+            kingDeeCustomer.setEmail((String)row.get(15));
             kingDeeCustomer.setJiaxianType("KING");
 
-            if (StringUtils.isEmpty((String)row.get(12)) )
+            if (StringUtils.isEmpty((String)row.get(16)) )
                 throw new RemoteServiceException("第"+index+"行,是否为集团公司(是/否)填入有误");
 
             kingDeeCustomer.setIsGroupCompany(((String)row.get(12)).equals("是")?true:false);
 
-            if (StringUtils.isEmpty((String)row.get(13)) )
+            if (StringUtils.isEmpty((String)row.get(17)) )
                 throw new RemoteServiceException("第"+index+"行,是否拥有转折让钱包权限(是/否)填入有误");
             kingDeeCustomer.setIsZr(((String)row.get(13)).equals("是")?true:false);
 
 
+            kingDeeCustomer.setIsGroupCompany(((String)row.get(16)).equals("是")?true:false);
+            kingDeeCustomer.setIsZr(((String)row.get(17)).equals("是")?true:false);
+
+
             kingDeeCustomers.add(kingDeeCustomer);
 
 

src/main/java/com/zfire/mall/manager/logic/k3/K3SupplierLogic.java

@@ -178,7 +178,7 @@ public class K3SupplierLogic {
 
         }
 
-        kingDeeSupplierService.saveBatch(kingDeeSuppliers);
+        kingDeeSupplierService.saveOrUpdateBatch(kingDeeSuppliers);
     }
 
     public void del(String id) {