38节日活动

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-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/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{text-align: left;margin-top: 10px;display: block;padding-left: 24px; letter-spacing: 0.6px;}
 	</style>
 	<script>
         // 屏蔽分享
@@ -131,9 +132,13 @@
 			</div>
 		</div>
 	</div>
-	<div class="vip-show">
+	<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 +343,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