分销系统V.1.0.0

src/main/java/com/caimei365/user/controller/DistributionApi.java

@@ -140,7 +140,7 @@ public class DistributionApi {
             cmDistribution.status(91);
         }
         CmDistribution cmDistributionById = cmDistribution.id()==null?null:cmDistributionService.getCmDistributionById(cmDistribution.id());
-        CmUser cmUser = baseService.findUserByMobile(cmDistribution.mobile(),cmDistributionById==null?null:cmDistributionById.userId(),7);
+        CmUser cmUser = baseService.findUserByMobile(cmDistribution.mobile(),cmDistributionById==null?null:cmDistributionById.userId(),null);
         if (cmUser!=null) {
             return ResponseJson.error("手机号码已经被使用！", null);
         }

src/main/java/com/caimei365/user/service/impl/BaseServiceImpl.java

@@ -315,11 +315,11 @@ public class BaseServiceImpl implements BaseService {
             }
             codeTypeTxt = "联合丽格采购员登录";
         } else if (14 == activateCodeType) {
-            String content = "【分销商城】欢迎登录分销商城，您的验证码为" + randomCode + "，5分钟内有效，请勿泄露他人。";
+            String content = "【分销系统】欢迎登录分销商城，您的验证码为：" + randomCode + "，5分钟内有效，请勿泄漏他人。";
             sendFlag = isBeta || remoteCallService.remoteSendSms(0, 1, mobile, content);
             codeTypeTxt = "分销商城人员登录";
         } else if (15 == activateCodeType) {
-            String content = "【分销商城】您正在修改密码，验证码为" + randomCode + "，5分钟内有效，请勿泄露他人。";
+            String content = "【分销系统】您的验证码为：" + randomCode + "，5分钟内有效，请勿泄漏他人。";
             sendFlag = isBeta || remoteCallService.remoteSendSms(0, 1, mobile, content);
             codeTypeTxt = "分销商城找回密码";
         } else {
@@ -329,7 +329,7 @@ public class BaseServiceImpl implements BaseService {
             if (6 == activateCodeType) {
                 //二手验证码10分钟有效期
                 redisService.set("code:" + mobile, randomCode, 600L);
-            } else if (8 == activateCodeType || 10 == activateCodeType || 11 == activateCodeType) {
+            } else if (8 == activateCodeType || 10 == activateCodeType || 11 == activateCodeType||14 == activateCodeType||15 == activateCodeType) {
                 // 联合丽格验证码5分钟有效期
                 redisService.set("code:" + mobile, randomCode, 300L);
             }else {
@@ -343,6 +343,7 @@ public class BaseServiceImpl implements BaseService {
         return ResponseJson.success("发送验证码成功");
     }
 
+
     /**
      * 绑定账号,发送短信验证
      *

src/main/java/com/caimei365/user/service/impl/CmDistributionServiceImpl.java

@@ -16,6 +16,7 @@ import com.caimei365.user.model.po.CmUser;
 import com.caimei365.user.model.vo.UserLoginVo;
 import com.caimei365.user.service.CmDistributionService;
 import com.caimei365.user.service.RemoteCallService;
+import com.caimei365.user.utils.CodeUtil;
 import com.caimei365.user.utils.DateUtil;
 import com.caimei365.user.utils.JwtUtil;
 import com.caimei365.user.utils.Md5Util;
@@ -101,7 +102,7 @@ public class CmDistributionServiceImpl implements CmDistributionService {
         cmUser.setAuditStatus("1");
         cmUser.setAuditTime(DateUtil.formatDateTime(new Date()));
         if (StringUtils.isBlank(cmDistribution.id())) {
-            String password="1111aaaa";
+            String password=(char)(Math.random()*26+'A')+ CodeUtil.generateCodeInt(7);
             cmUser.setUserOrganizeID("0");
             cmUser.setMobile(cmDistribution.mobile());
             cmUser.setBindMobile(cmDistribution.mobile());
@@ -303,7 +304,7 @@ public class CmDistributionServiceImpl implements CmDistributionService {
                     // 根据手机号获取分销人员
                     CmUser user = baseMapper.getByUser(new CmUser().userIdentity("8").userID(userId).bindMobile(mobile));
                     if (null!=user) {
-                        String password="1111aaaa";
+                        String password=(char)(Math.random()*26+'A')+CodeUtil.generateCodeInt(7);
                         baseMapper.updateUser(new CmUser()
                                 .userID(userId)
                                 .validFlag("1")
@@ -312,7 +313,7 @@ public class CmDistributionServiceImpl implements CmDistributionService {
                         );
                         baseMapper.updateClubStatus(Integer.valueOf(userId),90);
                         // 发送短信
-                        String content = "亲爱的买家，您好，系统根据您下单时的手机号默认给您生成了登录账号与密码，账号："+mobile+"，密码："+password+"，您可通过手机号与密码或验证码登录分销系统查看您的订单状态";
+                        String content = "【分销系统】亲爱的买家，您好，系统根据您下单时的手机号默认给您生成了登录账号与密码，账号："+mobile+"，密码："+password+"，您可通过手机号与密码或验证码登录分销系统查看您的订单状态";
                         boolean smsFlag = remoteCallService.remoteSendSms(0, 1, mobile, content);
                         if (!smsFlag) {
                             // 短信发送失败重试一次