联合丽格1.0.1

src/main/java/com/caimei365/user/components/WeChatService.java

@@ -143,7 +143,7 @@ public class WeChatService {
         byte[] keyByte = Base64.decodeBase64(key);
         // 偏移量
         byte[] ivByte = Base64.decodeBase64(iv);
-//        try {
+        try {
             Cipher cipher = Cipher.getInstance("AES/CBC/PKCS7Padding");
             SecretKeySpec spec = new SecretKeySpec(keyByte, "AES");
             AlgorithmParameters parameters = AlgorithmParameters.getInstance("AES");
@@ -157,10 +157,10 @@ public class WeChatService {
                 return new String(resultByte, encodingFormat);
             }
             return null;
-        /*} catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
-        }*/
-//        return null;
+        }
+        return null;
     }
 
     /**
@@ -376,8 +376,6 @@ public class WeChatService {
      *
      * @param accessToken 微信公众号
      * @param openid      公众号的openid
-     * @param title       标题
-     * @param name        商品名称
      * @param remarkText  备注
      * @param pagePath    跳转链接
      */

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

@@ -115,7 +115,7 @@ public interface LoginMapper {
      * @param invitationCode
      * @return
      */
-    UserLoginVo getOperationUserByInvitationCode(String invitationCode);
+    UserLoginVo getOperationUserByInvitationCode(String invitationCode, Integer organizeId);
 
     /**
      * 根据邀请码获取运营人员 -- 组织

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

@@ -54,6 +54,10 @@ public class UserLoginVo implements Serializable {
      */
     @ApiModelProperty("机构名称")
     private String name;
+    /**
+     * 机构联系人
+     */
+    private String clubLinkMan;
     /**
      * 用户名
      */

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

@@ -181,6 +181,10 @@ public class LoginServiceImpl implements LoginService {
         }
         //处理比对密码
         UserLoginVo baseUser = loginMapper.getLoginOrganizeUserByMobileOrEmail(mobileOrEmail);
+        // 机构下线，登录失败
+        if (91 == baseUser.getClubStatus()) {
+            return ResponseJson.error(-1,"您的企业账号已被冻结，请联系客服处理", null);
+        }
         if (null != baseUser) {
             // 绑定微信信息
             Integer operationUser = loginMapper.getOperationUser(mobileOrEmail);
@@ -192,8 +196,8 @@ public class LoginServiceImpl implements LoginService {
                 operationVo.setUserType(1);
                 operationVo.setUserId(baseUser.getUserId());
                 operationVo.setClubId(baseUser.getClubId());
-                operationVo.setMobile(baseUser.getMobile());
-                operationVo.setLinkName(baseUser.getUserName());
+                operationVo.setMobile(baseUser.getBindMobile());
+                operationVo.setLinkName(baseUser.getClubLinkMan());
                 operationVo.setStatus(2);
                 operationVo.setUnionId(unionId);
                 operationVo.setBindTime(new Date());
@@ -802,16 +806,16 @@ public class LoginServiceImpl implements LoginService {
         loginUser.setToken(token);
         if (null != loginUser.getClubStatus() && 91 == loginUser.getClubStatus()) {
             //机构
-            return ResponseJson.error(-2, "您的企业账号已被冻结，请联系客服处理", null);
+            return ResponseJson.error(-1, "您的企业账号已被冻结，请联系客服处理", loginUser);
         }
         // 供应商
         if (null != loginUser.getShopStatus() && null != loginUser.getUserIdentity() && 3 == loginUser.getUserIdentity()) {
 
             if (3 == loginUser.getShopStatus()) {
-                return ResponseJson.error(-2, "您的企业账号正在加速审核中,审核通过后即可登录", null);
+                return ResponseJson.error(-1, "您的企业账号正在加速审核中,审核通过后即可登录", loginUser);
             }
             if (91 == loginUser.getShopStatus()) {
-                return ResponseJson.error(-2, "您的企业账号已被冻结，请联系客服处理", null);
+                return ResponseJson.error(-1, "您的企业账号已被冻结，请联系客服处理", loginUser);
             }
             if (92 == loginUser.getShopStatus()) {
                 return ResponseJson.error(-3, "您的企业账号审核未通过", loginUser);
@@ -1114,7 +1118,7 @@ public class LoginServiceImpl implements LoginService {
         if (StringUtils.isBlank(invitationCode)) {
             return ResponseJson.error("邀请码不能为空", null);
         }
-        UserLoginVo operation = loginMapper.getOperationUserByInvitationCode(invitationCode);
+        UserLoginVo operation = loginMapper.getOperationUserByInvitationCode(invitationCode, 0);
         if (operation == null) {
             return ResponseJson.error("邀请码错误", null);
         }
@@ -1235,12 +1239,13 @@ public class LoginServiceImpl implements LoginService {
 
             }
         } else {
-            // 联合丽格没有运营人员为机构运营人员
             // 机构Id
             operationPo.setClubId(operation.getClubId());
             // 用户类型
             operationPo.setUserType(1);
         }
+        operationPo.setUpdateTime(new Date());
+        operationPo.setBindTime(new Date());
         // 更新运营人员信息
         operationMapper.updateOperationByInvitation(operationPo);
         // 返回登录校验结果
@@ -1307,7 +1312,8 @@ public class LoginServiceImpl implements LoginService {
         operationPo.setClubId(operation.getClubId());
         // 用户类型
         operationPo.setUserType(1);
-
+        operationPo.setUpdateTime(new Date());
+        operationPo.setBindTime(new Date());
         // 更新运营人员信息
         operationMapper.updateOperationByInvitation(operationPo);
         // 返回登录校验结果

src/main/resources/mapper/LoginMapper.xml

@@ -83,6 +83,7 @@
                u.serviceProviderId  as serviceProviderId,
                u.userName           as userName,
                u.name               as name,
+               ( SELECT linkMan FROM club WHERE userId = u.userID) as clubLinkMan,
                u.mobile             as mobile,
                u.bindMobile         as bindMobile,
                u.email              as email,
@@ -109,6 +110,7 @@
                u.serviceProviderId  AS serviceProviderId,
                u.userName           AS userName,
                u.name               AS NAME,
+               ( SELECT linkMan FROM club WHERE userId = u.userID) as clubLinkMan,
                u.mobile             AS mobile,
                u.bindMobile         AS bindMobile,
                u.email              AS email,
@@ -404,7 +406,7 @@
         FROM cm_mall_operation_user cou
                  LEFT JOIN user u ON u.userID = cou.userID
         WHERE cou.invitationCode = #{invitationCode}
-          AND cou.userOrganizeID = 4
+          AND cou.userOrganizeID = #{organizeId}
           AND u.userIdentity in (2, 3, 4)
     </select>
     <select id="getOperationUserByOperationId" resultType="com.caimei365.user.model.vo.UserLoginVo">

src/main/resources/mapper/OperationMapper.xml

@@ -33,7 +33,7 @@
                status as status,
                nickName as nickName
         from cm_mall_operation_user
-        where mobile = #{mobile} and userOrganizeID = #{organizeId}
+        where mobile = #{mobile} and userOrganizeID = #{organizeId} AND delFlag = 0
         limit 1
     </select>
     <select id="getOperationCodeInfoById" resultType="com.caimei365.user.model.po.OperationPo">
@@ -78,6 +78,8 @@
             nickName = #{nickName},
             headimgurl = #{avatarUrl},
             status = #{status},
+            bindTime = #{bindTime},
+            updateTime = #{updateTime},
             <if test="clubId != null and clubId != ''">
                 clubId = #{clubId},
                 shopId = null,

src/main/resources/mapper/SellerMapper.xml

@@ -238,7 +238,7 @@
         FROM cm_serviceteam_group csg
         LEFT JOIN cm_serviceteam_role csr ON csr.id=csg.teamId
         left join serviceprovider s on csg.serviceId=s.serviceProviderID
-        WHERE csr.leaderId = #{spId}
+        WHERE csr.leaderId = #{spId} and s.organizeID = 0
         <if test="status == 1">
             AND csg.serviceId != #{spId}
         </if>
@@ -247,9 +247,12 @@
         SELECT csg.serviceId AS serviceProviderId,s.linkMan AS NAME
         FROM cm_serviceteam_group csg
         LEFT JOIN serviceprovider s ON csg.serviceId=s.serviceProviderID
-        <if test="status == 1">
-            WHERE csg.serviceId != #{spId}
-        </if>
+        <where>
+            s.organizeID = 0
+            <if test="status == 1">
+                and csg.serviceId != #{spId}
+            </if>
+        </where>
     </select>
 
 </mapper>