Ver Fonte

分享优惠券

zhijiezhao há 10 meses atrás
pai
commit
363b9d627c

+ 20 - 0
src/main/java/com/caimei/modules/coupon/entity/CmCoupon.java

@@ -18,6 +18,10 @@ import java.util.List;
 public class CmCoupon extends DataEntity<CmCoupon> {
 public class CmCoupon extends DataEntity<CmCoupon> {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
+
+    private String shareCouponTopic;
+
+    private String shareCouponImage;
     private String name;        // 活动主题
     private String name;        // 活动主题
     private BigDecimal couponAmount;        // 优惠券金额(面值)
     private BigDecimal couponAmount;        // 优惠券金额(面值)
     private BigDecimal touchPrice;        // 优惠满减条件金额
     private BigDecimal touchPrice;        // 优惠满减条件金额
@@ -67,6 +71,22 @@ public class CmCoupon extends DataEntity<CmCoupon> {
         super(id);
         super(id);
     }
     }
 
 
+    public String getShareCouponTopic() {
+        return shareCouponTopic;
+    }
+
+    public void setShareCouponTopic(String shareCouponTopic) {
+        this.shareCouponTopic = shareCouponTopic;
+    }
+
+    public String getShareCouponImage() {
+        return shareCouponImage;
+    }
+
+    public void setShareCouponImage(String shareCouponImage) {
+        this.shareCouponImage = shareCouponImage;
+    }
+
     public Integer getUseTimeFlag() {
     public Integer getUseTimeFlag() {
         return useTimeFlag;
         return useTimeFlag;
     }
     }

+ 8 - 4
src/main/java/com/caimei/modules/coupon/service/CmCouponService.java

@@ -140,16 +140,20 @@ public class CmCouponService extends CrudService<CmCouponDao, CmCoupon> {
             String image = UploadPicUtils.saveImageToServer(cmCoupon.getAppletsBanner());
             String image = UploadPicUtils.saveImageToServer(cmCoupon.getAppletsBanner());
             cmCoupon.setAppletsBanner(image);
             cmCoupon.setAppletsBanner(image);
         }
         }
+        if (StringUtils.isNotBlank(cmCoupon.getShareCouponImage())) {
+            String image = UploadPicUtils.saveImageToServer(cmCoupon.getShareCouponImage());
+            cmCoupon.setShareCouponImage(image);
+        }
         Date date = new Date();
         Date date = new Date();
         cmCoupon.setCreateDate(date);
         cmCoupon.setCreateDate(date);
         setCouponStatus(cmCoupon, date);
         setCouponStatus(cmCoupon, date);
         if (StringUtils.isBlank(cmCoupon.getCouponsMode())) {
         if (StringUtils.isBlank(cmCoupon.getCouponsMode())) {
             cmCoupon.setCouponsMode("0");
             cmCoupon.setCouponsMode("0");
         }
         }
-        if (null == cmCoupon.getVipFlag()){
+        if (null == cmCoupon.getVipFlag()) {
             cmCoupon.setVipFlag(0);
             cmCoupon.setVipFlag(0);
         }
         }
-        if(null==cmCoupon.getMoneyCouponFlag()){
+        if (null == cmCoupon.getMoneyCouponFlag()) {
             cmCoupon.setMoneyCouponFlag(2);
             cmCoupon.setMoneyCouponFlag(2);
         }
         }
         super.save(cmCoupon);
         super.save(cmCoupon);
@@ -334,8 +338,8 @@ public class CmCouponService extends CrudService<CmCouponDao, CmCoupon> {
         return couponsLogo;
         return couponsLogo;
     }
     }
 
 
