客服确认注册修改

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

@@ -135,4 +135,16 @@ public interface RegisterMapper {
      * @param beansHistory
      */
     void insertBeansHistory(UserBeansHistoryPo beansHistory);
+
+    /**
+     * 更新user表记录
+     * @param user
+     */
+    void updateClubUser(UserPo user);
+
+    /**
+     * 更新club表
+     * @param club
+     */
+    void updateClub(ClubPo club);
 }

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

@@ -17,6 +17,10 @@ public class ClubTemporaryVo implements Serializable {
      * 协销用户Id
      */
     private Integer userId;
+    /**
+     * 确认注册机构userId
+     */
+    private Integer confirmUserId;
     /**
      * 机构名称
      */

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

@@ -529,10 +529,18 @@ public class RegisterServiceImpl implements RegisterService {
             user.setGuideFlag(0);
         }
         /* 保存数据库 user */
-        int insertUserFlag = registerMapper.insertClubUser(user);
-        log.info("插入数据库User表，获得userId:" + user.getUserId());
-        if (insertUserFlag < 1) {
-            throw new RuntimeException("插入数据库异常user:" + user.toString());
+        Integer confirmUserId = clubTemporary.getConfirmUserId();
+        if (confirmUserId == null) {
+            int insertUserFlag = registerMapper.insertClubUser(user);
+            log.info("插入数据库User表，获得userId:" + user.getUserId());
+            if (insertUserFlag < 1) {
+                throw new RuntimeException("插入数据库异常user:" + user.toString());
+            }
+        } else {
+            user.setUserId(confirmUserId);
+            user.setClubStatus(90);
+            registerMapper.updateClubUser(user);
+            log.info("客服注册机构注册,更新user表userId>>>>>" + confirmUserId);
         }
         /*
             组装机构数据
@@ -584,10 +592,16 @@ public class RegisterServiceImpl implements RegisterService {
             }
             // 主打项目(mainpro)
             club.setMainProduct(clubTemporary.getMainProduct());
-            /*
-                保存数据库（会员机构） club
-             */
-            insertClubFlag = registerMapper.insertUpgradeClub(club);
+            if (confirmUserId == null) {
+                /*
+                    保存数据库（会员机构） club
+                 */
+                insertClubFlag = registerMapper.insertUpgradeClub(club);
+            } else {
+                club.setStatus(90);
+                club.setUserId(confirmUserId);
+                registerMapper.updateClub(club);
+            }
         } else {
             // 机构名称
             club.setName(clubTemporary.getLinkMan());
@@ -595,18 +609,26 @@ public class RegisterServiceImpl implements RegisterService {
             club.setShortName(clubTemporary.getLinkMan());
             // 状态设置上线
             club.setStatus(90);
-            /*
-               保存数据库(普通机构) club
-             */
-            insertClubFlag = registerMapper.insertClub(club);
+            if (confirmUserId == null) {
+                /*
+                   保存数据库(普通机构) club
+                 */
+                insertClubFlag = registerMapper.insertClub(club);
+            } else {
+                club.setStatus(90);
+                club.setUserId(confirmUserId);
+                registerMapper.updateClub(club);
+            }
         }
-        log.info("插入数据库club表，获得clubId:" + club.getClubId());
-        if (insertClubFlag < 1) {
-            throw new RuntimeException("插入数据库异常club:" + club.toString());
+        if (confirmUserId == null) {
+            log.info("插入数据库club表，获得clubId:" + club.getClubId());
+            if (insertClubFlag < 1) {
+                throw new RuntimeException("插入数据库异常club:" + club.toString());
+            }
+            // user更新clubId
+            user.setClubId(club.getClubId());
+            registerMapper.updateUserClubId(user.getUserId(), club.getClubId());
         }
-        // user更新clubId
-        user.setClubId(club.getClubId());
-        registerMapper.updateUserClubId(user.getUserId(), club.getClubId());
         /*
          * 操作成功，推送短信给机构，获取账号密码。
          * 协销去后台审核，机构用账号密码登录绑定微信

src/main/resources/mapper/RegisterMapper.xml

@@ -140,6 +140,7 @@
     <select id="getTemporary" resultType="com.caimei365.user.model.vo.ClubTemporaryVo">
         SELECT
           `userId`,
+          confirmUserId,
           `name`,
           `shortName`,
           `bindMobile`,
@@ -176,4 +177,58 @@
           )
     </insert>
 
+    <update id="updateClubUser">
+        UPDATE
+          user
+        SET
+          bindMobile = #{bindMobile},
+          userPermission = #{userPermission},
+          userIdentity = #{userIdentity},
+          email = #{email},
+          userName = #{userName},
+          source = #{source},
+          password = #{password},
+          registerUserTypeID = #{registerUserTypeId},
+          name = #{name},
+          registerTime = #{registerTime},
+          registerIP = #{registerIP},
+          clubStatus = #{clubStatus},
+          serviceProviderStatus = #{serviceProviderStatus},
+          serviceProviderID = #{serviceProviderId},
+          guideFlag = #{guideFlag}
+        WHERE
+          userID = #{userId}
+    </update>
+
+    <update id="updateClub">
+        UPDATE
+          club
+        SET
+          name = #{name},
+          snam = #{snam},
+          legalPerson = #{legalPerson},
+          provinceID = #{provinceId},
+          cityID = #{cityId},
+          townID = #{townId},
+          spID = #{serviceProviderId},
+          address = #{address},
+          linkMan = #{linkMan},
+          contractPhone = #{contractPhone},
+          contractMobile = #{contractMobile},
+          fax = #{fax},
+          contractEmail1 = #{contractEmail},
+          info = #{info},
+          addTime = #{addTime},
+          status = #{status},
+          businessLicenseImage = #{businessLicense},
+          defaultServiceProviderID = #{serviceProviderId},
+          mainpro = #{mainProduct},
+          headpic = #{shopPhoto},
+          lastModify = NOW(),
+          socialCreditCode = #{socialCreditCode},
+          department = #{department},
+          medicalPracticeLicenseImg = #{medicalPracticeLicense}
+        WHERE
+          userID = #{userId}
+    </update>
 </mapper>