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

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

@@ -335,8 +335,8 @@ public class AdminUserLogic {
                 if ((curAdminUser.getType() == 1 && !curAdminUser.getIsMaster()) || (curAdminUser.getType() == 0 && !curAdminUser.getIsMaster())) {
                     throw new RemoteServiceException("账号有”归属网点“属性，超级管理员或商户主账号或网点主账号才有重置密码的权限");
                 }
-            } else if (resetAdminUser.getType() == 0 && curAdminUser.getType() == 1 && !curAdminUser.getIsMaster()) {
-                throw new RemoteServiceException("“网点账号”，超级管理员或商户主账号才有重置密码的权限");
+//            } else if (resetAdminUser.getType() == 0 && curAdminUser.getType() == 1 && !curAdminUser.getIsMaster()) {
+//                throw new RemoteServiceException("“网点账号”，超级管理员或商户主账号才有重置密码的权限");
             } else if (resetAdminUser.getType() == 1 && !curAdminUser.getIsMaster()) {
                 throw new RemoteServiceException("“商户账号”，超级管理员或商户主账号才有重置密码的权限");
             }
@@ -358,16 +358,16 @@ public class AdminUserLogic {
         if (StringUtils.isBlank(adminUser.getUserName()) || StringUtils.isBlank(adminUser.getPassword())) {
             throw new RemoteServiceException("参数错误");
         }
-        if (Objects.nonNull(adminUser.getIsVender())
-                && adminUser.getIsVender()
-                && StringUtils.isBlank(adminUser.getVenderId())) {
-            throw new RemoteServiceException("请选择供应商");
-        }
         // 网点账号供应商不能选
         if (curAdminUser.getType() == 0) {
             adminUser.setIsVender(false)
                     .setVenderId(null);
         }
+        if (Objects.nonNull(adminUser.getIsVender())
+                && adminUser.getIsVender()
+                && StringUtils.isBlank(adminUser.getVenderId())) {
+            throw new RemoteServiceException("请选择供应商");
+        }
         Integer count = adminUserService.lambdaQuery().eq(AdminUser::getUserName, adminUser.getUserName()).count();
         if (count > 0) {
             throw new RemoteServiceException("帐号已被注册");

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

@@ -294,6 +294,7 @@ public class AdminWebsitLogic {
                 .setPubNotice(true)
                 .setIsVender(false)
                 .setType(0)
+                .setIsMaster(true)
                 .setLinkPhone(adminWebsit.getLinkMobile());
         adminUser.setAdminWebsitId(Collections.singletonList(adminWebsit.getWebsitId()));
         adminUserLogic.add(adminUser, false, true);

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

@@ -385,7 +385,7 @@ public class WebsitContractSignLogic {
     private void companyAuthMethod(AdminWebsit websit, AuthBean bean, String returnUrl) throws Exception {
         // 企业认证
         if (StringUtils.isBlank(websit.getFadadaWebsitId())) {
-            String customerId = Auth4FDDUtil.regAccount("2", websit.getWebsitId()).get("data", String.class, true);
+            String customerId = Auth4FDDUtil.regAccount("2", websit.getWebsitId() + DateUtil.date().getTime()).get("data", String.class, true);
             if (StringUtils.isBlank(customerId)) {
                 throw new RemoteServiceException("注册法大大企业失败");
             }