38节日活动

watero-wechat-service/src/main/java/com/iamberry/wechat/service/member/dao/imp/MemberDaoImpl.java

@@ -135,7 +135,10 @@ public class MemberDaoImpl  implements MemberDao {
 	public Integer addFullReduction(String openId) {
 
 		Calendar calendar = Calendar.getInstance();
-		calendar.set(2019,3,16,23,59,59);
+		calendar.set(2019,2,16);
+		calendar.set(Calendar.HOUR_OF_DAY,23);
+		calendar.set(Calendar.MINUTE,59);
+		calendar.set(Calendar.SECOND,58);
 
 		Integer flag = 0;
 		//创建优惠券

watero-wechat-service/src/main/java/com/iamberry/wechat/service/wechat/WeChatServiceImpl.java

@@ -398,7 +398,12 @@ public class WeChatServiceImpl implements WeChatService {
 				return ResultInfo.female_lady_reply;
 			}
 			// 绑定关系
-			int count = memberDao.addFullReduction(fromUserName);
+			int count = 0;
+			try {
+				count = memberDao.addFullReduction(fromUserName);
+			}catch (Exception e){
+				e.printStackTrace();
+			}
 			if (count < 1) {
 				return "激活女王节活动资格失败，请稍后重试！";
 			}else{

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/CartHandlers.java

@@ -1,11 +1,7 @@
 package com.iamberry.wechat.handles.cart;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 

watero-wechat-web/src/main/resources/platform.properties

@@ -195,7 +195,3 @@ reserve_pay_money=1
 DO_MAIN=test.iamberry.com
 
 IMAGE_URL=https://w.iamberry.com
-FEMALE_LADY=女王节
-FEMALE_LADY_REPLY=Hi，欢迎参加【WaterO】女王节活动，这里为你准备了双重宠爱的特别礼物。\n\n特别礼物1：满额即减。全场买满3000元即减100元。\n\n特别礼物2：满额即赠。全场买满2000元即赠Aiberle电动牙刷1支。\n\n活动时间：3月7日-16日\n\n机会有限，赶快<a href='https://w.iamberry.com/watero/wechat/index'>点击这里</a>享受女王礼遇吧。
-FEMALE_LADY_ERROR=激活女王节活动资格失败，请稍后重试！
-FEMALE_LADY_INTRODUCE=活动已结束！

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/clearing.html

@@ -337,7 +337,7 @@
                             //下次兑换
                             $(document).on('tap', '.nexts', function() {
                                 $("#forward input[yhq_type=3]").removeAttr('checked').prop("disabled","disabled");
-                                $("#forward #fx893f1da4da4e02bd5af8ac80xed4xx").prop('checked',true);
+                                $("#forward input[yhq_type=1]").prop('checked',true);
                                 $(".dhq-dalog").hide();
                                 flag=false;
                                 if(user38Interests==1){
@@ -371,7 +371,7 @@
                                         checked='checked';
                                     }
 								}
-                                yhq_str += '<div class="mui-input-row mui-radio"><label>' + this.couponName + '</label><input name="radio1" value="' + accDiv(this.couponReduce, 100) + '" type="radio" id="' + this.couponItemId + '" yhq_type="' + this.couponType + '"  '+checked+'/></div>';
+                                yhq_str += '<div class="mui-input-row mui-radio"><label>' + this.couponName + '</label><input name="radio1" value="' + accDiv(this.couponReduce, 100) + '" type="radio" id="' + this.couponItemId + '"  yhq_type="' + this.couponType + '"  '+checked+'/></div>';
                             });
                             $(".my-popover").html(yhq_str + '<div class="mui-input-row mui-radio"><label>不使用优惠券</label><input name="radio1" value="1" type="radio"></div>');
                         }

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/vip_center.html

@@ -136,6 +136,7 @@
 	<div class="vip-show" style="display: none"><img style="width: 80%;display: block; margin: 0 auto;" src="//s.iamberry.com/watero/images/yh_lv.jpg"></div>
 	<div class="user38Interests-show"><img style="width: 80%;display: block; margin: 0 auto;" src="//s.iamberry.com/watero/images/yh_38_1.jpg"></div>
 	<div class="user38Interests-show"><img style="width: 80%;display: block; margin: 0 auto;" src="//s.iamberry.com/watero/images/yh_38_2.jpg"></div>
+	<div class="user38Interests-show"><img style="width: 80%;display: block; margin: 0 auto;" src="//s.iamberry.com/watero/images/yh_38_3.jpg"></div>
 
 	<!--<div class="vip-show quanyi" style="    text-align: left;padding-left: 24px;">
 		凡购买滤芯套装，立减100元/套，结算时系统自动减免