Merge remote-tracking branch 'origin/developerD' into developer

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

@@ -373,4 +373,8 @@ public interface ClubMapper {
     List<CmClubRemarksVo> selRemarksList(CmPortraitDto cmPortrait);
 
     List<BehaviorRecodeVo> selBehaviorPageTypeList(CmPortraitDto cmPortrait);
+
+    String selSpLinkMan(Integer choseServiceId);
+
+    void inProvider(@Param("spId") Integer spId, @Param("clubId") Integer clubId, @Param("operator") String operator, @Param("isOneself") Integer isOneself );
 }

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

@@ -161,4 +161,19 @@ public interface RegisterMapper {
      * @param club
      */
     void updateClub(ClubPo club);
+
+
+    /**
+     * 获取省Id
+     * @param regionPro
+     * @return
+     */
+    Integer selProvince(@Param("regionPro") String regionPro);
+
+    /**
+     * 获取市Id
+     * @param regionCity
+     * @return
+     */
+    Integer selCity(@Param("regionCity") String regionCity);
 }

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

@@ -11,6 +11,7 @@ import java.util.Map;
 @Data
 public class RemarkVo implements Serializable {
     private Integer serviceProviderId;
+    private Integer createServiceProviderId;
     /**
      * 备注id
      */

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

@@ -133,4 +133,8 @@ public class RemarksVo implements Serializable {
      * 报备商品ID
      */
     private Integer productId;
+    /**
+     * 创建记录 协销id
+     */
+    private Integer createServiceProviderId;
 }

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

@@ -50,6 +50,10 @@ public class ReportVo implements Serializable {
     private String questionMan;//咨询人名称
 
     private Integer newDeal;// 新分配机构1.是, 2.否，
+    /**
+     * 创建记录 协销id
+     */
+    private Integer createServiceProviderId;
 
 
 

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

@@ -1035,6 +1035,11 @@ public class ClubServiceImpl implements ClubService {
         if (!spId.equals(choseServiceId)) {
             asyncService.sendChoseServiceMessage(1, clubId, spId, choseServiceId);
         }
+        // 添加协销更换记录
+        String linkMan = clubMapper.selSpLinkMan(choseServiceId);
+        if (StringUtils.isNotBlank(linkMan)) {
+            clubMapper.inProvider(spId, clubId, linkMan, 3);
+        }
         return ResponseJson.success();
     }
 
@@ -1101,6 +1106,7 @@ public class ClubServiceImpl implements ClubService {
             remarkVo.setLeaderName(remarksVo.getLeaderName());
             remarkVo.setRecordName(remarksVo.getRecordName());
             remarkVo.setServiceProviderId(remarksVo.getServiceProviderId());
+            remarkVo.setCreateServiceProviderId(remarksVo.getCreateServiceProviderId());
             remarkVo.setRemarks(strings);
             remarkVo.setQuestionMan(remarksVo.getQuestionMan());
             remarkVo.setRemarksId(remarksVo.getRemarksId());
@@ -1343,6 +1349,7 @@ public class ClubServiceImpl implements ClubService {
             remarkVo.setLeaderName(r.getLeaderName());
             remarkVo.setRecordName(r.getRecordName());
             remarkVo.setServiceProviderId(r.getServiceProviderId());
+            remarkVo.setCreateServiceProviderId(r.getCreateServiceProviderId());
             remarkVo.setRemarks(strings);
             remarkVo.setQuestionMan(r.getQuestionMan());
             remarkVo.setRemarksId(r.getRemarksId());

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

@@ -63,6 +63,8 @@ public class RegisterServiceImpl implements RegisterService {
     private RemoteCallService remoteCallService;
     @Resource
     private WeChatService weChatService;
+    @Resource
+    private ClubMapper clubMapper;
 
     /**
      * 检查账号可以注册
@@ -138,8 +140,18 @@ public class RegisterServiceImpl implements RegisterService {
         }
         // 获取ip所在地
         String ipAddress = "";
+        Integer provinceId = null;
+        Integer cityId = null;
         try {
             ipAddress = IpUtil.recordIp(ip);
+            Map<String, String> map = IpUtil.recordAddress(ip);
+            // 省
+            String regionPro = map.get("regionPro");
+            provinceId = registerMapper.selProvince(regionPro);
+            // 市
+            String regionCity = map.get("regionCity");
+            cityId = registerMapper.selCity(regionCity);
+
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -223,6 +235,14 @@ public class RegisterServiceImpl implements RegisterService {
         club.setAddTime(current);
         // 状态设置上线
         club.setStatus(90);
+        if (4 == user.getUserIdentity()) {
+            if (null != provinceId) {
+                club.setProvinceId(provinceId);
+            }
+            if (null != cityId) {
+                club.setCityId(cityId);
+            }
+        }
         /*
             保存数据库 club
          */
@@ -234,6 +254,10 @@ public class RegisterServiceImpl implements RegisterService {
         // user更新clubId
         user.setClubId(club.getClubId());
         registerMapper.updateUserClubId(user.getUserId(), club.getClubId());
+        // 添加机构协销记录
+        if (StringUtils.isNotBlank(club.getLinkMan())) {
+            clubMapper.inProvider(1342, club.getClubId(), club.getLinkMan(), 0);
+        }
         //推送信息中心-账户通知
         MessageCenter messageCenter = new MessageCenter();
         messageCenter.setShopId(null);
@@ -534,8 +558,18 @@ public class RegisterServiceImpl implements RegisterService {
         String current = dateFormat.format(new Date());
         // 获取ip所在地
         String ipAddress = "";
+        Integer provinceId = null;
+        Integer cityId = null;
         try {
             ipAddress = IpUtil.recordIp(ip);
+            // 获取省市地址
+            Map<String, String> map = IpUtil.recordAddress(ip);
+            // 省
+            String regionPro = map.get("regionPro");
+            provinceId = registerMapper.selProvince(regionPro);
+            // 市
+            String regionCity = map.get("regionCity");
+            cityId = registerMapper.selCity(regionCity);
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -680,6 +714,10 @@ public class RegisterServiceImpl implements RegisterService {
             club.setShortName(clubTemporary.getLinkMan());
             // 状态设置上线
             club.setStatus(90);
+            if (4 == user.getUserIdentity()) {
+                club.setProvinceId(provinceId);
+                club.setCityId(cityId);
+            }
             if (confirmUserId == null) {
                 /*
                    保存数据库(普通机构) club
@@ -700,6 +738,10 @@ public class RegisterServiceImpl implements RegisterService {
             user.setClubId(club.getClubId());
             registerMapper.updateUserClubId(user.getUserId(), club.getClubId());
         }
+        // 添加机构协销记录
+        if (StringUtils.isNotBlank(club.getLinkMan())) {
+            clubMapper.inProvider(serviceProvider.getServiceProviderId(), club.getClubId(), club.getLinkMan(), 1);
+        }
         //推送信息中心-账户通知
         MessageCenter messageCenter=new MessageCenter();
         messageCenter.setShopId(null);

src/main/java/com/caimei365/user/utils/IpUtil.java

@@ -8,6 +8,8 @@ import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Description
@@ -56,4 +58,51 @@ public class IpUtil {
         return region;
     }
 
+
+    // 获取IP对应地址 省、市 ---- 太平洋
+    public static Map<String, String> recordAddress(String ip) throws IOException {
+        URL url = null;
+        HttpURLConnection connection = null;
+        String encoding = "gbk";
+        String text = "";
+        String line = "";
+        String regionPro = "";
+        String regionCity = "";
+        Map<String,String> map = new HashMap<>();
+        String urlStr = "http://whois.pconline.com.cn/ipJson.jsp?ip=" + ip + "&json=true";
+        try {
+            url = new URL(urlStr);
+            connection = (HttpURLConnection) url.openConnection();    //新建链接实例
+            connection.setConnectTimeout(20000);    //设置链接超时时间，单位毫秒
+            connection.setReadTimeout(20000);        //设置读取数据超时时间，单位毫秒
+            connection.setDoOutput(true);        //是否打开输出流true|false
+            connection.setDoInput(true);        //是否打开输入流true|false
+            connection.setRequestMethod("GET");        // 提交方式get|post
+            connection.setUseCaches(false);        // 是否加入缓存true|false
+            connection.connect();    //打开链接端口
+
+            BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), encoding));    // 往对端写完数据对端服务器返回数据。以BufferedReader流来读取
+
+            while ((line = reader.readLine()) != null) {
+                text += line + "\n";
+            }
+            reader.close();
+
+            JSONObject jsonObject = JSONObject.parseObject(text);
+            // 省份
+            regionPro = jsonObject.get("pro").toString();
+            map.put("regionPro", regionPro);
+            // 市区
+            regionCity = jsonObject.get("city").toString();
+            map.put("regionCity", regionCity);
+
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        } finally {
+            if (connection != null) {
+                connection.disconnect();    //关闭连接
+            }
+        }
+        return map;
+    }
 }

src/main/resources/mapper/ClubMapper.xml

@@ -4,9 +4,9 @@
     <insert id="insertRemarks" parameterType="com.caimei365.user.model.po.ClubRemarksPo" keyProperty="remarksId"
             useGeneratedKeys="true">
         insert into cm_club_remarks(clubId, serviceProviderId, remarks, addTime, questionMan, consultType, clubType,
-                                    pinceSensitve, satisfied, followup, extra, productID, reportID)
+                                    pinceSensitve, satisfied, followup, extra, createServiceProviderId, productID, reportID)
         values (#{clubId}, #{serviceProviderId}, #{remarks}, now(), #{questionMan}, #{consult}, #{clubType},
-                #{pinceSensitve}, #{satisfied}, #{followup}, #{extra}, #{productID}, #{reportID})
+                #{pinceSensitve}, #{satisfied}, #{followup}, #{extra}, #{serviceProviderId}, #{productID}, #{reportID})
     </insert>
     <insert id="insertRemarksImage">
         insert into cm_club_remarks_file(remarksId, fileType, imageUrl)
@@ -42,9 +42,9 @@
     <insert id="concactVisit" parameterType="com.caimei365.user.model.vo.RemarksVo" keyProperty="remarksId"
             useGeneratedKeys="true">
         insert into cm_club_remarks(clubId, serviceProviderId, remarks, addTime, questionMan, concactTime, consultType,
-                                    clubType, pinceSensitve, satisfied, followup, extra, productID, reportID)
+                                    clubType, pinceSensitve, satisfied, followup, extra, createServiceProviderId, productID, reportID)
         values (#{clubId}, #{serviceProviderId}, #{remarks}, #{addTime}, #{questionMan}, now(), #{consult}, #{clubType},
-                #{pinceSensitve}, #{satisfied}, #{followup}, #{extra}, #{productId}, #{reportId})
+                #{pinceSensitve}, #{satisfied}, #{followup}, #{extra},#{serviceProviderId}, #{productId}, #{reportId})
     </insert>
     <insert id="insertChangeRecord" parameterType="com.caimei365.user.model.vo.ClubChangeSpVo"
             keyProperty="clubChangeSpRecordID"
@@ -619,26 +619,26 @@
     <select id="getRemarksListByKey" resultType="com.caimei365.user.model.vo.RemarksVo">
 
         SELECT DISTINCT
-        ccr.id AS remarksId, ccr.remarks,ccr.addTime,ccr.questionMan,ccr.serviceProviderId as serviceProviderId,
+        ccr.id AS remarksId, ccr.remarks,ccr.addTime,ccr.questionMan,ccr.serviceProviderId as serviceProviderId, ccr.createServiceProviderId as createServiceProviderId,
         csr.leaderId AS leaderId,IFNULL(ccr.consultType,'') as consult, c.Name as clubName,
-        ccr.clubType AS clubType,ccr.pinceSensitve AS pinceSensitve,ccr.satisfied AS satisfied,ccr.followup AS
-        followup,ccr.extra AS extra,
+        ccr.clubType AS clubType,ccr.pinceSensitve AS pinceSensitve,ccr.satisfied AS satisfied,ccr.followup AS followup,ccr.extra AS extra,
         (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID= csr.leaderId) AS leaderName,
-        (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderID) AS
-        recordName,c.newDeal as newDeal,cmc.status as status
+        (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.createServiceProviderId) as recordName,c.newDeal as newDeal,cmc.status as status
         # (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.oldserviceProviderId) AS oldName
         FROM cm_club_remarks ccr
         LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID
         LEFT JOIN club c ON c.clubId=ccr.clubId
-        LEFT JOIN cm_serviceTeam_group csg ON ccr.serviceProviderId = csg.serviceId
+        LEFT JOIN cm_serviceTeam_group csg ON ccr.createServiceProviderId = csg.serviceId
         LEFT JOIN cm_serviceTeam_role csr ON csr.id = csg.teamId
         LEFT JOIN cm_club_report cmc ON cmc.ID = ccr.reportID
-        where ccr.serviceProviderId=#{serviceProviderId}
+        where
+              (ccr.serviceProviderId=#{serviceProviderId} or ccr.createServiceProviderId=#{serviceProviderId})
 
         <if test="keyWord != null and keyWord != ''">
             AND (ccr.remarks LIKE CONCAT('%', #{keyWord}, '%')
             OR c.Name LIKE CONCAT('%', #{keyWord}, '%')
-            OR ccr.questionMan LIKE CONCAT('%', #{keyWord}, '%'))
+            OR ccr.questionMan LIKE CONCAT('%', #{keyWord}, '%')
+            or c.contractMobile like concat('%', #{keyWord}, '%'))
         </if>
         <if test="leaderId != null and leaderId>0">
             and csr.leaderId = #{leaderId}
@@ -775,25 +775,24 @@
     </select>
     <select id="findAllRemarks" resultType="com.caimei365.user.model.vo.RemarksVo">
         SELECT DISTINCT
-        ccr.id AS remarksId, ccr.remarks,ccr.addTime,ccr.questionMan,ccr.serviceProviderId as serviceProviderId,
+        ccr.id AS remarksId, ccr.remarks,ccr.addTime,ccr.questionMan,ccr.serviceProviderId as serviceProviderId, ccr.createServiceProviderId as createServiceProviderId,
         csr.leaderId AS leaderId,IFNULL(ccr.consultType,'') as consult, c.Name as clubName,
-        ccr.clubType AS clubType,ccr.pinceSensitve AS pinceSensitve,ccr.satisfied AS satisfied,ccr.followup AS
-        followup,ccr.extra AS extra,
+        ccr.clubType AS clubType,ccr.pinceSensitve AS pinceSensitve,ccr.satisfied AS satisfied,ccr.followup AS followup,ccr.extra AS extra,
         (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID= csr.leaderId) AS leaderName,
-        (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderID) AS
-        recordName,c.newDeal as newDeal,cmc.status as status
+        (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.createServiceProviderId) AS recordName,c.newDeal as newDeal,cmc.status as status
         # (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.oldserviceProviderId) AS oldName
         FROM cm_club_remarks ccr
         LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID
         LEFT JOIN club c ON c.clubId=ccr.clubId
-        LEFT JOIN cm_serviceTeam_group csg ON ccr.serviceProviderId = csg.serviceId
+        LEFT JOIN cm_serviceTeam_group csg ON ccr.createServiceProviderId = csg.serviceId
         LEFT JOIN cm_serviceTeam_role csr ON csr.id = csg.teamId
         LEFT JOIN cm_club_report cmc ON cmc.clubId = ccr.clubId
         <where>
             <if test="keyWord != null and keyWord !=''">
                 AND (ccr.remarks LIKE concat('%',#{keyWord},'%')
                 or ccr.questionMan LIKE CONCAT('%', #{keyWord}, '%')
-                or c.Name LIKE CONCAT('%', #{keyWord}, '%'))
+                or c.Name LIKE CONCAT('%', #{keyWord}, '%')
+                or c.contractMobile like concat('%', #{keyWord}, '%'))
             </if>
             <if test="leaderId != null and leaderId>0">
                 and csr.leaderId = #{leaderId}
@@ -1155,4 +1154,11 @@
         where cqi.userId = #{userId}
           and cqi.delFlag = 0
     </select>
+    <select id="selSpLinkMan" resultType="java.lang.String">
+        SELECT linkMan FROM serviceprovider WHERE serviceProviderID = #{choseServiceId}
+    </select>
+    <insert id="inProvider">
+        insert into cm_provider_record (spId, clubId, operator, isOneself, createTime)
+        values (#{spId}, #{clubId}, #{operator}, #{isOneself}, now())
+    </insert>
 </mapper>

src/main/resources/mapper/ClubReport.xml

@@ -3,13 +3,13 @@
 <mapper namespace="com.caimei365.user.mapper.ClubReportMapper">
 
     <insert id="addClubReport">
-        INSERT INTO cm_club_report (serviceProviderID, clubID, productID, reportName, reportText, addTime)
-        VALUES (#{serviceProviderId}, #{clubId}, #{productId}, #{reportName}, #{reportText}, now())
+        INSERT INTO cm_club_report (serviceProviderID, clubID, productID, reportName, reportText, addTime, createServiceProviderId)
+        VALUES (#{serviceProviderId}, #{clubId}, #{productId}, #{reportName}, #{reportText}, now(), #{serviceProviderId})
     </insert>
 
     <insert id="addVisitorReport">
-        INSERT INTO cm_club_report (serviceProviderID, questionManId, productID, reportName, reportText, addTime)
-        VALUES (#{serviceProviderId}, #{questionManId}, #{productId}, #{reportName}, #{reportText}, now())
+        INSERT INTO cm_club_report (serviceProviderID, questionManId, productID, reportName, reportText, addTime, createServiceProviderId)
+        VALUES (#{serviceProviderId}, #{questionManId}, #{productId}, #{reportName}, #{reportText}, now(), #{serviceProviderId})
     </insert>
 
 
@@ -101,14 +101,15 @@
 
     <select id="reportRemarks" resultType="com.caimei365.user.model.vo.ReportVo">
         SELECT DISTINCT
-        cmc.id AS reportId ,cmc.productID AS productId,ccr.serviceProviderID AS serviceProviderId,  c.name AS clubName,c.`newDeal` AS newDeal,cmc.reportName AS
-        reportName,cmc.`addTime` AS ADDTIME,p.`mainImage` AS mainImage,p.name AS productName,cmc.`reportText` AS
+        cmc.id AS reportId ,cmc.productID AS productId,ccr.serviceProviderID AS serviceProviderId, cmc.createServiceProviderId as createServiceProviderId,
+        c.name AS clubName,c.`newDeal` AS newDeal, cmc.reportName AS reportName,cmc.`addTime` AS ADDTIME,
+        p.`mainImage` AS mainImage,p.name AS productName,cmc.`reportText` AS
         reportText,cmc.status AS STATUS,cmc.`auditText` AS auditText,ccr.questionMan AS questionMan
         FROM cm_club_report cmc
         LEFT JOIN club c ON c.clubId=cmc.clubId
         LEFT JOIN cm_club_remarks ccr ON cmc.Id = ccr.reportId
         LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID
-        LEFT JOIN cm_serviceTeam_group csg ON ccr.serviceProviderId = csg.serviceId
+        LEFT JOIN cm_serviceTeam_group csg ON ccr.createServiceProviderId = csg.serviceId
         LEFT JOIN cm_serviceTeam_role csr ON csr.id = csg.teamId
         LEFT JOIN product p ON p.productID = cmc.productID
         <where>
@@ -129,14 +130,15 @@
 
     <select id="repotRemark" resultType="com.caimei365.user.model.vo.ReportVo">
         SELECT DISTINCT
-        cmc.id AS reportId ,cmc.productID AS productId,ccr.serviceProviderID AS serviceProviderId,  c.name AS clubName,c.`newDeal` AS newDeal,cmc.reportName AS
-        reportName,cmc.`addTime` AS ADDTIME,p.`mainImage` AS mainImage,p.name AS productName,cmc.`reportText` AS
+        cmc.id AS reportId ,cmc.productID AS productId,ccr.serviceProviderID AS serviceProviderId, cmc.createServiceProviderId as createServiceProviderId,
+        c.name AS clubName,c.`newDeal` AS newDeal,cmc.reportName AS reportName,cmc.`addTime` AS ADDTIME,
+        p.`mainImage` AS mainImage,p.name AS productName,cmc.`reportText` AS
         reportText,cmc.status AS STATUS,cmc.`auditText` AS auditText,ccr.questionMan AS questionMan
         FROM cm_club_report cmc
         LEFT JOIN club c ON c.clubId=cmc.clubId
         LEFT JOIN cm_club_remarks ccr ON cmc.Id = ccr.reportId
         LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID
-        LEFT JOIN cm_serviceTeam_group csg ON ccr.serviceProviderId = csg.serviceId
+        LEFT JOIN cm_serviceTeam_group csg ON ccr.createServiceProviderId = csg.serviceId
         LEFT JOIN cm_serviceTeam_role csr ON csr.id = csg.teamId
         LEFT JOIN product p ON p.productID = cmc.productID
         where
@@ -219,18 +221,17 @@
 
     <select id="associated" resultType="com.caimei365.user.model.vo.RemarksVo">
         SELECT DISTINCT
-        ccr.id AS remarksId, ccr.remarks,ccr.addTime,ccr.serviceProviderId AS serviceProviderId,
+        ccr.id AS remarksId, ccr.remarks,ccr.addTime,ccr.serviceProviderId AS serviceProviderId, ccr.createServiceProviderId as createServiceProviderId,
         csr.leaderId AS leaderId,IFNULL(ccr.consultType,'') AS consult, c.Name AS clubName,
-        ccr.clubType AS clubType,ccr.pinceSensitve AS pinceSensitve,ccr.satisfied AS satisfied,ccr.followup AS
-        followup,ccr.extra AS extra,
+        ccr.clubType AS clubType,ccr.pinceSensitve AS pinceSensitve,ccr.satisfied AS satisfied,ccr.followup AS followup,ccr.extra AS extra,
         (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID= csr.leaderId) AS leaderName,
-        (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderID) AS
-        recordName,c.newDeal AS newDeal,cmc.status AS status,cmc.`auditText` as auditText
+        (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.createServiceProviderId) AS recordName,
+        c.newDeal AS newDeal,cmc.status AS status,cmc.`auditText` as auditText
         # (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.oldserviceProviderId) AS oldName
         FROM cm_club_remarks ccr
         LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID
         LEFT JOIN club c ON c.clubId=ccr.clubId
-        LEFT JOIN cm_serviceTeam_group csg ON ccr.serviceProviderId = csg.serviceId
+        LEFT JOIN cm_serviceTeam_group csg ON ccr.createServiceProviderId = csg.serviceId
         LEFT JOIN cm_serviceTeam_role csr ON csr.id = csg.teamId
         LEFT JOIN cm_club_report cmc ON cmc.Id = ccr.reportID
         <where>

src/main/resources/mapper/RegisterMapper.xml

@@ -14,8 +14,8 @@
             values(#{userID},"新增用户","一般挽留客户",0,1)
     </insert>
     <insert id="insertClub" parameterType="com.caimei365.user.model.po.ClubPo" keyProperty="clubId" useGeneratedKeys="true">
-        insert into club(`name`, `sname`, `contractMobile`, `linkMan`, `userID`, `addTime`, `status`, `spID`, `scanFlag`)
-                  values(#{name},#{shortName},#{contractMobile},#{linkMan},#{userId},#{addTime},#{status},#{serviceProviderId},#{scanFlag})
+        insert into club(`name`, `sname`, `contractMobile`, `linkMan`, `userID`, `addTime`, `status`, `spID`, `scanFlag`, provinceID, cityID)
+                  values(#{name},#{shortName},#{contractMobile},#{linkMan},#{userId},#{addTime},#{status},#{serviceProviderId},#{scanFlag},#{provinceId},#{cityId})
     </insert>
     <insert id="insertUpgradeClub" parameterType="com.caimei365.user.model.po.ClubPo" keyProperty="clubId" useGeneratedKeys="true">
         insert into club(`name`, `sname`,     `contractMobile`, `userID`, `addTime`, `status`, `spID`,              `scanFlag`,`contractEmail`,`linkMan`, `provinceID`, `cityID`,`townID`, `address`, `headpic`, `businessLicenseImage`,`socialCreditCode`,`firstClubType`,`secondClubType`,`department`,`medicalPracticeLicenseImg`,`mainpro`)
@@ -242,4 +242,10 @@
         WHERE
           userID = #{userId}
     </update>
+    <select id="selProvince" resultType="java.lang.Integer">
+        SELECT provinceID as provinceId FROM province WHERE NAME LIKE concat('%', #{regionPro} ,'%') limit 1
+    </select>
+    <select id="selCity" resultType="java.lang.Integer">
+        SELECT cityID as cityId FROM city WHERE NAME LIKE concat('%', #{regionCity} ,'%') AND validFlag = 1 limit 1
+    </select>
 </mapper>

src/main/resources/mapper/SuperVipMapper.xml

@@ -140,6 +140,8 @@
         AND cc.status != 2
         AND cs.delFlag = 0
         AND cmn.status != 2
+        AND cmn.delFlag = 0
+        AND cc.vipFlag = 1
         AND NOW() BETWEEN cc.startdate AND cc.enddate
         ORDER BY cc.startDate DESC
     </select>