微信小程序

src/main/java/com/ctrip/fun/admin/controller/JsonController.java

@@ -796,7 +796,7 @@ public class JsonController {
 //        query.setStartDate(DateUtil.getFrontDateByDayCount(cal.getTime(), 3));
         //modify by caosy for advance 3 day
         query.setStartDate(DateUtil.addDays(cal.getTime(), -3));
-        cal.add(Calendar.MONTH, 3);
+        cal.add(Calendar.MONTH, 6);
         query.setEndDate(cal.getTime());
         query.setVersion("v3");
         query.setPagerOffset(0);

src/main/java/com/ctrip/fun/admin/vo/basic/VoucherRuleDto.java

@@ -186,6 +186,12 @@ public class VoucherRuleDto {
     private int onlyMe;//仅限本人使用：1是;0否   
     
     
+    /**
+     * 是否可分享
+     */
+    private int shared;//是否可分享：1是;0否  
+    
+    
     public VoucherRuleDto(MultipleCourseConditionBean multipleCourseConditionBean) {
 		super();
 		this.multipleCourseConditionBean = multipleCourseConditionBean;
@@ -378,6 +384,14 @@ public class VoucherRuleDto {
 	public void setOnlyMe(int onlyMe) {
 		this.onlyMe = onlyMe;
 	}
+	
+	public int getShared() {
+		return shared;
+	}
+
+	public void setShared(int shared) {
+		this.shared = shared;
+	}
 
 	public String getOperater() {
         return operater;

src/main/resources/properties/service.properties

@@ -62,6 +62,7 @@ uri.order.getOrderStatusFromCtrip=/fun-golf-service/{orderType}/getOrderStatusFr
 uri.order.updateOnlineOrderFlag=/fun-golf-service/{orderType}/updateOnlineOrderFlag
 uri.order.updateOrderItemSupplier=/fun-golf-service/{orderType}/updateOrderItemSupplier
 
+
 # tourOrder
 uri.tourOrder.changeCustomerInfo=/fun-golf-service/tourOrder/changeCustomerInfo
 uri.tourOrder.deleteCustomerInfo=/fun-golf-service/tourOrder/deleteCustomerInfo

src/main/webapp/WEB-INF/templates/basic/voucherRule/form.ftl

@@ -480,6 +480,15 @@ $(function(){
 		                <span style="padding-right: 20px;">是</span>
 				    </div>
 				</div>
+                <div class="long_content_div control-group" id="voucherRuleTypeValue1show">
+				    <label class="control-label" for="type">可分享</label>
+				    <div class="controls">
+		                <input style="margin-bottom: 5px;" type="radio"  name="shared" value="0" checked>
+		                <span style="padding-right: 20px;">否</span>
+		                <input style="margin-bottom: 5px;" type="radio"  name="shared" value="1">
+		                <span style="padding-right: 20px;">是</span>
+				    </div>
+				</div>
                 <#if dto.voucherRuleType == 1>
                 <div class="long_content_div control-group" id="voucherRuleTypeValue1show">
 				    <label class="control-label" for="type">发放用户选择</label>