超级会员专属优惠券配置

src/main/java/com/caimei/modules/coupon/service/CmVipCouponService.java

@@ -100,6 +100,17 @@ public class CmVipCouponService extends CrudService<CmCouponVipDao, CmVipCoupon>
                 SimpleDateFormat df = new SimpleDateFormat("yyyy-MM");
                 String current = df.format(new Date());
                 String useTime = vipCoupon.getUseTime();
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM");
+                try {
+                    Date parse = simpleDateFormat.parse(vipCoupon.getUseTime());
+                    Calendar calendar = Calendar.getInstance();
+                    calendar.setTime(parse);
+                    calendar.add(Calendar.MONTH,2);
+                    Date time = calendar.getTime();
+                    vipCoupon.setEndTime(simpleDateFormat.format(time));
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
                 String endTime = vipCoupon.getEndTime();
                 // 0未生效 1已生效 2已关闭 3已失效
                 if (df.parse(useTime).after(df.parse(current))) {

src/main/java/com/caimei/modules/user/entity/ClubTemporary.java

@@ -22,6 +22,7 @@ public class ClubTemporary extends DataEntity<ClubTemporary> {
     private String bindMobile;        // 企业绑定手机号
     private String contractEmail;        // 联系邮箱
     private String linkMan;        // 联系人
+    private String linkManIdentity;        // 联系人
     private Integer provinceId;        // 省id
     private Integer cityId;        // 市id
     private Integer townId;        // 地址Id
@@ -124,6 +125,14 @@ public class ClubTemporary extends DataEntity<ClubTemporary> {
         this.linkMan = linkMan;
     }
 
+    public String getLinkManIdentity() {
+        return linkManIdentity;
+    }
+
+    public void setLinkManIdentity(String linkManIdentity) {
+        this.linkManIdentity = linkManIdentity;
+    }
+
     public Integer getProvinceId() {
         return provinceId;
     }
@@ -299,4 +308,4 @@ public class ClubTemporary extends DataEntity<ClubTemporary> {
     public void setImages(String[] images) {
         this.images = images;
     }
-}
+}

src/main/java/com/caimei/modules/user/entity/CmUser.java

@@ -861,4 +861,4 @@ public class CmUser extends DataEntity<CmUser> {
     public void setStoreStatus(boolean storeStatus) {
         this.storeStatus = storeStatus;
     }
-}
+}

src/main/java/com/caimei/modules/user/service/ClubTemporaryService.java

@@ -129,6 +129,10 @@ public class ClubTemporaryService extends CrudService<ClubTemporaryDao, ClubTemp
             club.setContractMobile(clubTemporary.getBindMobile());
             // 联系人
             club.setLinkMan(clubTemporary.getLinkMan());
+            // 联系人身份
+            if (StringUtils.isNotBlank(clubTemporary.getLinkManIdentity())) {
+                club.setLinkManIdentity(Integer.parseInt(clubTemporary.getLinkManIdentity()));
+            }
             // 用户Id
             club.setUserID(user.getUserID());
             // 设置协销ID

src/main/java/com/caimei/modules/user/service/CmBehaviorRecordService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.caimei.modules.user.dao.CmBehaviorRecordDao;
 import com.caimei.modules.user.entity.CmBehaviorRecord;
 import com.caimei.utils.AppUtils;
+import com.caimei.utils.StringUtils;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.service.CrudService;
 import okhttp3.OkHttpClient;
@@ -152,22 +153,23 @@ public class CmBehaviorRecordService extends CrudService<CmBehaviorRecordDao, Cm
         cmBehaviorRecord.setPage(page);
 
         // 机构用户行为详情
-        List<CmBehaviorRecord> behaviorAgencyList = cmBehaviorRecordDao.behaviorAgency(cmBehaviorRecord);
-
-        for (CmBehaviorRecord record: behaviorAgencyList) {
-            record.setProductImage(AppUtils.getImageURL("product", record.getProductImage(), 0, ""));
-            String time = calculationTime(record.getAccessDuration());
-            record.setAccessDuration(time);
-            String decode = null;
-            try {
-                decode = URLDecoder.decode(record.getPagePath(),"UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                e.printStackTrace();
+        if (StringUtils.isNotBlank(cmBehaviorRecord.getIP())) {
+            List<CmBehaviorRecord> behaviorAgencyList = cmBehaviorRecordDao.behaviorAgency(cmBehaviorRecord);
+
+            for (CmBehaviorRecord record : behaviorAgencyList) {
+                record.setProductImage(AppUtils.getImageURL("product", record.getProductImage(), 0, ""));
+                String time = calculationTime(record.getAccessDuration());
+                record.setAccessDuration(time);
+                String decode = null;
+                try {
+                    decode = URLDecoder.decode(record.getPagePath(), "UTF-8");
+                } catch (UnsupportedEncodingException e) {
+                    e.printStackTrace();
+                }
+                record.setPagePath(decode);
             }
-            record.setPagePath(decode);
+            page.setList(behaviorAgencyList);
         }
-
-        page.setList(behaviorAgencyList);
         return page;
     }
 

src/main/java/com/caimei/modules/user/web/newUser/AgencyController.java

@@ -1245,23 +1245,25 @@ private VisitRemarkDao visitRemarkDao;
             }
         }
         Page<CmBehaviorRecord> page = cmBehaviorRecordService.behaviorAgencyPage(new Page<>(request, response), record);
+        String masBehavior = "";
         List<CmBehaviorRecord> list = page.getList();
         for (int i = 0; i <= list.size()-1; i++) {
-            describe += list.get(i).getPageLabel();
+            masBehavior += list.get(i).getPageLabel();
             if (list.size()-1 != i) {
-                describe += ",";
+                masBehavior += ",";
             }
         }
         model.addAttribute("page",page);
         model.addAttribute("link",link);
         model.addAttribute("linkage",linkage);
         model.addAttribute("describe",describe);
+        model.addAttribute("masBehavior",masBehavior);
         model.addAttribute("clubId", clubId);
         return "modules/userNew/recordLinkageForm";
     }
 
     @RequestMapping("recordLinkageSave")
