联合丽格1.0.1

src/main/java/com/caimei365/user/mapper/LoginMapper.java

@@ -65,7 +65,7 @@ public interface LoginMapper {
      * @param openId openId
      * @return BaseUser
      */
-    UserLoginVo getServiceProviderUserByOpenId(@Param("openId") String openId);
+    UserLoginVo getServiceProviderUserByOpenId(@Param("openId") String openId,@Param("organizeId") Integer organizeId);
 
     /**
      * 根据用户ID更新协销unionId

src/main/java/com/caimei365/user/model/vo/UserLoginVo.java

@@ -109,6 +109,11 @@ public class UserLoginVo implements Serializable {
      */
     @ApiModelProperty("供应商状态：90:已上线")
     private Integer shopStatus;
+    /**
+     * 协销状态： 90：已上线
+     */
+    @ApiModelProperty("协销状态： 90：已上线")
+    private Integer serviceStatus;
     /**
      * 运营人员状态：1未绑定，2已绑定
      */

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

@@ -222,14 +222,16 @@ public class BaseServiceImpl implements BaseService {
                 }
                 UserLoginVo userLoginVo = baseMapper.getUserIdByOrganizeStatus(4, mobile);
                 if ( null != userLoginVo.getClubStatus()) {
-                    return ResponseJson.error(-1,"该手机号暂未注册",null);
+                    if (1 == userLoginVo.getClubStatus()) {
+                        return ResponseJson.error(-1, "账号待审核，请耐心等待审核结果", null);
+                    }
+                    if (91 == userLoginVo.getClubStatus()) {
+                        return ResponseJson.error(-1, "该手机号已下线", null);
+                    }
                 }
                 if (1 == userLoginVo.getUserIdentity()) {
                     return ResponseJson.error(-1, "该手机号，暂未注册成为机构用户", null);
                 }
-                if (1 == userLoginVo.getClubStatus()) {
-                    return ResponseJson.error(-1,"账号待审核，请耐心等待",null);
-                }
                 // 欢迎登录联合丽格，您的验证码为：{s6}，5分钟内有效，请勿泄漏他人。
                 content = "【丽格集采联盟】欢迎登录联合丽格，您的验证码为：" + randomCode + "，5分钟内有效，请勿泄漏他人。";
                 codeTypeTxt = "登录联合丽格";

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

@@ -359,7 +359,7 @@ public class LoginServiceImpl implements LoginService {
                         operationVo.setUserType(1);
                         operationVo.setUserId(baseUser.getUserId());
                         operationVo.setClubId(baseUser.getClubId());
-                        operationVo.setMobile(baseUser.getMobile());
+                        operationVo.setMobile(baseUser.getBindMobile());
                         operationVo.setLinkName(baseUser.getUserName());
                         operationVo.setStatus(2);
                         operationVo.setUnionId(unionId);
@@ -437,7 +437,7 @@ public class LoginServiceImpl implements LoginService {
         redisService.setMap("wxInfo:applets:" + unionId, infoData);
         log.info("小程序授权登录，返回unionId给前端，用户数据存入Redis，key：wxInfo:applets:" + unionId);
         // 协销授权登录
-        UserLoginVo seller = loginMapper.getServiceProviderUserByOpenId(openId);
+        UserLoginVo seller = loginMapper.getServiceProviderUserByOpenId(openId, 0);
         if (null != seller) {
             loginMapper.updateServiceProviderUnionId(seller.getUserId(), unionId);
             String token = JwtUtil.createToken(seller.getUserId());
@@ -496,13 +496,24 @@ public class LoginServiceImpl implements LoginService {
         }
         // 用户数据存入Redis，key前缀：wxInfo:applets:
         redisService.setMap("wxInfo:applets:" + unionId, infoData);
-        log.info("小程序授权登录，返回unionId给前端，用户数据存入Redis，key：wxInfo:applets:" + unionId);
-        /*UserLoginVo userLoginVo = loginMapper.organizeUserInfo(openId);
-        if (userLoginVo == null) {
-            userLoginVo = new UserLoginVo();
-            userLoginVo.setOpenId(openId);
-            return ResponseJson.error(-2, "用户未注册", userLoginVo);
-        }*/
+        log.info("小程序授权登录，返回unionId给前端，用户数据存入Redis，key：wxInfo:applets:" + unionId + "operId" + openId);
+        // 采购员授权登录
+        UserLoginVo seller = loginMapper.getServiceProviderUserByOpenId(openId, 4);
+        if (null != seller) {
+            loginMapper.updateServiceProviderUnionId(seller.getUserId(), unionId);
+            String token = JwtUtil.createToken(seller.getUserId());
+            seller.setToken(token);
+            seller.setUnionId(unionId);
+            seller.setOpenId(openId);
+            // 生成token给协销用户
+            String sellerToken = JwtUtil.createToken(seller.getUserId());
+            // 为了过期续签，将token存入redis，并设置超时时间
+            redisService.set(sellerToken, sellerToken, JwtUtil.getExpireTime());
+            seller.setToken(sellerToken);
+            seller.setManager(sellerMapper.findManagerByUser(seller.getUserId()));
+            seller.setLeaderId(sellerMapper.findLeaderId(seller.getUserId()));
+            return ResponseJson.success(seller);
+        }
         return organizeOperationAuthLogin(openId, unionId, "mini");
     }
 

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

@@ -194,10 +194,19 @@ public class SellerServiceImpl implements SellerService {
 
                     // 根据手机号获取用户信息
                     UserLoginVo baseUser = loginMapper.getLoginOrganizeUserByMobileOrEmail(mobile);
+                    // 协销下线不在登录协销登录
+                    if (null != baseUser.getUserIdentity() && 1 == baseUser.getUserIdentity()) {
+                        if ( null != baseUser.getServiceStatus() && 90 != baseUser.getServiceStatus()) {
+                            seller = new UserLoginVo();
+                            seller.setOpenId(openId);
+                            seller.setUnionId(unionId);
+                            return ResponseJson.error(-1,"采购员已下线",seller);
+                        }
+                    }
                     // 绑定微信信息
                     Integer operationUser = loginMapper.getOperationUser(mobile);
                     log.info("operationUser==="+operationUser);
-                    if (null == operationUser) {
+                    /*if (null == operationUser) {
                         // 绑定微信
                         OperationVo operationVo = new OperationVo();
                         operationVo.setOrganizeId(baseUser.getOrganizeId());
@@ -212,7 +221,7 @@ public class SellerServiceImpl implements SellerService {
                         operationVo.setAddTime(new Date());
                         operationVo.setDelFlag(0);
                         loginMapper.insertOperation(operationVo);
-                    }
+                    }*/
                     return ResponseJson.success(seller);
                 } else {
                     return ResponseJson.error(-1, "验证码错误，请确认验证码输入",null);

src/main/resources/mapper/LoginMapper.xml

@@ -92,6 +92,7 @@
                u.guideFlag          as guideFlag,
                u.clubStatus         as clubStatus,
                u.manufacturerStatus as shopStatus,
+               u.serviceProviderStatus as serviceStatus,
                cu.id                as operationId,
                cu.status            as operationStatus,
                cu.mobile            as operationMobile
@@ -117,6 +118,7 @@
                u.guideFlag          AS guideFlag,
                u.clubStatus         AS clubStatus,
                u.manufacturerStatus AS shopStatus,
+               u.serviceProviderStatus as serviceStatus,
                cu.id                AS operationId,
                cu.status            AS operationStatus,
                cu.mobile            AS operationMobile
@@ -177,6 +179,7 @@
         from serviceprovider s
                  left join user u on s.userID = u.userID
         where s.openid = #{openId}
+          and s.organizeId = #{organizeId}
           and u.validFlag = 1
         limit 1
     </select>
@@ -234,6 +237,7 @@
         u.guideFlag as guideFlag,
         u.clubStatus as clubStatus,
         u.manufacturerStatus as shopStatus,
+        u.serviceProviderStatus as serviceStatus,
         o.unionId as unionId,
         o.status as operationStatus,
         o.mobile as operationMobile,

src/main/resources/mapper/SellerMapper.xml

@@ -14,6 +14,7 @@
                u.userPermission as userPermission,
                u.userIdentity   as userIdentity,
                u.serviceProviderID as serviceProviderId,
+               u.serviceProviderStatus as serviceStatus,
                u.password       as password
         from user u
         where u.mobile = #{mobile}