-    public List<CmCoupon> findClubCouponList(Product product,Integer userId,Integer moneyCouponFlag) {
-        List<CmCoupon> couponList = cmCouponDao.findCouponList(userId,moneyCouponFlag);
+    public List<CmCoupon> findClubCouponList(Product product, Integer userId, Integer moneyCouponFlag) {
+        List<CmCoupon> couponList = cmCouponDao.findCouponList(userId, moneyCouponFlag);
         filterCoupon(product, couponList);
         filterCoupon(product, couponList);
         setCouponCopywriting(couponList);
         setCouponCopywriting(couponList);
         return couponList;
         return couponList;

+ 11 - 3
src/main/resources/mappings/modules/coupon/CmCouponMapper.xml

@@ -28,6 +28,8 @@
 		a.moneyCouponType as "moneyCouponType",
 		a.moneyCouponType as "moneyCouponType",
 		a.createDate AS "createDate",
 		a.createDate AS "createDate",
 		a.couponPayWay as "couponPayWay",
 		a.couponPayWay as "couponPayWay",
+		a.shareCouponImage as "shareCouponImage",
+		a.shareCouponTopic as "shareCouponTopic",
 		a.delFlag AS "delFlag"
 		a.delFlag AS "delFlag"
 	</sql>
 	</sql>
 
 
@@ -169,7 +171,9 @@
 			moneyCouponFlag,
 			moneyCouponFlag,
 			moneyCouponType,
 			moneyCouponType,
 			delFlag,
 			delFlag,
-			configure
+			configure,
+			shareCouponImage,
+			shareCouponTopic
 		) VALUES (
 		) VALUES (
 			#{name},
 			#{name},
 		    #{couponPayWay},
 		    #{couponPayWay},
@@ -196,7 +200,9 @@
 		    #{moneyCouponFlag},
 		    #{moneyCouponFlag},
 			#{moneyCouponType},
 			#{moneyCouponType},
 			#{delFlag},
 			#{delFlag},
-		    #{configure}
+		    #{configure},
+		    #{shareCouponImage},
+		    #{shareCouponTopic}
 		)
 		)
 	</insert>
 	</insert>
 
 
@@ -224,7 +230,9 @@
 			couponsMode = #{couponsMode},
 			couponsMode = #{couponsMode},
 			moneyCouponPrice = #{moneyCouponPrice},
 			moneyCouponPrice = #{moneyCouponPrice},
 			moneyCouponType = #{moneyCouponType},
 			moneyCouponType = #{moneyCouponType},
-			configure = #{configure}
+			configure = #{configure},
+			shareCouponImage = #{shareCouponImage},
+			shareCouponTopic = #{shareCouponTopic}
 		WHERE id = #{id}
 		WHERE id = #{id}
 	</update>
 	</update>
 
 

+ 22 - 0
src/main/webapp/WEB-INF/views/modules/coupon/MoneyCouponForm.jsp

@@ -167,6 +167,22 @@
             </c:if>
             </c:if>
         </div>
         </div>
     </div>
     </div>
+    <div class="control-group">
+        <label class="control-label">分享优惠券标题:</label>
+        <div class="controls">
+            <form:input path="shareCouponTopic" htmlEscape="false" maxlength="30" placeholder="30个汉字以内" class="input-xlarge"/>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label">分享优惠券封面:</label>
+        <div class="controls upload-content-image iconBox">
+            <div class="conList">
+                <form:hidden id="shareCouponImage" path="shareCouponImage" htmlEscape="false" maxlength="255" class="input-xlarge"/>
+                <sys:ckfinder input="shareCouponImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                <br>
+            </div>
+        </div>
+    </div>
     <div class="control-group">
     <div class="control-group">
         <label class="control-label"><font color="red">*</font>上架时间:</label>
         <label class="control-label"><font color="red">*</font>上架时间:</label>
         <div class="controls">
         <div class="controls">
@@ -427,6 +443,12 @@
                     input.parents(".conList").find(".cancel-upload-image").show();
                     input.parents(".conList").find(".cancel-upload-image").show();
                     input.parents(".conList").next().removeClass("hide-pic-image")
                     input.parents(".conList").next().removeClass("hide-pic-image")
                 }
                 }
