Merge branch 'master' of http://git.iamberry.com/wangxiaoming/iamberry-watero

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/agent/AgentMemberDto.java

@@ -21,6 +21,7 @@ public class AgentMemberDto implements Serializable{
 	private Integer shareType;				//是否显示分享二维码	 	1:不显示	2：显示
 	private OrderStatusDto orderStatusDto;	//订单状态
 	private Integer userIsVip;	//是否为vip
+	private Integer user38Interests;		//是否有38女王节权益 ：1:有权益  2：无权益
 
 	public Integer getUserId() {
 		return userId;
@@ -78,4 +79,12 @@ public class AgentMemberDto implements Serializable{
 	public void setUserIsVip(Integer userIsVip) {
 		this.userIsVip = userIsVip;
 	}
+
+	public Integer getUser38Interests() {
+		return user38Interests;
+	}
+
+	public void setUser38Interests(Integer user38Interests) {
+		this.user38Interests = user38Interests;
+	}
 }

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

@@ -1,8 +1,14 @@
 package com.iamberry.wechat.service.member.dao.imp;
 
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 import com.iamberry.wechat.core.entity.admin.FullReduction;
+import com.iamberry.wechat.core.entity.coupon.CouponItem;
+import com.iamberry.wechat.service.mapper.CouponItemMapper;
+import com.iamberry.wechat.service.mapper.CouponTypeMapper;
+import com.iamberry.wechat.tools.StrUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
@@ -21,6 +27,10 @@ import com.iamberry.wechat.service.member.dao.MemberDao;
 public class MemberDaoImpl  implements MemberDao {
 	@Autowired
 	private MemberMapper memberMapper;
+	@Autowired
+	private CouponItemMapper couponItemMapper;
+	@Autowired
+	private CouponTypeMapper couponTypeMapper;
 
 	/**
 	 * 根据userid得到会员信息
@@ -93,6 +103,7 @@ public class MemberDaoImpl  implements MemberDao {
 	 * @param member
 	 * @return
 	 */
+	@Override
 	public Integer updateUserIncomeByOpenId(Member member){
 		return memberMapper.updateUserIncomeByOpenId(member);
 	}
@@ -109,6 +120,7 @@ public class MemberDaoImpl  implements MemberDao {
 	 * @param openId
 	 * @return
 	 */
+	@Override
 	public List<Integer> selectDownCountByUserId(Integer userId){
 		return memberMapper.selectDownCountByUserId(userId);
 	}
@@ -121,7 +133,33 @@ public class MemberDaoImpl  implements MemberDao {
 
 	@Override
 	public Integer addFullReduction(String openId) {
-		return memberMapper.addFullReduction(openId);
+
+		Calendar calendar = Calendar.getInstance();
+		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;
+		//创建优惠券
+		CouponItem couponItem = new CouponItem();
+		String uuidStr = StrUtils.getUUID();
+		couponItem.setCouponItemId(uuidStr);
+		couponItem.setCouponItemUseropenid(openId);
+		couponItem.setCouponId(20000);
+		couponItem.setCouponReceiveDate(new Date());
+		couponItem.setCouponUseEndDate(calendar.getTime());
+		couponItem.setCouponUseStatus(1);
+		couponItem.setCouponItemRemark("38节活动优惠券");
+		flag = couponItemMapper.insertCouponItem(couponItem);
+		if(flag < 1){
+			throw new RuntimeException("创建优惠券失败");
+		}
+		flag = memberMapper.addFullReduction(openId);
+		if(flag < 1){
+			throw new RuntimeException("创建优惠权益失败");
+		}
+		return flag;
 	}
 
 	@Override

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/agent/AgentHandler.java

@@ -5,6 +5,8 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.iamberry.wechat.core.entity.activity.ActivityDate;
+import com.iamberry.wechat.service.ActivityUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -45,6 +47,8 @@ public class AgentHandler {
 	private CartService cartService;
 	@Autowired
 	private MQServiceProxy mQservice;
+	@Autowired
+	private ActivityUtil activityUtil;
 	
 	/**
 	 * 获取当前用户<微代理> 的订单记录
@@ -95,7 +99,14 @@ public class AgentHandler {
 		
 		AgentMemberDto agentMember = agentMemberService.getMemberInfo(member);
 		agentMember.setUserIsVip(member.getUserIsVip());
-		
+
+		ActivityDate activityDate = activityUtil.doubleTwelve();
+		if(activityDate.isStatus()&& activityUtil.getFullReduction(member.getUserOpenid())){
+			agentMember.setUser38Interests(1);
+		}else{
+			agentMember.setUser38Interests(2);
+		}
+
 		// TODO:此处不算会员中心业务，需要优化
 		ShopSalesOrderDto shopSalesOrderDto = new ShopSalesOrderDto();
 		shopSalesOrderDto.setSalesOpenid(member.getUserOpenid());

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

@@ -208,6 +208,9 @@
     var t1=0,t2=0,all_t=0;
     var user38Interests=2;
 
+    //是否直接使用38元的优惠券  1：使用  2：不使用
+    var user38Interests_quanxi2 = 1;
+
     mui.ready(function() {
         var name,value;
         var str=location.href; //取得整个地址栏
@@ -255,6 +258,7 @@
 							}
                         });
                         if(c>0){
+                            user38Interests_quanxi2 = 2;
                             if((t1==0 && t2==0) || all_t==0){
                                 $(".dhq-dalog").show();
 							}else{
@@ -333,6 +337,7 @@
                             //下次兑换
                             $(document).on('tap', '.nexts', function() {
                                 $("#forward input[yhq_type=3]").removeAttr('checked').prop("disabled","disabled");
+                                $("#forward input[yhq_type=1]").prop('checked',true);
                                 $(".dhq-dalog").hide();
                                 flag=false;
                                 if(user38Interests==1){
@@ -350,10 +355,10 @@
                                 }else{
                                     $("#user-pay-money-span").html(usePayMoney + " 元");
                                 }
-                                console.log("899")
+                                yhq_val = $("input[name=radio1]:checked").val();
+                                yhq_type = $("input[name=radio1]:checked").attr("yhq_type");
+                                $("#user-pay-money-span").html((usePayMoney - yhq_val - ipt_balance).toFixed(2) + " 元");
 							});
-
-
                         }
                         if (dt.data.disable) {
                             mui(dt.data.couponItems).each(function(index) {
@@ -361,7 +366,12 @@
                                 if(this.couponId==10000 && flag){
                                     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>';
+                                if(user38Interests_quanxi2 == 1){
+                                    if(this.couponId==20000){
+                                        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>';
                             });
                             $(".my-popover").html(yhq_str + '<div class="mui-input-row mui-radio"><label>不使用优惠券</label><input name="radio1" value="1" type="radio"></div>');
                         }
@@ -505,6 +515,10 @@
                                 $("#user2000,#user3000").hide();
                                 $("#user-pay-money-span").html((usePayMoney - yhq_val - ipt_balance).toFixed(2) + " 元");
                             }
+                        }else{
+                            yhq_val = $("input[name=radio1]:checked").val();
+                            yhq_type = $("input[name=radio1]:checked").attr("yhq_type");
+                            $("#user-pay-money-span").html((usePayMoney - yhq_val - ipt_balance).toFixed(2) + " 元");
                         }
                     }
 

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

@@ -100,7 +100,7 @@
 <script src="//s.iamberry.com/watero/js/shop/wap-alert/layer.js"></script>
 <script src="//s.iamberry.com/watero/js/shop/validate.js?v=2016101701"></script>
 <script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
-<!--<script src="//s.iamberry.com/watero/js/shop/order_details.js?v=2017062201"></script>-->
-<script src="http://test.iamberry.com/watero/common/shop/js/page/order_details.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/order_details.js?v=2017062201"></script>
+<!--<script src="http://test.iamberry.com/watero/common/shop/js/page/order_details.js"></script>-->
 </body>
 </html>

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

@@ -95,8 +95,8 @@
 <script src="//s.iamberry.com/watero/js/shop/layer.js"></script>
 <script src="//s.iamberry.com/watero/js/validate.js?v=2016111701"></script>
 <script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
-<!--<script src="//s.iamberry.com/watero/js/shop/order_list.js?v=2017062201"></script>-->
-<script src="http://test.iamberry.com/watero/common/shop/js/page/order_list.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/order_list.js?v=2017062201"></script>
+<!--<script src="http://test.iamberry.com/watero/common/shop/js/page/order_list.js"></script>-->
 </body>
 
 </html>

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

@@ -81,7 +81,8 @@
 		#menu-order .mui-control-item{font-size: 14px;}
 		.tx{padding: 0;left: 2em;}
 		.see-rights{color:#8f8f94;background: #fff;border-radius: 6px;padding: 3px 10px;float: right;margin-right: 10px;font-size: 13px;}
-		.vip-show{background: #dff4fa;border-radius: 25px;font-size: 12px;text-align: center;width: 90%;margin:0 auto;padding: 3px 0;display: none;}
+		.quanyi{background: #dff4fa;border-radius: 25px;font-size: 12px;text-align: center;width: 90%;margin:0 auto;padding: 3px 0;display: none;}
+		.user38Interests-show{margin-top: 10px;}
 	</style>
 	<script>
         // 屏蔽分享
@@ -131,9 +132,19 @@
 			</div>
 		</div>
 	</div>
-	<div class="vip-show">
+
+	<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元/套，结算时系统自动减免
 	</div>
+	<div class="user38Interests-show quanyi" style="">
+		女王节活动期间，凡购满2000元送aiberle电动牙刷<br>
+		购满3000元即减100元
+	</div>-->
 	<!-- 			<div style="padding:0;background: #fff;margin-bottom: 8px;">
                     <div id="menu-nav" class="mui-segmented-control">
                         <a class="mui-control-item go_cash_log">
@@ -338,6 +349,13 @@
                             $(".see-rights").hide();
                         }
                     }
+
+                    if(data.user38Interests == 1){
+                       $(".user38Interests-show").show();
+					}else{
+                        $(".user38Interests-show").hide();
+					}
+
                     $.ajax({
                         type: 'post',
                         url: base_path + '/probationOrder/membersProbationOrder',

watero-wechat-web/src/main/webapp/common/shop/js/page/chanpin_list.js

@@ -110,7 +110,7 @@ mui.ready(function() {
     //springFestivalPop();
     marquee_Show();
     if(proType != 1) {
-        $(".tab-with-chanpin-list .icon-machine").parent().removeClass('mui-active');
+        $(".tab-with-chanpin-list .icon-shuiji").parent().removeClass('mui-active');
         switch(proType) {
             case "11":
                 console.log("11")

watero-wechat-web/src/main/webapp/common/shop/js/page/order_details.js

@@ -198,12 +198,19 @@ mui
                                         function(index) {
                                             var pro_color = switchcolor(this.itemColorId);
                                             var colorImg = switchColorImg(this.itemColorId);
+
+                                            //赠品不能跳转到详情页
+                                            var toDesc = "";
+                                            if(this.itemProductType != 15){
+                                                toDesc = "go_chanpin_details";
+                                            }
+
                                             var li = document
                                                 .createElement('li');
                                             li.className = 'mui-table-view-cell mui-media bg-f';
                                             li.innerHTML = '<a proid="'
                                                 + this.itemProductId
-                                                + '" colorid="' + this.itemColorId + '" class="go_chanpin_details"><table class="my-table-order"><tr><td rowspan="3"><div class="wh-80"><img src="'
+                                                + '" colorid="' + this.itemColorId + '" class="'+ toDesc +'"><table class="my-table-order"><tr><td rowspan="3"><div class="wh-80"><img src="'
                                                 + this.itemProductPic
                                                 + '"></div></td><td style="white-space: pre-line;">'
                                                 + this.itemProductName