店铺管理--商品注册唯一性校验+测试环境注释放开

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/msg/seller/SellerVerifyController.java

@@ -83,8 +83,7 @@ public class SellerVerifyController extends BaseController {
         Integer sendSmsType = 3;
         String templateCode = "";
         if ("register".equals(type)) {
-            // todo 测试暂时先放开手机号
-//            AssertUtil.isTrue(!CollectionUtils.isEmpty(vendorList), "该手机号已注册");
+            AssertUtil.isTrue(!CollectionUtils.isEmpty(vendorList), "此手机号已绑定商家账号");
             //注册账号
             //验证图形验证码
             String verifyNumber = stringRedisTemplate.opsForValue().get(verifyKey);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/seller/seller/SellerVendorController.java

@@ -349,11 +349,10 @@ public class SellerVendorController extends BaseController {
         AssertUtil.isTrue(verifyNumber == null
                 || !verifyNumber.equalsIgnoreCase(vendorRegisterDTO.getVerifyCode()), "图形验证码不正确");
 
-        //校验短信验证码
-        // todo 临时注释，方便教育线上传产品
-//        String smsNumber = stringRedisTemplate.opsForValue().get(vendorRegisterDTO.getVendorMobile());
-//        AssertUtil.isTrue(smsNumber == null
-//                || !smsNumber.equalsIgnoreCase(vendorRegisterDTO.getSmsCode()), "短信验证码不正确");
+        //校验短信验证
+        String smsNumber = stringRedisTemplate.opsForValue().get(vendorRegisterDTO.getVendorMobile());
+        AssertUtil.isTrue(smsNumber == null
+                || !smsNumber.equalsIgnoreCase(vendorRegisterDTO.getSmsCode()), "短信验证码不正确");
 
         //获取登陆ip
         String ip = WebUtil.getRealIp(request);
@@ -361,8 +360,7 @@ public class SellerVendorController extends BaseController {
         vendorModel.registerVendor(vendorRegisterDTO);
 
         // 商家注册完成发送注册成功短信
-        // todo 临时注释，方便教育线上传产品
-//        vendorModel.sendVendorRegisterOkSms(vendorRegisterDTO);
+        vendorModel.sendVendorRegisterOkSms(vendorRegisterDTO);
         Map<String, String> headers = new HashMap<>(16);
         headers.put("Authorization", "Basic c2VsbGVyOnNlbGxlcg==");
         headers.put("name", null);