CRM系统升级优化

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

@@ -378,4 +378,6 @@ public interface ClubMapper {
     String selSpLinkMan(Integer choseServiceId);
 
     void inProvider(@Param("spId") Integer spId, @Param("clubId") Integer clubId, @Param("operator") String operator, @Param("isOneself") Integer isOneself );
+
+    Integer getSpIdRAND();
 }

src/main/java/com/caimei365/user/model/dto/ClubRegisterDto.java

@@ -61,6 +61,13 @@ public class ClubRegisterDto implements Serializable {
     @NotNull
     @ApiModelProperty("是否同意勾选同意协议，1是，其他否")
     private Integer isAgreed;
+
+    @NotNull
+    @ApiModelProperty("是否接受匹配客户经理，1是，其他否")
+    private Integer isSp;
+
+    @ApiModelProperty("协销ID")
+    private Integer spId;
     /**
      * 微信unionId
      */
@@ -76,4 +83,5 @@ public class ClubRegisterDto implements Serializable {
      */
     @ApiModelProperty("微信头像(headimgurl)")
     private String avatarUrl;
+
 }

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

@@ -154,6 +154,11 @@ public class RegisterServiceImpl implements RegisterService {
         if (passResult != null) {
             return ResponseJson.error(passResult);
         }
+        // 协销Id，默认采美官方
+        Integer spId =1342;
+        if (null !=clubRegisterDto.getIsSp()&&1 ==clubRegisterDto.getIsSp()) {
+            spId =null!= clubRegisterDto.getSpId()?clubRegisterDto.getSpId():clubMapper.getSpIdRAND();
+        }
         // 获取ip所在地
         String ipAddress = "";
         Integer provinceId = null;
@@ -212,7 +217,7 @@ public class RegisterServiceImpl implements RegisterService {
         // 用户状态，1正常，0冻结
         user.setValidFlag(1);
         // 协销Id，默认采美官方
-        user.setServiceProviderId(1342);
+        user.setServiceProviderId(spId);
         // 协销状态，已上线
         user.setServiceProviderStatus(90);
         //采美豆
@@ -246,7 +251,7 @@ public class RegisterServiceImpl implements RegisterService {
         // 用户Id
         club.setUserId(user.getUserId());
         // 协销Id(spId)
-        club.setServiceProviderId(1342);
+        club.setServiceProviderId(spId);
         // 注册时间
         club.setAddTime(current);
         // 状态设置上线
@@ -272,7 +277,7 @@ public class RegisterServiceImpl implements RegisterService {
         registerMapper.updateUserClubId(user.getUserId(), club.getClubId());
         // 添加机构协销记录
         if (StringUtils.isNotBlank(club.getLinkMan())) {
-            clubMapper.inProvider(1342, club.getClubId(), club.getLinkMan(), 0);
+            clubMapper.inProvider(spId, club.getClubId(), spId!=1342?"系统自动分配":club.getLinkMan(), 0);
         }
         //推送信息中心-账户通知
         MessageCenter messageCenter = new MessageCenter();

src/main/resources/mapper/ClubMapper.xml

@@ -1135,6 +1135,14 @@
     <select id="selSpLinkMan" resultType="java.lang.String">
         SELECT linkMan FROM serviceprovider WHERE serviceProviderID = #{choseServiceId}
     </select>
+    <select id="getSpIdRAND" resultType="java.lang.Integer">
+        SELECT sp.serviceProviderID FROM serviceprovider sp
+        WHERE sp.organizeID = 0
+          and sp.status=90
+          and sp.serviceProviderID != 1342 and linkMan not LIKE '%测试%'
+        ORDER BY RAND()
+        LIMIT 0,1;
+    </select>
     <insert id="inProvider">
         insert into cm_provider_record (spId, clubId, operator, isOneself, createTime)
         values (#{spId}, #{clubId}, #{operator}, #{isOneself}, now())