超级会员套餐优化，机构升级、协销拉机构上线调整

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

@@ -45,6 +45,11 @@ public class ClubOnlineDto implements Serializable {
      */
     @ApiModelProperty("联系人")
     private String linkMan;
+    /**
+     * 联系人身份：1老板，2采购，3运营，4其他
+     */
+    @ApiModelProperty("联系人身份")
+    private String linkManIdentity;
     /**
      * 省
      */

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

@@ -50,6 +50,10 @@ public class ClubUpdateDto implements Serializable {
      */
     @ApiModelProperty("联系人")
     private String linkMan;
+    /**
+     * 联系人身份：1老板，2采购，3运营，4其他
+     */
+    private Integer linkManIdentity;
     /**
      * 省
      */

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

@@ -50,6 +50,11 @@ public class ClubUpgradeDto implements Serializable {
      */
     @ApiModelProperty("联系人")
     private String linkMan;
+    /**
+     * 联系人身份
+     */
+    @ApiModelProperty("联系人身份：1老板，2采购，3运营，4其他")
+    private Integer linkManIdentity;
     /**
      * 省
      */

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

@@ -45,6 +45,10 @@ public class ClubPo implements Serializable {
      * 联系人
      */
     private String linkMan;
+    /**
+     * 联系人身份：1老板，2采购，3运营，4其他
+     */
+    private Integer linkManIdentity;
     /**
      * 省
      */

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

@@ -72,6 +72,10 @@ public class ClubVo implements Serializable {
      * 联系人
      */
     private String linkMan;
+    /**
+     * 联系人身份：1老板，2采购，3运营，4其他
+     */
+    private Integer linkManIdentity;
     /**
      * 省
      */

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

@@ -414,6 +414,8 @@ public class RegisterServiceImpl implements RegisterService {
         club.setContractPhone(upgradeDto.getContractPhone());
         // 联系人
         club.setLinkMan(upgradeDto.getLinkMan());
+        // 联系人身份
+        club.setLinkManIdentity(upgradeDto.getLinkManIdentity());
         // 地址
         club.setProvinceId(upgradeDto.getProvinceId());
         club.setCityId(upgradeDto.getCityId());

src/main/resources/mapper/ClubMapper.xml

@@ -89,6 +89,9 @@
         <if test="linkMan != null and linkMan != ''">
             linkMan = #{linkMan},
         </if>
+        <if test="linkManIdentity != null and linkManIdentity != ''">
+            linkManIdentity = #{linkManIdentity},
+        </if>
         <if test="townId != null and townId != ''">
             provinceID = #{provinceId}, cityID = #{cityId}, townID = #{townId}, address = #{address},
         </if>
@@ -150,6 +153,7 @@
                contractEmail,
                contractPhone,
                linkMan,
+               linkManIdentity,
                provinceID                as proviceId,
                cityID                    as cityId,
                townID                    as townId,
@@ -333,7 +337,7 @@
             OR (cc.couponType = 2 AND a.userId = #{userId})
             OR ((SELECT registerTime FROM user WHERE userID = #{userId}) <![CDATA[ >= ]]> startDate AND couponType = 4))
           and NOW() <![CDATA[ > ]]> startDate
-          and NOW() <![CDATA[ < ]]> if(receiveFlag = 1, endDate,
+          and NOW() <![CDATA[ < ]]> if(receiveFlag = 1 OR vipFlag = 1, endDate,
                          date_add(if((SELECT registerTime FROM user WHERE userID = #{userId}) <![CDATA[ > ]]> startDate and
                                      (SELECT registerTime FROM user WHERE userID = #{userId}) <![CDATA[ < ]]> endDate,
                                      (SELECT registerTime FROM user WHERE userID = #{userId}), startDate),

src/main/resources/mapper/RegisterMapper.xml

@@ -61,6 +61,9 @@
             <if test="linkMan != null and linkMan != ''">
                 linkMan = #{linkMan},
             </if>
+            <if test="linkManIdentity != null and linkManIdentity != ''">
+                linkManIdentity = #{linkManIdentity},
+            </if>
             provinceID = #{provinceId}, cityID = #{cityId}, townID = #{townId}, address = #{address},
             <if test="shopPhoto != null  and shopPhoto != 'null'  and shopPhoto != ''">
                 headpic = #{shopPhoto},
@@ -126,7 +129,7 @@
     <insert id="insertClubTemporary" useGeneratedKeys="true" keyProperty="userId" keyColumn="id" parameterType="com.caimei365.user.model.dto.ClubOnlineDto">
         INSERT INTO `club_temporary` (
           `userId`, `name`, `shortName`, `bindMobile`,
-          `contractEmail`, `linkMan`, `provinceId`,
+          `contractEmail`, `linkMan`, `linkManIdentity`, `provinceId`,
           `cityId`, `townId`, `address`, `shopPhoto`,
           `businessLicense`, `socialCreditCode`,
           `firstClubType`, `secondClubType`,
@@ -136,7 +139,7 @@
         VALUES
           (
             #{userId}, #{name}, #{shortName}, #{bindMobile},
-            #{contractEmail}, #{linkMan}, #{provinceId},
+            #{contractEmail}, #{linkMan}, #{linkManIdentity}, #{provinceId},
             #{cityId}, #{townId}, #{address}, #{shopPhoto},
             #{businessLicense}, #{socialCreditCode},
             #{firstClubType}, #{secondClubType},