联合丽格

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

@@ -1,6 +1,7 @@
 package com.caimei365.user.mapper;
 
 import com.caimei365.user.model.vo.LoginFailRecordVo;
+import com.caimei365.user.model.vo.OperationVo;
 import com.caimei365.user.model.vo.ServiceProviderVo;
 import com.caimei365.user.model.vo.UserLoginVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -31,6 +32,19 @@ public interface LoginMapper {
      * @return BaseUser
      */
     UserLoginVo getLoginUserByMobileOrEmail(@Param("mobileOrEmail") String mobileOrEmail);
+
+    /**
+     * 是否绑定微信
+     * @param mobileOrEmail
+     * @return
+     */
+    Integer getOperationUser(@Param("mobileOrEmail") String mobileOrEmail);
+
+    /**
+     * 绑定微信
+     * @param operationVo
+     */
+    void insertOperation(OperationVo operationVo);
     /**
      * 根据手机号获取用户
      *

src/main/java/com/caimei365/user/model/po/UserPo.java

@@ -41,10 +41,6 @@ public class UserPo implements Serializable {
      * 协销Id
      */
     private Integer serviceProviderId;
-    /**
-     * 外部商城机构类型 0内部结构 1外部机构
-     */
-    private Integer organizeType;
     /**
      * 用户名
      */

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

@@ -100,6 +100,23 @@ public class LoginServiceImpl implements LoginService {
         //处理比对密码
         UserLoginVo baseUser = loginMapper.getLoginUserByMobileOrEmail(mobileOrEmail);
         if (null != baseUser) {
+            // 绑定微信信息
+            Integer operationUser = loginMapper.getOperationUser(mobileOrEmail);
+            if (null == operationUser) {
+                // 绑定微信
+                OperationVo operationVo = new OperationVo();
+                operationVo.setOrganizeId(baseUser.getOrganizeId());
+                operationVo.setUserType(1);
+                operationVo.setUserId(baseUser.getUserId());
+                operationVo.setClubId(baseUser.getClubId());
+                operationVo.setMobile(baseUser.getMobile());
+                operationVo.setLinkName(baseUser.getUserName());
+                operationVo.setStatus(2);
+                operationVo.setUnionId(unionId);
+                operationVo.setBindTime(new Date());
+                operationVo.setDelFlag(0);
+                loginMapper.insertOperation(operationVo);
+            }
             String key = "login-" + baseUser.getUserId();
             boolean exists = redisService.exists(key);
             //如果30分钟内输入错误记录>=5,return该账号暂时被冻结，请（30-最前一次时间）分钟后重试或直接修改密码
@@ -197,6 +214,23 @@ public class LoginServiceImpl implements LoginService {
                     redisService.remove("code:" + mobile);
                     // 根据手机号获取用户信息
                     UserLoginVo baseUser = loginMapper.getLoginUserByMobileOrEmail(mobile);
+                    // 绑定微信信息
+                    Integer operationUser = loginMapper.getOperationUser(mobile);
+                    if (null == operationUser) {
+                        // 绑定微信
+                        OperationVo operationVo = new OperationVo();
+                        operationVo.setOrganizeId(baseUser.getOrganizeId());
+                        operationVo.setUserType(1);
+                        operationVo.setUserId(baseUser.getUserId());
+                        operationVo.setClubId(baseUser.getClubId());
+                        operationVo.setMobile(baseUser.getMobile());
+                        operationVo.setLinkName(baseUser.getUserName());
+                        operationVo.setStatus(2);
+                        operationVo.setUnionId(unionId);
+                        operationVo.setBindTime(new Date());
+                        operationVo.setDelFlag(0);
+                        loginMapper.insertOperation(operationVo);
+                    }
                     // 如果前端传入unionId，则存入返回前端
                     baseUser.setUnionId(unionId);
                     // 不是采美组织下

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

@@ -455,7 +455,6 @@ public class RegisterServiceImpl implements RegisterService {
         // 用户名
         user.setName(organizeRegisterDto.getName());
         user.setUserName(organizeRegisterDto.getName());
-        user.setOrganizeType(organizeRegisterDto.getOrganizeType());
         // 绑定手机号
         user.setBindMobile(organizeRegisterDto.getBindMobile());
         // 用户身份: 1协销 2会员机构 3供应商 4普通机构
@@ -500,7 +499,7 @@ public class RegisterServiceImpl implements RegisterService {
         // 联系手机
         club.setContractMobile(user.getBindMobile());
         // 联系人
-        club.setLinkMan(user.getUserName());
+        club.setLinkMan(organizeRegisterDto.getLinkMan());
         // 用户Id
         club.setUserId(user.getUserId());
         // 协销Id(spId)

src/main/resources/mapper/ClubMapper.xml

@@ -171,8 +171,10 @@
             firstClubType = #{firstClubType},
         </if>
         <if test="firstClubType == 1 or firstClubType == 2">
-            secondClubType = #{secondClubType}, department = #{department}, medicalPracticeLicenseImg =
-            #{medicalPracticeLicense},
+            secondClubType = #{secondClubType}, department = #{department},
+        </if>
+        <if test="medicalPracticeLicense != null and medicalPracticeLicense != ''">
+            medicalPracticeLicenseImg = #{medicalPracticeLicense},
         </if>
         <if test="mainProduct != null and mainProduct != ''">
             mainpro = #{mainProduct},

src/main/resources/mapper/LoginMapper.xml

@@ -79,6 +79,13 @@
           # AND u.userOrganizeID = 0
         limit 1
     </select>
+    <select id="getOperationUser" resultType="java.lang.Integer">
+        select id from cm_mall_operation_user where mobile = #{mobileOrEmail} and delFlag = 0
+    </select>
+    <insert id="insertOperation">
+        INSERT INTO cm_mall_operation_user (userOrganizeID, userType, userID, clubID, mobile, linkName, STATUS, unionId, bindTime, delFlag)
+        values(#{userOrganizeId}, #{userType}, #{userId}, #{clubId}, #{mobile}, #{linkName}, #{status}, #{unionId}, #{bindTime}, #{delFlag})
+    </insert>
     <select id="getLoginUserByMobile" resultType="com.caimei365.user.model.vo.UserLoginVo">
         select u.userID             as userId,
                u.clubID             as clubId,

src/main/resources/mapper/RegisterMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei365.user.mapper.RegisterMapper">
     <insert id="insertClubUser" parameterType="com.caimei365.user.model.po.UserPo" keyProperty="userId" useGeneratedKeys="true">
-        insert into user(`userOrganizeID`,`organizeType`,`registerTime`,`registerIP`, `ipAddress`, `source`, `registerUserTypeID`, `name`, `userName`, `bindMobile`, `email`, `userIdentity`, `userPermission`,`guideFlag`,`clubStatus`, `password`, `agreeFlag`, `validFlag`, `serviceProviderID`, `serviceProviderStatus`, userBeans)
-                  values(#{organizeId},#{organizeType},#{registerTime},#{registerIp},#{ipAddress},#{source},#{registerUserTypeId},#{name},#{userName},#{bindMobile},#{email},#{userIdentity},#{userPermission},#{guideFlag},#{clubStatus},#{password},#{agreeFlag},#{validFlag},#{serviceProviderId},#{serviceProviderStatus}, #{userBeans})
+        insert into user(`userOrganizeID`,`registerTime`,`registerIP`, `ipAddress`, `source`, `registerUserTypeID`, `name`, `userName`, `bindMobile`, `email`, `userIdentity`, `userPermission`,`guideFlag`,`clubStatus`, `password`, `agreeFlag`, `validFlag`, `serviceProviderID`, `serviceProviderStatus`, userBeans)
+                  values(#{organizeId},#{registerTime},#{registerIp},#{ipAddress},#{source},#{registerUserTypeId},#{name},#{userName},#{bindMobile},#{email},#{userIdentity},#{userPermission},#{guideFlag},#{clubStatus},#{password},#{agreeFlag},#{validFlag},#{serviceProviderId},#{serviceProviderStatus}, #{userBeans})
     </insert>
     <select id="selUser" resultType="com.caimei365.user.model.po.UserPo">
         select * from user where registerTime = #{registerTime}