提现默认支付宝;镜像店铺邮箱登录限制

netflix-common/src/main/java/com/cyksj/common/constant/Constant.java

@@ -15,6 +15,11 @@ public interface Constant {
 	 */
 	Long DAY_MILLS = 86400000l;
 
+	/**
+	 * 镜像店铺
+	 */
+	String DEFAULT_MIRROR_SHOP_USER_NAME = "AI用户";
+
 	String DEFAULT_NAME = "银河用户";
 
 	String YH_GPT_USER_NAME = "银河录像局";

netflix-dao/src/main/java/com/cyksj/model/entity/ShopConfig.java

@@ -20,7 +20,7 @@ public class ShopConfig extends BaseEntity{
 
     /**
      * 分销提现支付宝默认商户
-     *
+     * 木绵支付宝
      */
     public static final String DISTRIBUTE_ZFB_DEFAULT_APP_ID = "2021003171697073";
 

netflix-service/src/main/java/com/cyksj/service/pay/impl/TransferFuncServiceImpl.java

@@ -149,7 +149,7 @@ public class TransferFuncServiceImpl implements TransferFuncService {
 			name += "xx";
 		}
 		Integer scope = transferAccountsReq.getScope();
-		AlipayClient alipayClient = AliPayClientFactory.getAlipayClient(sysConfigService.getDefaultShopConfigByType("zfb"));
+		AlipayClient alipayClient = AliPayClientFactory.getAlipayClient(ShopConfig.DISTRIBUTE_ZFB_DEFAULT_APP_ID);
 
 		AlipayRequest alipayRequest = aliPayTransferAccountsRequest(donNo, account, name, money, remark);
 

netflix-service/src/main/java/com/cyksj/service/user/impl/UserServiceImpl.java

@@ -478,7 +478,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 			user = new User();
 			isNewUser = true;
 			StringBuilder name = new StringBuilder();
-			name.append(Constant.DEFAULT_NAME);
+			if (loginReq.getCmt() == 2) {
+				name.append(Constant.DEFAULT_MIRROR_SHOP_USER_NAME);
+			}else {
+				name.append(Constant.DEFAULT_NAME);
+			}
 			if (loginReq.getPopularizeId() != null) {
 				user.setPopularizeId(loginReq.getPopularizeId());
 			}

netflix-web/src/main/java/com/cyksj/web/controller/user/AuthorizationController.java

@@ -473,16 +473,18 @@ public class AuthorizationController {
      */
     @GetMapping("/get/email/code")
     @NoSubmit
-    public Result<String> getEmailCode(String email, Integer digit) {
+    public Result<String> getEmailCode(String email, Integer digit, Integer cmt) {
         if (email == null || !Validator.isEmail(email)) {
             throw BusinessRuntimeException.getInstance("请输入正确邮箱");
         }
         if (envCommonService.isPrdEnv()) {
             //首次注册只能gmail邮箱
             if (!email.contains("@gmail")) {
-                User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getEmail, email).last("limit 1"));
-                if (user == null) {
-                    throw BusinessRuntimeException.getInstance("暂只支持使用谷歌邮箱注册");
+                if (cmt == null || cmt != 2) {
+                    User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getEmail, email).last("limit 1"));
+                    if (user == null) {
+                        throw BusinessRuntimeException.getInstance("暂只支持使用谷歌邮箱注册");
+                    }
                 }
             }
         }