需求

src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -9,14 +9,8 @@ import com.gree.mall.manager.bean.admin.AdminWebsitVO;
 import com.gree.mall.manager.commonmapper.AdminMapper;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.plus.entity.AdminCompanyWechat;
-import com.gree.mall.manager.plus.entity.AdminCompanyWechatPayConfig;
-import com.gree.mall.manager.plus.entity.AdminWebsit;
-import com.gree.mall.manager.plus.entity.AdminZone;
-import com.gree.mall.manager.plus.service.AdminCompanyWechatPayConfigService;
-import com.gree.mall.manager.plus.service.AdminCompanyWechatService;
-import com.gree.mall.manager.plus.service.AdminWebsitService;
-import com.gree.mall.manager.plus.service.AdminZoneService;
+import com.gree.mall.manager.plus.entity.*;
+import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.utils.StringUtil;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
@@ -24,6 +18,7 @@ import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -52,6 +47,9 @@ public class AdminWebsitLogic {
     @Autowired
     AdminCompanyWechatPayConfigService adminCompanyWechatPayConfigService;
 
+    @Autowired
+    SysDictCompanyService sysDictCompanyService;
+
     /**
      * 区域列表
      */
@@ -252,32 +250,50 @@ public class AdminWebsitLogic {
 
             AdminWebsit adminWebsit = new AdminWebsit();
 
-            adminWebsit.setWebsitId((String) row.get(0));
-            adminWebsit.setWebsitNumber((String) row.get(0));
-            adminWebsit.setName((String) row.get(1));
-            adminWebsit.setMobile((String) row.get(2));
-            adminWebsit.setPerson((String) row.get(3));
-            adminWebsit.setPersonMobile((String) row.get(4));
-            adminWebsit.setType((String) row.get(5));
-            adminWebsit.setAddress((String) row.get(6));
-            AdminCompanyWechatPayConfig one = adminCompanyWechatPayConfigService.lambdaQuery()
-                    .eq(AdminCompanyWechatPayConfig::getCompanyName, (String) row.get(7))
+            AdminCompanyWechat oneP = adminCompanyWechatService.lambdaQuery()
+                    .eq(AdminCompanyWechat::getCompanyName, (String) row.get(0))
+                    .last("limit 1").one();
+
+
+            if (oneP == null)
+                throw new RemoteServiceException("第"+rowIndex+"行，找不到上级商户");
+
+            adminWebsit.setCompanyName(oneP.getCompanyName());
+            adminWebsit.setCompanyWechatId(oneP.getCompanyWechatId());
+            adminWebsit.setWebsitId((String) row.get(1));
+            adminWebsit.setWebsitNumber((String) row.get(1));
+            adminWebsit.setName((String) row.get(2));
+            adminWebsit.setMobile((String) row.get(3));
+            adminWebsit.setPerson((String) row.get(4));
+            adminWebsit.setPersonMobile((String) row.get(5));
+
+            SysDictCompany sysDictCompany = sysDictCompanyService.lambdaQuery()
+                    .eq(SysDictCompany::getDictType, "WEBSIT_TYPE")
+                    .eq(SysDictCompany::getDictValue, (String) row.get(6)).one();
+
+            if (sysDictCompany == null)
+                throw new RemoteServiceException("第"+rowIndex+"行，找不到店铺类型");
 
+            adminWebsit.setType((String) row.get(6));
+            adminWebsit.setTypeId(sysDictCompany.getDictCode());
+            adminWebsit.setAddress((String) row.get(7));
+            AdminCompanyWechat one = adminCompanyWechatService.lambdaQuery()
+                    .eq(AdminCompanyWechat::getCompanyName, (String) row.get(8))
                     .last("limit 1").one();
 
             if (one == null)
                 throw new RemoteServiceException("第"+rowIndex+"行，找不到支付商户");
-            adminWebsit.setPayWorkerCodeName((String) row.get(7));
-            adminWebsit.setPayWorkerCodeId(one.getId());
+            adminWebsit.setPayWorkerCodeName(one.getCompanyName());
+            adminWebsit.setPayWorkerCodeId(one.getCompanyWechatId());
             if (row.size() > 7) {
-                adminWebsit.setYunAppid((String) row.get(8));
-                adminWebsit.setYunAppkey((String) row.get(9));
-                adminWebsit.setYunCompany((String) row.get(10));
-                adminWebsit.setYunNumber((String) row.get(11));
-                adminWebsit.setYunSystem((String) row.get(12));
-                adminWebsit.setYunTax((String) row.get(13));
-                adminWebsit.setYunName((String) row.get(14));
-                adminWebsit.setYunTwo((((String) row.get(15)).equals("是"))?"YES":"NO");
+                adminWebsit.setYunAppid((String) row.get(9));
+                adminWebsit.setYunAppkey((String) row.get(10));
+                adminWebsit.setYunCompany((String) row.get(11));
+                adminWebsit.setYunNumber((String) row.get(12));
+                adminWebsit.setYunSystem((String) row.get(13));
+                adminWebsit.setYunTax((String) row.get(14));
+                adminWebsit.setYunName((String) row.get(15));
+                adminWebsit.setYunTwo((((String) row.get(16)).equals("是"))?"YES":"NO");
             }
 
             adminWebsits.add(adminWebsit);