+                input = $("#shareCouponImage");
+                if (input.val()) {
+                    input.next().find("li").css("z-index", "99");
+                    input.parents(".conList").find(".cancel-upload-image").show();
+                    input.parents(".conList").next().removeClass("hide-pic-image")
+                }
                 input = $("#appletsBanner");
                 input = $("#appletsBanner");
                 if (input.val()) {
                 if (input.val()) {
                     input.next().find("li").css("z-index", "99");
                     input.next().find("li").css("z-index", "99");

+ 22 - 0
src/main/webapp/WEB-INF/views/modules/coupon/cmCouponForm.jsp

@@ -167,6 +167,22 @@
 				<input id="usePeriodTemp" type="hidden" value="${cmCoupon.usePeriod}">
 				<input id="usePeriodTemp" type="hidden" value="${cmCoupon.usePeriod}">
 			</div>
 			</div>
 		</div>
 		</div>
+		<div class="control-group">
+			<label class="control-label">分享优惠券标题:</label>
+			<div class="controls">
+				<form:input path="shareCouponTopic" htmlEscape="false" maxlength="30" placeholder="30个汉字以内" class="input-xlarge"/>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label">分享优惠券封面:</label>
+			<div class="controls upload-content-image iconBox">
+				<div class="conList">
+					<form:hidden id="shareCouponImage" path="shareCouponImage" htmlEscape="false" maxlength="255" class="input-xlarge"/>
+					<sys:ckfinder input="shareCouponImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+					<br>
+				</div>
+			</div>
+		</div>
 		<div class="control-group">
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font>状态:</label>
 			<label class="control-label"><font color="red">*</font>状态:</label>
 			<div class="controls">
 			<div class="controls">
@@ -307,6 +323,12 @@
 					input.parents(".conList").find(".cancel-upload-image").show();
 					input.parents(".conList").find(".cancel-upload-image").show();
 					input.parents(".conList").next().removeClass("hide-pic-image")
 					input.parents(".conList").next().removeClass("hide-pic-image")
 				}
 				}
+				input = $("#shareCouponImage");
+				if (input.val()) {
+					input.next().find("li").css("z-index", "99");
+					input.parents(".conList").find(".cancel-upload-image").show();
+					input.parents(".conList").next().removeClass("hide-pic-image")
+				}
 				input = $("#appletsBanner");
 				input = $("#appletsBanner");
 				if (input.val()) {
 				if (input.val()) {
 					input.next().find("li").css("z-index", "99");
 					input.next().find("li").css("z-index", "99");

+ 26 - 0
src/main/webapp/WEB-INF/views/modules/coupon/couponShopForm.jsp

@@ -88,6 +88,22 @@
                    required>
                    required>
         </div>
         </div>
     </div>
     </div>
+    <div class="control-group">
+        <label class="control-label">分享优惠券标题:</label>
+        <div class="controls">
+            <form:input path="shareCouponTopic" htmlEscape="false" maxlength="30" placeholder="30个汉字以内" class="input-xlarge"/>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label">分享优惠券封面:</label>
+        <div class="controls upload-content-image iconBox">
+            <div class="conList">
+                <form:hidden id="shareCouponImage" path="shareCouponImage" htmlEscape="false" maxlength="255" class="input-xlarge"/>
+                <sys:ckfinder input="shareCouponImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                <br>
+            </div>
+        </div>
+    </div>
     <div class="control-group">
     <div class="control-group">
         <label class="control-label"><font color="red">*</font>优惠条件:</label>
         <label class="control-label"><font color="red">*</font>优惠条件:</label>
         <div class="controls">
         <div class="controls">
@@ -174,6 +190,16 @@
             }
             }
             appendShopOrderHead(shop);
             appendShopOrderHead(shop);
         }
         }
+        $(window).on("load", function () {
+            setTimeout(function () {
+                var input = $("#shareCouponImage");
+                if (input.val()) {
+                    input.next().find("li").css("z-index", "99");
+                    input.parents(".conList").find(".cancel-upload-image").show();
+                    input.parents(".conList").next().removeClass("hide-pic-image")
+                }
+            }, 500);
+        });
         initInputDisplay();
         initInputDisplay();
         initUseTimeFlag();
         initUseTimeFlag();
     });
     });