商家版注册与登录接口

mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java

@@ -3,6 +3,7 @@ package com.suisung.mall.account.controller;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
 import com.suisung.mall.account.service.AccountUserBaseService;
 import com.suisung.mall.account.service.AccountUserInfoService;
 import com.suisung.mall.common.api.CommonResult;
@@ -18,10 +19,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -179,10 +177,8 @@ public class LoginController extends BaseControllerImpl {
 
     @ApiOperation(value = "商家版注册与登录")
     @RequestMapping(value = "/doMerchSmsRegisterAndLogin", method = RequestMethod.POST)
-    public CommonResult doMerchSmsRegisterAndLogin(@RequestParam(name = "user_mobile") String user_mobile,
+    public CommonResult doMerchSmsRegisterAndLogin(@RequestBody JSONObject paramJSON) {
-                                                   @RequestParam(name = "rand_key", required = false) String rand_key,
+        return accountUserBaseService.doMerchSmsRegisterAndLogin(paramJSON.getStr("user_mobile"), paramJSON.getStr("rand_key"), paramJSON.getStr("verify_code"));
-                                                   @RequestParam(name = "verify_code") String verify_code) {
-        return accountUserBaseService.doMerchSmsRegisterAndLogin(user_mobile, rand_key, verify_code);
     }
 
     @ApiOperation("退出登录")

mall-account/src/main/java/com/suisung/mall/account/controller/mobile/UserController.java

@@ -55,35 +55,26 @@ import java.util.concurrent.ThreadPoolExecutor;
 @RequestMapping("/mobile/account/user")
 public class UserController extends BaseControllerImpl {
 
+    private final Logger logger = LoggerFactory.getLogger(UserController.class);
     @Autowired
     private AccountUserBaseService accountUserBaseService;
-
     @Autowired
     private AccountBaseRoleLevelService accountBaseRoleLevelService;
-
     @Autowired
     private AccountBaseUserLevelService accountBaseUserLevelService;
-
     @Autowired
     private PayService payService;
-
     @Autowired
     private ShopService shopService;
-
     @Autowired
     private AccountUserSnsService accountUserSnsService;
-
     @Autowired
     private AccountBaseConfigService accountBaseConfigService;
-
     @Autowired
     private AccountUserInfoService accountUserInfoService;
-
     @Autowired
     private ThreadPoolExecutor executor;
 
-    private Logger logger = LoggerFactory.getLogger(UserController.class);
-
     /**
      * 用户基本信息管理界面
      *
@@ -283,9 +274,7 @@ public class UserController extends BaseControllerImpl {
             if (!PhoneNumberUtils.isValidNumber(mobile)) {
                 throw new ApiException(I18nUtil._("请输入正确的手机号！"));
             }
-        }
+        } else if (StrUtil.isNotBlank(email) && !CheckUtil.isEmail(email)) {
-
-        else if (StrUtil.isNotBlank(email) && !CheckUtil.isEmail(email)) {
             throw new ApiException(I18nUtil._("请输入正确邮箱格式！"));
         }
 

mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java

@@ -202,11 +202,15 @@ public class AccountUserBaseServiceImpl extends BaseServiceImpl<AccountUserBaseM
 
         data.put("callback_url", "");
 
-        if (params.get("is_merch") != null && params.get("is_merch").equals("1")) {
+        if (StrUtil.isNotBlank(params.get("user_mobile"))
+                && StrUtil.isNotBlank(params.get("is_merch"))
+                && params.get("is_merch").equals("1")) {
             // 商家版app，显示申请入驻的状态
             data.put("is_merch", 1);
             //入驻商家的审批状态：1-已通过；2-未通过；3-待审核；4-未申请；
-            data.put("merch_approval_status", 4);
+            Map<String, Object> params2 = new HashMap<>();
+            params2.put("user_mobile", params.get("user_mobile"));
+            data.put("merch_approval_status", shopService.shopMerchEntryApprovalStatus(params2));
         }
 
         return restResult;
@@ -1792,15 +1796,18 @@ public class AccountUserBaseServiceImpl extends BaseServiceImpl<AccountUserBaseM
                     throw new ApiException(ResultCode.FAILED);
                 }
             }
+
+            // 远程调用异常忽略掉
+            try {
                 // todo trigger
                 // User_Resource初始化
                 if (!payService.initUserPoints(user_id)) {
-                throw new ApiException(ResultCode.FAILED);
+                    // throw new ApiException(ResultCode.FAILED);
                 }
 
                 // 初始化用户经验表
                 if (!accountUserInfoService.initUserExperience(user_id)) {
-                throw new ApiException(ResultCode.FAILED);
+                    // throw new ApiException(ResultCode.FAILED);
                 }
 
                 // 判断微信h5传递的活动id
@@ -1829,6 +1836,9 @@ public class AccountUserBaseServiceImpl extends BaseServiceImpl<AccountUserBaseM
                         shopService.updateCoupons(userParentId, activityId);
                     }
                 }
+            } catch (Exception e) {
+                logger.error("用户注册，远程初始化用户周边资料（积分，经验值等）时，发生异常", e);
+            }
 
             //记录渠道来源
             String source_ucc_code = getSourceChannelCode();
@@ -2667,7 +2677,7 @@ public class AccountUserBaseServiceImpl extends BaseServiceImpl<AccountUserBaseM
             throw new ApiException(_("缺少必要参数！"));
         }
 
-        if (!PhoneNumberUtils.isValidNumber(user_mobile)) {
+        if (!PhoneNumberUtils.checkPhoneNumber(user_mobile)) {
             throw new ApiException(_("请输入正确的手机号！"));
         }
 
@@ -2679,10 +2689,16 @@ public class AccountUserBaseServiceImpl extends BaseServiceImpl<AccountUserBaseM
             throw new ApiException(_("请输入验证码！"));
         }
 
+        // rmk 为什么随机数和手机号一致？
         if (ObjectUtil.notEqual(user_mobile, rand_key)) {
             throw new ApiException(_("非法数据，或者提交超时，请刷新页面重新提交!"));
         }
 
+        String verifyMobile = PhoneNumberUtils.convZhPhoneNumber(user_mobile);
+        if (!checkVerifyCode(verifyMobile, verify_code)) {
+            throw new ApiException(_("验证码错误！"));
+        }
+
         // 找出手机对应的绑定用户
         // 是否为手机号注册，密码6位随机数
         return doMobileBindLogin(user_mobile, true);
@@ -2738,15 +2754,15 @@ public class AccountUserBaseServiceImpl extends BaseServiceImpl<AccountUserBaseM
             }
 
             if (ObjectUtil.notEqual(CommonConstant.USER_TYPE_MCH, accountUserBase.getUser_is_admin())) {
-                // 不是入驻商家的情况
+                // 不是入驻商家的情况,已经有普通用户使用了手机号了，提示已经被注册。
                 throw new ApiException(_("已被注册，请换一个手机号码！"));
             }
-        }
+        } else {
-
             // 手机号码未绑定的情况，直接去注册一个账号
             Map<String, Object> userInfo = new HashMap<>();
             userInfo.put("user_account", com.suisung.mall.common.utils.StringUtils.genLklOrderNo(4));// 时间 yyyyMMddHHmmss + 4位随机数
             userInfo.put("user_mobile", user_mobile);
+//            userInfo.put("verify_code", verifyCode);
             // 密码要随机数
             String user_password = com.suisung.mall.common.utils.StringUtils.random(6, com.suisung.mall.common.utils.StringUtils.RandomType.STRING);
             userInfo.put("user_password", user_password);
@@ -2759,7 +2775,7 @@ public class AccountUserBaseServiceImpl extends BaseServiceImpl<AccountUserBaseM
             }
 
             // TODO 发送短信通知用户，告知用户随机密码：尊敬的商家用户，你们刚注册账号的账号密码为：" + user_password + "，请妥善保管，以免丢失。
-
+        }
 
         Map<String, String> params = new HashMap<>();
         params.put("client_id", isMerch ? AuthConstant.MCH_CLIENT_ID : AuthConstant.MOBILE_CLIENT_ID);
@@ -2768,6 +2784,7 @@ public class AccountUserBaseServiceImpl extends BaseServiceImpl<AccountUserBaseM
         params.put("verify_pwd", "1001");  // 是否验证密码 1001：不验证；1002：验证（内部登录没有用户明文密码，只能不验证）
         params.put("username", accountUserBase.getUser_account());
         params.put("password", "");
+        params.put("user_mobile", user_mobile);
         params.put("is_merch", "1"); // 是否为商家入驻 1-是；其他-否
 
         return login(params);

mall-auth/src/main/java/com/suisung/mall/auth/config/Oauth2ServerConfig.java

@@ -59,7 +59,15 @@ public class Oauth2ServerConfig extends AuthorizationServerConfigurerAdapter {
                 .scopes("all")
                 .authorizedGrantTypes("password", "refresh_token")
                 .accessTokenValiditySeconds(AuthConstant.ACCESS_TOKEN_VALIDITY_SECONDS)
-                .refreshTokenValiditySeconds(AuthConstant.REFRESH_TOKEN_VALIDITY_SECONDS);
+                .refreshTokenValiditySeconds(AuthConstant.REFRESH_TOKEN_VALIDITY_SECONDS)
+                .and()
+                .withClient(AuthConstant.MCH_CLIENT_ID)// 商家端登录标记
+                .secret(passwordEncoder.encode(AuthConstant.AUTHORITY_MOBILE_SECRET))
+                .scopes("all")
+                .authorizedGrantTypes("password", "refresh_token")
+                .accessTokenValiditySeconds(AuthConstant.ACCESS_TOKEN_VALIDITY_SECONDS)
+                .refreshTokenValiditySeconds(AuthConstant.REFRESH_TOKEN_VALIDITY_SECONDS)
+        ;
     }
 
     // 用来配置授权以及令牌的访问端点和令牌服务;

mall-common/src/main/java/com/suisung/mall/common/feignService/PayService.java

@@ -113,7 +113,7 @@ public interface PayService {
     long getNumWithdraw(@RequestBody Map wrapper);
 
     @PostMapping(value = "/admin/pay/payController/initUserPoints")
-    boolean initUserPoints(@RequestParam(name = "user_id") Integer user_id);
+    Boolean initUserPoints(@RequestParam(name = "user_id") Integer user_id);
 
     @PostMapping(value = "/admin/pay/payController/getPayPlantformResource")
     PayPlantformResource getPayPlantformResource(@RequestParam(name = "plantform_resource_id") Integer plantform_resource_id);

mall-common/src/main/java/com/suisung/mall/common/feignService/ShopService.java

@@ -234,6 +234,7 @@ public interface ShopService {
 
     /**
      * 获取店铺的拉卡拉商户号和终端号（仅仅两个字段）
+     *
      * @param store_id
      * @return
      */
@@ -270,5 +271,14 @@ public interface ShopService {
     @GetMapping(value = "/admin/shop/shopController/getWaitPayNum")
     Long getWaitPayNum(@RequestParam(name = "user_id") Integer user_id);
 
+    /**
+     * 通过手机号mobile获取商家入驻审核状态
+     *
+     * @param params
+     * @return
+     */
+    @PostMapping(value = "/mobile/shop/merch/approval/status")
+    Long shopMerchEntryApprovalStatus(@RequestBody Map<String, Object> params);
+
 }
 

mall-common/src/main/java/com/suisung/mall/common/utils/phone/PhoneNumberUtils.java

@@ -1,11 +1,13 @@
 package com.suisung.mall.common.utils.phone;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.google.i18n.phonenumbers.NumberParseException;
 import com.google.i18n.phonenumbers.PhoneNumberToCarrierMapper;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
 import com.google.i18n.phonenumbers.Phonenumber;
 import com.google.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder;
+import com.suisung.mall.common.constant.CommonConstant;
 
 import java.util.Locale;
 
@@ -47,6 +49,16 @@ public class PhoneNumberUtils {
         return checkPhoneNumber(COUNTRY_CODE_CHINA, phoneNumber);
     }
 
+    /**
+     * 如果手机号码不带国家码，转换中国大陆区号86的手机号码
+     *
+     * @param phoneNumber
+     * @return
+     */
+    public static String convZhPhoneNumber(String phoneNumber) {
+        return StrUtil.startWith(phoneNumber, "+") ? phoneNumber : CommonConstant.IDD_ZH_CN + phoneNumber;
+    }
+
     /**
      * 判断手机号是否有效（国际）
      *

mall-pay/src/main/java/com/suisung/mall/pay/controller/admin/PayController.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.suisung.mall.common.api.CommonResult;
 import com.suisung.mall.common.modules.order.ShopOrderReturn;
 import com.suisung.mall.common.modules.pay.*;
-import com.suisung.mall.common.utils.CheckUtil;
 import com.suisung.mall.common.utils.MybatisPlusQueryUtil;
 import com.suisung.mall.pay.service.*;
 import io.seata.core.context.RootContext;
@@ -37,35 +36,26 @@ import java.util.Map;
 @RequestMapping("/admin/pay/payController")
 public class PayController {
 
+    private final Logger logger = LoggerFactory.getLogger(PayController.class);
     @Autowired
     private PayUserResourceService payUserResourceService;
-
     @Autowired
     private PayConsumeDepositService payConsumeDepositService;
-
     @Autowired
     private PayPaymentChannelService payPaymentChannelService;
-
     @Autowired
     private PayUserBankCardService payUserBankCardService;
-
     @Autowired
     private PayConsumeWithdrawService payConsumeWithdrawService;
-
     @Autowired
     private PayConsumeTradeService payConsumeTradeService;
-
     @Autowired
     private PayConsumeRecordService payConsumeRecordService;
-
     @Autowired
     private PayPlantformResourceService payPlantformResourceService;
-
     @Autowired
     private PayUserPayService payUserPayService;
 
-    private Logger logger = LoggerFactory.getLogger(PayController.class);
-
     @ApiOperation(value = "根据user_id 删除门店顾客关系数据", notes = "根据user_id 删除门店顾客关系数据")
     @RequestMapping(value = "/deleteUserChainByUid", method = RequestMethod.POST)
     @GlobalTransactional
@@ -311,8 +301,8 @@ public class PayController {
     @GlobalTransactional
     @ApiOperation(value = "初始化用户积分表", notes = "初始化用户积分表")
     @RequestMapping(value = "/initUserPoints", method = RequestMethod.POST)
-    public boolean initUserPoints(@RequestParam(name = "user_id") Integer user_id) {
+    public Boolean initUserPoints(@RequestParam(name = "user_id") Integer user_id) {
-        boolean flag = false;
+        Boolean flag = false;
         try {
             flag = payUserResourceService.initUserPoints(user_id);
         } catch (Exception e) {
@@ -320,8 +310,10 @@ public class PayController {
                 GlobalTransactionContext.reload(RootContext.getXID()).rollback();
             } catch (TransactionException ex) {
                 logger.error("seata 事务异常！");
+                return false;
             }
         }
+
         return flag;
     }
 

mall-shop/src/main/java/com/suisung/mall/shop/merch/controller/mobile/ShopMerchEntryController.java

@@ -54,4 +54,11 @@ public class ShopMerchEntryController extends BaseControllerImpl {
         approvalStatusList.add(3);
         return shopMerchEntryService.shopMerchEntryDetail(null, jsonParam.getStr("mobile"), approvalStatusList);
     }
+
+    @ApiOperation(value = "通过手机号mobile获取商家入驻审核状态", notes = "通过手机号获取商家入驻审核状态")
+    @RequestMapping(value = "/approval/status", method = RequestMethod.POST)
+    public Integer shopMerchEntryApprovalStatus(@RequestBody JSONObject jsonParam) {
+        // approvalStatus 入驻商家的审批状态：1-已通过；2-未通过；3-待审核；4-未申请；
+        return shopMerchEntryService.shopMerchEntryApprovalStatus(jsonParam.getStr("mobile"));
+    }
 }

mall-shop/src/main/java/com/suisung/mall/shop/merch/service/ShopMerchEntryService.java

@@ -69,4 +69,13 @@ public interface ShopMerchEntryService {
      * @return
      */
     Boolean isApplied(String mobile, String bizLicenseNumber);
+
+    /**
+     * 获取商家入驻审核状态
+     * approval_status 入驻商家的审批状态：1-已通过；2-未通过；3-待审核；4-未申请；
+     *
+     * @param loginMobile
+     * @return
+     */
+    Integer shopMerchEntryApprovalStatus(String loginMobile);
 }

mall-shop/src/main/java/com/suisung/mall/shop/merch/service/impl/ShopMerchEntryServiceImpl.java

@@ -315,4 +315,28 @@ public class ShopMerchEntryServiceImpl extends BaseServiceImpl<ShopMerchEntryMap
 
         return count(queryWrapper) > 0;
     }
+
+    /**
+     * 获取商家入驻审核状态
+     * approval_status 入驻商家的审批状态：1-已通过；2-未通过；3-待审核；4-未申请；
+     *
+     * @param loginMobile
+     * @return
+     */
+    @Override
+    public Integer shopMerchEntryApprovalStatus(String loginMobile) {
+        if (StrUtil.isBlank(loginMobile)) {
+            return 1;
+        }
+
+        QueryWrapper<ShopMerchEntry> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("login_mobile", loginMobile).orderByAsc("id");
+
+        List<ShopMerchEntry> recordList = list(queryWrapper);
+        if (CollectionUtil.isEmpty(recordList)) {
+            return 4;
+        }
+
+        return recordList.get(0).getApproval_status();
+    }
 }