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

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

@@ -326,6 +326,14 @@ public class AdminUserLogic {
         //检查是否拥有重置的密码权限
         String nickName = CommonUtils.getNickName(request);
         AdminUserCom adminUser1 = commonLogic.getAdminUser();
+
+
+        AdminUser resetAdminUser = adminUserService.getById(adminUserId);
+
+        if (resetAdminUser.getType() == 0
+                && StringUtils.isNotBlank(resetAdminUser.getMasterWebsitId())) {
+
+        }
         if (adminUser1.getType() == 0) {
             throw new RemoteServiceException("只有超级管理员或商户账号才有重置密码的权限");
         }
@@ -334,11 +342,14 @@ public class AdminUserLogic {
             throw new RemoteServiceException("不能操作冻结账号");
         }
 
+        if (adminUser1.getType() == 1 && adminUser1.getIsMaster()) {
+
+        }
+
         //开始重置
-        AdminUser adminUser = adminUserService.getById(adminUserId);
-        adminUser.setPassword(MD5Utils.md5(password));
-        adminUser.setLoginErrNum(0);
-        adminUser.updateById();
+        resetAdminUser.setPassword(MD5Utils.md5(password));
+        resetAdminUser.setLoginErrNum(0);
+        resetAdminUser.updateById();
     }
 
 

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

@@ -51,6 +51,7 @@ public class WebsitContractSignLogic {
     private final FDDNotifyLogic fddNotifyLogic;
     private final OSSUtil ossUtil;
     private final CompanyCaAuthService companyCaAuthService;
+    private final WebsitFollowConfigItemService websitFollowConfigItemService;
 
     @Value("${fadada.websit.auth.verified-way}")
     private String fddAuthVerifiedWay;
@@ -130,7 +131,7 @@ public class WebsitContractSignLogic {
         }
 
         // 避免前端调用过快,法大大还没更新状态
-        Thread.sleep(1000);
+        Thread.sleep(3000);
 
         final List<WebsitContractSignItem> signItems = websitContractSignItemService.lambdaQuery()
                 .eq(WebsitContractSignItem::getWebsitContractSignRecordId, record.getId())
@@ -261,14 +262,19 @@ public class WebsitContractSignLogic {
                 .eq(WebsitContractSignField::getWebsitContractSignItemId, id)
                 .list();
 
+        final WebsitFollowConfigItem followItem = websitFollowConfigItemService.lambdaQuery()
+                .eq(WebsitFollowConfigItem::getCompanyWechatId, websit.getCompanyWechatId())
+                .eq(WebsitFollowConfigItem::getSubWebsitId, websit.getWebsitId())
+                .one();
+
         final CompanyCaAuth companyCaAuth = companyCaAuthService.lambdaQuery()
-                .eq(CompanyCaAuth::getWebsitId, websit.getParentId())
-                .eq(CompanyCaAuth::getCompanyCaAuthId, websit.getCompanyWechatId())
+                .eq(CompanyCaAuth::getWebsitId, followItem.getParentId())
+                .eq(CompanyCaAuth::getCompanyWechatId, websit.getCompanyWechatId())
                 .eq(CompanyCaAuth::getFadadaIsAuth, IsYesNoEnum.YES.getKey())
                 .eq(CompanyCaAuth::getFadadaAuthAutoStatus, IsYesNoEnum.YES.getKey())
                 .one();
 
-        final AdminWebsit parentWebsit = adminWebsitService.getById(websit.getParentId());
+        final AdminWebsit parentWebsit = adminWebsitService.getById(followItem.getParentId());
 
         if (Objects.isNull(companyCaAuth)) {
             throw new RemoteServiceException("未找到上级网点的CA认证记录");