-    public String RecordLinkageSave(String describe,String link,Integer clubId,HttpServletRequest request, HttpServletResponse response, Model model,RedirectAttributes redirectAttributes) {
+    public String RecordLinkageSave(String describe,String masBehavior,String link,Integer clubId,HttpServletRequest request, HttpServletResponse response, Model model,RedirectAttributes redirectAttributes) {
         model.addAttribute("clubId", clubId);
 
         if(domain.contains("-b")){
@@ -1272,7 +1274,11 @@ private VisitRemarkDao visitRemarkDao;
             link="http://localhost:8081/clubinfo.html?clubId="+clubId;
         }
 //        StringSelection stsel = new StringSelection(link);
-        newCmClubDao.addRecordLinkage(describe,link,clubId);
+        String replace = describe;
+        if (describe.contains(masBehavior)) {
+            replace = describe.replace(masBehavior, "");
+        }
+        newCmClubDao.addRecordLinkage(replace,link,clubId);
         logger.info(">>>>>>>>>>>生成记录链接");
         addMessage(redirectAttributes, "链接已生成并自动复制，可直接粘贴");
 //        Toolkit.getDefaultToolkit().getSystemClipboard().setContents(stsel, stsel);

src/main/resources/mappings/modules/user/ClubTemporaryMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.modules.user.dao.ClubTemporaryDao">
-    
+
 	<sql id="clubTemporaryColumns">
 		a.id AS "id",
 		a.userId AS "userId",
@@ -11,6 +11,7 @@
 		a.bindMobile AS "bindMobile",
 		a.contractEmail AS "contractEmail",
 		a.linkMan AS "linkMan",
+		a.linkManIdentity AS "linkManIdentity",
 		a.provinceId AS "provinceId",
 		a.cityId AS "cityId",
 		a.townId AS "townId",
@@ -28,14 +29,14 @@
 		IFNULL(s.name,s.linkMan) AS "spName",
         if(csu.delFlag = '0' and now() <![CDATA[ < ]]> csu.endTime,1,0) as svipUserFlag
 	</sql>
-	
+
 	<sql id="clubTemporaryJoins">
 		LEFT JOIN serviceprovider s ON s.userID = a.userId
         LEFT JOIN cm_svip_user csu ON csu.userId = a.userId
 	</sql>
-    
+
 	<select id="get" resultType="ClubTemporary">
-		SELECT 
+		SELECT
 			<include refid="clubTemporaryColumns"/>,
 		d.name AS "province",
 		c.name AS "city",
@@ -47,33 +48,33 @@
 		LEFT JOIN province d ON d.provinceID=c.provinceID
 		WHERE a.id = #{id}
 	</select>
-	
+
 	<select id="findList" resultType="ClubTemporary">
-		SELECT 
+		SELECT
 			<include refid="clubTemporaryColumns"/>
 		FROM club_temporary a
 		<include refid="clubTemporaryJoins"/>
 		<where>
 			<if test="name != null and name != ''">
-				AND a.name LIKE 
+				AND a.name LIKE
 					<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
 					<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
 					<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>
 			</if>
 			<if test="bindMobile != null and bindMobile != ''">
-				AND a.bindMobile LIKE 
+				AND a.bindMobile LIKE
 					<if test="dbName == 'oracle'">'%'||#{bindMobile}||'%'</if>
 					<if test="dbName == 'mssql'">'%'+#{bindMobile}+'%'</if>
 					<if test="dbName == 'mysql'">concat('%',#{bindMobile},'%')</if>
 			</if>
 			<if test="contractEmail != null and contractEmail != ''">
-				AND a.contractEmail LIKE 
+				AND a.contractEmail LIKE
 					<if test="dbName == 'oracle'">'%'||#{contractEmail}||'%'</if>
 					<if test="dbName == 'mssql'">'%'+#{contractEmail}+'%'</if>
 					<if test="dbName == 'mysql'">concat('%',#{contractEmail},'%')</if>
 			</if>
 			<if test="linkMan != null and linkMan != ''">
-				AND a.linkMan LIKE 
+				AND a.linkMan LIKE
 					<if test="dbName == 'oracle'">'%'||#{linkMan}||'%'</if>
 					<if test="dbName == 'mssql'">'%'+#{linkMan}+'%'</if>
 					<if test="dbName == 'mysql'">concat('%',#{linkMan},'%')</if>
@@ -94,15 +95,15 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
 	<select id="findAllList" resultType="ClubTemporary">
-		SELECT 
+		SELECT
 			<include refid="clubTemporaryColumns"/>
 		FROM club_temporary a
 		<include refid="clubTemporaryJoins"/>
 		<where>
-			
-		</where>		
+
+		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
@@ -111,7 +112,7 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
 	<insert id="insert" parameterType="ClubTemporary"  keyProperty="id" useGeneratedKeys="true">
 		INSERT INTO club_temporary(
 			id,
@@ -121,6 +122,7 @@
 			bindMobile,
 			contractEmail,
 			linkMan,
+			linkManIdentity,
 			provinceId,
 			cityId,
 			townId,
@@ -143,6 +145,7 @@
 			#{bindMobile},
 			#{contractEmail},
 			#{linkMan},
+			#{linkManIdentity},
 			#{provinceId},
 			#{cityId},
 			#{townId},
@@ -159,9 +162,9 @@
 			#{addTime}
 		)
 	</insert>
-	
+
 	<update id="update">
-		UPDATE club_temporary SET 	
+		UPDATE club_temporary SET
 			userId = #{userId},
 			confirmUserId = #{confirmUserId},
 			name = #{name},
@@ -169,6 +172,7 @@
 			bindMobile = #{bindMobile},
 			contractEmail = #{contractEmail},
 			linkMan = #{linkMan},
+			linkManIdentity = #{linkManIdentity},
 			provinceId = #{provinceId},
 			cityId = #{cityId},
 			townId = #{townId},
@@ -185,7 +189,7 @@
 			addTime = #{addTime}
 		WHERE id = #{id}
 	</update>
-	
+
 	<delete id="delete">
 		DELETE FROM club_temporary
 		WHERE id = #{id}
@@ -232,5 +236,5 @@
 		<include refid="clubTemporaryJoins"/>
 		WHERE a.confirmUserId = #{userId}
 	</select>
-	
-</mapper>
+
+</mapper>

src/main/webapp/WEB-INF/views/modules/svip/cmSvipCouponConfiguration.jsp

@@ -138,6 +138,9 @@
     <li class="active"><a href="${ctx}/vip/cmCoupon/configuration">专属优惠券配置</a></li>
 </ul>
 <form:form id="inputForm" modelAttribute="svipcouponForm" action="${ctx}/vip/cmCoupon/saveConfigure" method="post" class="form-horizontal">
+    <div style="height: 50px; background: #f5f5f5;">
+        <span style="color: red; line-height: 50px; font-size: 15px;">在本页面，对每三个月给超级会员自动发放的优惠券进行配置，配置完成后下一阶段才生效</span>
+    </div>
     <sys:message content="${message}"/>
     <form:hidden path="id" value="${cmVipCoupon.id}"/>
     <div class="coupon-wrap" id="couponWrap1">

src/main/webapp/WEB-INF/views/modules/user/clubTemporaryForm.jsp

@@ -419,7 +419,14 @@
 				<form:input path="linkMan" htmlEscape="false" maxlength="20" class="input-medium required"/>
 			</td>
 			<th width="12%"><font color="red">*</font> 手机号：</th>
-			<td colspan="3"><form:input path="bindMobile" htmlEscape="false" maxlength="20" class="input-medium required"  onchange="checkMobile()"/></td>
+			<td width="13%"><form:input path="bindMobile" htmlEscape="false" maxlength="20" class="input-medium required"  onchange="checkMobile()"/></td>
+			<th width="12%"><font color="red">*</font> 联系人身份：</th>
+			<td width="13%">
+				<form:radiobutton path="linkManIdentity" name="linkManIdentity" class="required" value="1" label="老板"/>
+				<form:radiobutton path="linkManIdentity" name="linkManIdentity" class="required" value="2" label="采购"/>
+				<form:radiobutton path="linkManIdentity" name="linkManIdentity" class="required" value="3" label="运营"/>
+				<form:radiobutton path="linkManIdentity" name="linkManIdentity" class="required" value="4" label="其他"/>
+			</td>
 		</tr>
 	</table>
 </div>

src/main/webapp/WEB-INF/views/modules/userNew/recordLinkageForm.jsp

@@ -128,14 +128,17 @@
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font>描述：</label>
             <textarea id='describe' <c:if test="${empty describe}">placeholder="请输入该用户的行为信息，例如查看了什么商品或者文章，以及任何需要销售人员注意的信息"</c:if>
-					  name='describe' rows='5' cols='12' style="width: 700px" maxlength="200"><c:if test="${not empty describe}">${describe}</c:if></textarea>
-		</div>
+					  name='describe' rows='5' cols='12' style="width: 700px" maxlength="200"><c:if test="${not empty describe}">${describe}</c:if><c:if test="${masBehavior ne ''}">,${masBehavior}</c:if></textarea>
+			<textarea hidden id="masBehavior" path="masBehavior"  name="masBehavior" style="width: 700px; visibility: hidden" maxlength="200"><c:if test="${masBehavior ne ''}">,${masBehavior}</c:if></textarea>
+		</div><%--<c:if test="${masBehavior ne ''}">,${masBehavior}</c:if>--%>
+
 	<div class="control-label">链接：</div><span id='link' name='link'>${link}</span>
 		<div class="form-actions">
 			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
 			<input id="btnSubmit" class="btn btn-primary"  type="submit" value="确定并生成链接"/>
 		</div>
 	</form:form>
+<c:if test="${masBehavior ne ''}">
 <form:form id="searchForm" modelAttribute="cmBehaviorRecord" action="${ctx}/new/user/agency/recordLinkage?clubId=${clubId}" method="post" class="breadcrumb form-search">
 	<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 	<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
@@ -187,6 +190,7 @@
 	</C:forEach>
 	</tbody>
 </table>
+</c:if>
 <div class="pagination">${page}</div>
 
 	<script type="text/javascript">