Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master

wisenergy-common/src/main/java/cn/wisenergy/common/utils/Result.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
  * Created by m1991 on 2021/2/28 23:08
  */
 @Component
-public class Result<T> implements Serializable {
+public class Result<T> implements Serializable{
     public String code;
 
     public String msg;
@@ -21,20 +21,17 @@ public class Result<T> implements Serializable {
     /**
      * 无参构造
      */
-    public Result() {
-    }
-
+    public Result() {}
     /**
+     * 无参构造
      * @param i
      * @param success
      * @param shopZxPage
      */
-    public Result(int i, String success, Page shopZxPage) {
-    }
+    public Result(int i, String success, Page shopZxPage) {}
 
     /**
      * 根据code，msg创建一个Resutl
-     *
      * @param code
      * @param msg
      */
@@ -45,7 +42,6 @@ public class Result<T> implements Serializable {
 
     /**
      * 根据code，msg，data创建一个Resutl
-     *
      * @param code
      * @param msg
      * @param data
@@ -58,7 +54,6 @@ public class Result<T> implements Serializable {
 
     /**
      * 根据枚举创建一个Result
-     *
      * @param resultEnum
      */
     public Result(ResultEnum resultEnum) {

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java

@@ -104,8 +104,12 @@ public interface UsersMapper extends BaseMapper<User> {
      */
     Integer save(@Param("userId")String userId, @Param("inviteCode") String inviteCode, @Param("beInvitedCode") String beInvitedCode, @Param("userLevel") Integer userLevel);
     Integer insertbyint(@Param("userId")String userId,  @Param("beInvitedCode") String beInvitedCode);
-    Integer edit1(@Param("userId")String userId);
+
+    User edit1(int userLevel, String intiveCode,String userId);
+
+    Integer edit2(User user);
     Integer getuserIdById(@Param("userId")String userId);
+    Integer BYQMById(@Param("userId")String userId);
     /**
      * 根据userid获取获取所有的直接推荐人
      * @param inviteCode 用户本人的邀请码

wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml

@@ -208,19 +208,30 @@
             user_id=#{userId}
         </where>
     </select>
-    <update id="edit1" parameterType="cn.wisenergy.model.app.User">
+    <select id="BYQMById" resultType="java.lang.Integer">
+        select
+        be_invited_code
+        from
+        <include refid="table"/>
+        <where>
+            user_id=#{userId}
+        </where>
+    </select>
+    <update id="edit1" >
         update
         user_info
         <set>
             <if test="userLevel != null">user_level =#{userLevel},</if>
             <if test="inviteCode != null">invite_code =#{inviteCode},</if>
+            create_time =now(),
             update_time =now()
         </set>
         <where>
-            user_id = #{userId}
+        user_id = #{userId}
         </where>
     </update>
 
+
     <!--分页查询所有用户信息 -->
     <select id="getUsersListByMap" resultType="cn.wisenergy.model.app.User" parameterType="java.util.Map">
         select id as id,
@@ -287,5 +298,17 @@
         and user_level=#{userlevel}
     </select>
 
+    <update id="updateByUserid">
+        update
+        <include refid="table"/>
+        set
+        (user_level,invite_code,)
+        value
+        (#{userLevel},#{inviteCode})
+        <where>
+            user_id=#{userId}
+        </where>
+    </update>
+
 
 </mapper>

wisenergy-service/src/main/java/cn/wisenergy/service/app/UserService.java

@@ -34,13 +34,13 @@ public interface UserService {
     User getByUserId(String userId);
 
     //根据手机号查询用户
-    public User queryUsersByPhone(String id);
-
+    public User queryUsersByPhone(String userId);
     //根据OpenId查询用户
     public User queryUsersByOpenId(String openId);
 
+
     /**
-     * 用户注册
+     *用户注册
      */
     Map userByZx(String userId, String beInvitedCode);
 

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java

@@ -50,7 +50,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
     @Override
     public R<Integer> getById1(String userId) {
 
-        return R.ok(usersMapper.ByUserId(userId));
+        return  R.ok(usersMapper.ByUserId(userId));
     }
 
     @Override
@@ -60,11 +60,11 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
 
 
     @Override
-    public User queryUsersByPhone(String phone) {
-        Map<String, Object> param = new HashMap<String, Object>();
-        param.put("phone", phone);
-        List<User> usersList = usersMapper.getUsersListByMap(param);
-        if (!CollectionUtils.isEmpty(usersList)) {
+    public User queryUsersByPhone(String userId) {
+        Map<String,Object> param=new HashMap<String, Object>();
+        param.put("userId",userId);
+        List<User> usersList=usersMapper.getUsersListByMap(param);
+        if(!CollectionUtils.isEmpty(usersList)){
             return usersList.get(0);
         }
         return null;
@@ -78,11 +78,19 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
     @Override
     public Map userByZx(String userId, String beInvitedCode) {
         //查询数据库，看看是否存在该用户
-        Integer yh=usersMapper.getuserIdById(userId);
+       // Integer yh=usersMapper.getuserIdById(userId);
+        User byUserId = usersMapper.getByUserId(userId);
+        if(null != byUserId){
+           R.error(0,"该用户已存在！请直接登录！") ;
+           Map map=new HashMap();
+           map.put("code",0);
+           map.put("msg","该用户已存在！请直接登录！");
+           return map;
+        }
         /**
          * 判断用户推荐人的邀请码是否为空，空的话填写1
          */
-        if (null == beInvitedCode || "".equals(beInvitedCode) && null==yh) {
+        if (null == beInvitedCode || "" == beInvitedCode ) {
             beInvitedCode = "1";
 
             //        插入用户手机号与推荐人邀请码
@@ -110,16 +118,26 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         }
 
         //根据插入的用户手机号，查询用户唯一ID
-        long yqm = usersMapper.ByUserId(userId);
+        long yqm = usersMapper.getuserIdById(userId);
         //用户唯一ID调用生成6位邀请码
         String inviteCode = ShareCodeUtil.idToCode(yqm);
+        Integer userLevel=0;
         //根据用户手机号，更新用户信息
-        User user = new User();
-        user.setInviteCode(inviteCode);
-        user.setUserLevel(0);
-        user.setUserId(userId);
-        usersMapper.updateById(user);
+//        usersMapper.edit1(userLevel,inviteCode,userId);
+        User byUserId1 = usersMapper.getByUserId(userId);
+        byUserId1.setInviteCode(inviteCode);
+        byUserId1.setUserLevel(0);
+
+        usersMapper.edit(byUserId1);
 
+        String BYQM= String.valueOf(usersMapper.BYQMById(userId));
+
+        if("1".equals(BYQM)){
+            Map map =new HashMap();
+            map.put("code",0);
+            map.put("msg","注册成功！");
+           return map;
+        }
         //插入直推用户表
         RecommendUser recommendUser = new RecommendUser();
         recommendUser.setUserId(userId);

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/LoginController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
 
 /**
  *
@@ -35,8 +36,8 @@ public class LoginController {
         @Autowired
         private UserService usersService;
 
-        @Autowired
-        private Result result;
+//        @Autowired
+//        private Result result;
 
     /**
      * 手机登录接口
@@ -109,7 +110,7 @@ public class LoginController {
                 @ApiImplicitParam(name = "sms", value = "验证码",required = true, dataType = "String")
                 })
         @RequestMapping("/register")
-        public Result register(@RequestParam String userId, String beInvitedCode,@RequestParam String sms)throws Exception {
+        public Map register(@RequestParam String userId, String beInvitedCode, @RequestParam String sms)throws Exception {
             User users=null;
             String key= StringUtil.formatKeyWithPrefix(Constants.RedisKey.PROJECT_PRIFIX,Constants.RedisKey.SMS_PRIFIX,userId,Constants.Sms.CodeType.LOGIN_OR_REGISTER+"");
             String redisCode=redisUtils.getValue(key);
@@ -125,9 +126,8 @@ public class LoginController {
 //            if(userId.equals())){
 //                throw new BaseException(ResultEnum.PHONE_ERROR);
 //            }
-            usersService.userByZx(userId,beInvitedCode);
 
-            return ResultUtils.returnFail("注册成功！","0");
+            return usersService.userByZx(userId,beInvitedCode);
             }
 
     }

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SmsController.java

@@ -69,8 +69,8 @@ public class SmsController {
 
         //生成随机数
         String code= MathUtils.random();
-        //保存至Redis
-        redisUtils.set(key,code,Constants.Duration.MINUTE_INT);
+        //保存至Redis   MINUTE_INT
+        redisUtils.set(key,code,Constants.Duration.HALF_HOUR_INT);
 
         boolean flag=smsUtils.sendMessage(phone,Constants.Sms.TemplateCode.LOGIN_SF_REGISTER,code);
         return flag? ResultUtils.returnSuccess():ResultUtils.returnFail();