Merge remote-tracking branch 'origin/develop' into develop

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

@@ -972,6 +972,8 @@ public class AdminWebsitLogic {
                 }
             }
 
+            adminWebsitService.saveBatch(adminWebsitList);
+
             for (AdminWebsit websit : adminWebsitList) {
                 reloadJoinCode(websit.getCompanyWechatId(), websit.getJoinCode());
 
@@ -999,7 +1001,7 @@ public class AdminWebsitLogic {
                 adminWebsitPayConfigService.saveBatch(allPayConfigList);
             }
 
-            adminWebsitService.saveBatch(adminWebsitList);
+
         }
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/contract/CompanyCaAuthLogic.java

@@ -11,7 +11,9 @@ import com.gree.mall.manager.commonmapper.CommonMapper;
 import com.gree.mall.manager.enums.IsYesNoEnum;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
+import com.gree.mall.manager.plus.entity.AdminWebsit;
 import com.gree.mall.manager.plus.entity.CompanyCaAuth;
+import com.gree.mall.manager.plus.service.AdminWebsitService;
 import com.gree.mall.manager.plus.service.CompanyCaAuthService;
 import com.gree.mall.manager.utils.fadada.Auth4FDDUtil;
 import com.gree.mall.manager.utils.oss.OSSUtil;
@@ -33,6 +35,7 @@ public class CompanyCaAuthLogic {
     private final CommonLogic commonLogic;
     private final CommonMapper commonMapper;
     private final CompanyCaAuthService companyCaAuthService;
+    private final AdminWebsitService adminWebsitService;
     private final OSSUtil ossUtil;
     @Value("${fadada.company.auth.page-modify}")
     private String fddAuthPageModify;
@@ -56,6 +59,10 @@ public class CompanyCaAuthLogic {
     }
 
     public void add(CompanyCaAuth companyCaAuth) {
+        final AdminWebsit websit = adminWebsitService.getById(companyCaAuth.getWebsitId());
+        companyCaAuth.setCompanyName(websit.getName());
+        companyCaAuth.setCompanyWechatId(websit.getCompanyWechatId());
+        companyCaAuth.setCompanyName(websit.getCompanyWechatName());
         CompanyCaAuth caAuth = companyCaAuthService.lambdaQuery()
                 .eq(CompanyCaAuth::getWebsitId, companyCaAuth.getWebsitId())
                 .one();
@@ -68,6 +75,10 @@ public class CompanyCaAuthLogic {
     }
 
     public void update(CompanyCaAuth companyCaAuth) {
+        final AdminWebsit websit = adminWebsitService.getById(companyCaAuth.getWebsitId());
+        companyCaAuth.setCompanyName(websit.getName());
+        companyCaAuth.setCompanyWechatId(websit.getCompanyWechatId());
+        companyCaAuth.setCompanyName(websit.getCompanyWechatName());
         this.checkInfo(companyCaAuth);
         CompanyCaAuth byId = companyCaAuthService.getById(companyCaAuth.getCompanyCaAuthId());