促销活动增加叠加优惠和活动可见度控制

src/main/java/com/caimei/modules/product/entity/CmPromotion.java

@@ -11,6 +11,15 @@ import java.util.List;
 
 public class CmPromotion extends DataEntity<CmPromotion> {
     private static final long serialVersionUID = 1L;
+
+    /**
+     * 是否支持叠加优惠，0支持，1不支持
+     */
+    private String discount;
+    /**
+     * 活动可见度,0所有人，1仅对机构
+     */
+    private String seen;
     /**
      *  促销名称
      */
@@ -145,6 +154,22 @@ public class CmPromotion extends DataEntity<CmPromotion> {
         super(id);
     }
 
+    public String getDiscount() {
+        return discount;
+    }
+
+    public void setDiscount(String discount) {
+        this.discount = discount;
+    }
+
+    public String getSeen() {
+        return seen;
+    }
+
+    public void setSeen(String seen) {
+        this.seen = seen;
+    }
+
     public Integer getOrderId() {
         return orderId;
     }

src/main/java/com/caimei/modules/product/web/CmPromotionController.java

@@ -398,6 +398,7 @@ public class CmPromotionController extends BaseController {
     public String save(CmPromotion cmPromotion, Model model, RedirectAttributes redirectAttributes) {
         if ("1".equals(cmPromotion.getMode())) {
             cmPromotion.setTouchPrice(cmPromotion.getTouchPrice1());
+            cmPromotion.setDiscount("1");
         }else if ("2".equals(cmPromotion.getMode())) {
             cmPromotion.setTouchPrice(cmPromotion.getTouchPrice2());
         }else if ("3".equals(cmPromotion.getMode())) {

src/main/resources/mappings/modules/product/CmPromotionMapper.xml

@@ -301,7 +301,9 @@
             addTime,
             updateTime,
             status,
-            delFlag
+            delFlag,
+            discount,
+            seen
         ) VALUES (
             #{name},
             #{description},
@@ -314,7 +316,9 @@
             #{addTime},
             #{updateTime},
             #{status},
-            #{delFlag1}
+            #{delFlag1},
+            #{discount},
+            #{seen}
         )
     </insert>
 

src/main/webapp/WEB-INF/views/modules/product-new/multiPromotionForm.jsp

@@ -398,6 +398,18 @@
                onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
     </div>
 
+    <div class="control-group" id="discount">
+        <label>叠加优惠：</label>
+        <input type="radio" name="discount" value="0" ${cmPromotion.discount == null ? "checked" : cmPromotion.discount == "0"?"checked":""} />支持
+        <input type="radio" name="discount" value="1" ${cmPromotion.discount == "1" ? "checked" : ""} />不支持
+    </div>
+
+    <div class="control-group">
+        <label>活动可见度：</label>
+        <input type="radio" name="seen" value="0" ${cmPromotion.seen == null ? "checked" : cmPromotion.seen == "0"?"checked":""}/>对所有人可见（含协销）
+        <input type="radio" name="seen" value="1" ${cmPromotion.seen == "1" ? "checked" : ""}/>仅对机构可见（不含协销）
+    </div>
+
     <div class="control-group">
         <label style="display: inline">促销状态：</label>
         <label style="display: inline;color: ${cmPromotion.delFlag1 == null || cmPromotion.delFlag1 == '' ?"green":cmPromotion.delFlag1 == "0"?"red":cmPromotion.delFlag1 == "1"?"purple":cmPromotion.delFlag1 == "2"?"green":"orange"}" id="promotionStatus">${cmPromotion.delFlag1 == null?"进行中": cmPromotion.delFlag1 == "0"?"已关闭":cmPromotion.delFlag1 == "1"?"未开始":cmPromotion.delFlag1 == "2"?"进行中":"已结束"}</label>

src/main/webapp/WEB-INF/views/modules/product-new/shopPromotionForm.jsp

@@ -395,6 +395,18 @@
                onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
     </div>
 
+    <div class="control-group" id="discount">
+        <label>叠加优惠：</label>
+        <input type="radio" name="discount" value="0" ${cmPromotion.discount == null ? "checked" : cmPromotion.discount == "0"?"checked":""} />支持
+        <input type="radio" name="discount" value="1" ${cmPromotion.discount == "1" ? "checked" : ""} />不支持
+    </div>
+
+    <div class="control-group">
+        <label>活动可见度：</label>
+        <input type="radio" name="seen" value="0" ${cmPromotion.seen == null ? "checked" : cmPromotion.seen == "0"?"checked":""}/>对所有人可见（含协销）
+        <input type="radio" name="seen" value="1" ${cmPromotion.seen == "1" ? "checked" : ""}/>仅对机构可见（不含协销）
+    </div>
+
     <div class="control-group">
         <label style="display: inline">促销状态：</label>
         <label style="display: inline;color: ${cmPromotion.delFlag1 == null || cmPromotion.delFlag1 == '' ?"green":cmPromotion.delFlag1 == "0"?"red":cmPromotion.delFlag1 == "1"?"purple":cmPromotion.delFlag1 == "2"?"green":"orange"}" id="promotionStatus">${cmPromotion.delFlag1 == null?"进行中":cmPromotion.delFlag1 == "0"?"已关闭":cmPromotion.delFlag1 == "1"?"未开始":cmPromotion.delFlag1 == "2"?"进行中":"已结束"}</label>

src/main/webapp/WEB-INF/views/modules/product-new/singlePromotionForm.jsp

@@ -299,6 +299,13 @@
             return items;
         }
 
+        function checkModes(){
+            $("#discount").show();
+        }
+
+        function checkMode(){
+            $("#discount").hide();
+        }
     </script>
 </head>
 <body>
@@ -353,9 +360,9 @@
 
     <div class="control-group" id="promotionType">
         <label>促销方式：</label>
-        <input type="radio"  id="promotionType1" name="mode" value="1" ${cmPromotion.mode == null ? "checked" : cmPromotion.mode == "1"?"checked":""} />优惠价
-        <input type="radio"  id="promotionType2" name="mode" value="2" ${cmPromotion.mode == "2" ? "checked" : ""} />满减
-        <input type="radio" id="promotionType3"  name="mode" value="3" ${cmPromotion.mode == "3" ? "checked" : ""} />满赠
+        <input type="radio"  id="promotionType1" onclick="checkMode()" name="mode" value="1" ${cmPromotion.mode == null ? "checked" : cmPromotion.mode == "1"?"checked":""} />优惠价
+        <input type="radio"  id="promotionType2" onclick="checkModes()" name="mode" value="2" ${cmPromotion.mode == "2" ? "checked" : ""} />满减
+        <input type="radio" id="promotionType3"  onclick="checkModes()" name="mode" value="3" ${cmPromotion.mode == "3" ? "checked" : ""} />满赠
     </div>
 
     <div class="control-group">
@@ -432,6 +439,18 @@
                onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
     </div>
 
+    <div class="control-group" id="discount" style="display: ${cmPromotion.mode == null ? "none" : cmPromotion.mode == "1"?"none":""}">
+        <label>叠加优惠：</label>
+        <input type="radio" name="discount" value="0" ${cmPromotion.discount == null ? "checked" : cmPromotion.discount == "0"?"checked":""} />支持
+        <input type="radio" name="discount" value="1" ${cmPromotion.discount == "1" ? "checked" : ""} />不支持
+    </div>
+
+    <div class="control-group">
+        <label>活动可见度：</label>
+        <input type="radio" name="seen" value="0" ${cmPromotion.seen == null ? "checked" : cmPromotion.seen == "0"?"checked":""}/>对所有人可见（含协销）
+        <input type="radio" name="seen" value="1" ${cmPromotion.seen == "1" ? "checked" : ""}/>仅对机构可见（不含协销）
+    </div>
+
     <div class="control-group">
         <label style="display: inline" id="testStatus">促销状态：</label>
         <label style="display: inline;color: ${cmPromotion.delFlag1 == null || cmPromotion.delFlag1 == '' ?"green":cmPromotion.delFlag1 == "0"?"red":cmPromotion.delFlag1 == "1"?"purple":cmPromotion.delFlag1 == "2"?"green":"orange"}" id="promotionStatus" >${cmPromotion.delFlag1 == null || cmPromotion.delFlag1 == '' ?"进行中":cmPromotion.delFlag1 == "0"?"已关闭":cmPromotion.delFlag1 == "1"?"未开始":cmPromotion.delFlag1 == "2"?"进行中":"已结束"}</label>