38节日活动

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/cart/OrderPayDto.java

@@ -40,6 +40,8 @@ public class OrderPayDto implements java.io.Serializable{
 
 	private Integer userIsVip;		//是否为vip ：1:非vip  2：vip
 
+	private Integer user38Interests;		//是否有38女王节权益 ：1:有权益  2：无权益
+
 	public boolean isDisable() {
 		return disable;
 	}
@@ -127,4 +129,12 @@ public class OrderPayDto implements java.io.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/mapper/productColorMapper.xml

@@ -8,7 +8,7 @@
 		COLOR_NAME colorName,
 		COLOR_DISCOUNT colorDiscount,
 		COLOR_PRICE colorPrice,
-		
+		COLOR_IMG colorImg,
 		COLOR_69CODE color69Code,
 		COLOR_CRETAE_TIME colorCretaeTime,
 		COLOR_UPDATE_TIME colorUpdateTime

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

@@ -856,4 +856,23 @@ public class CartHandlers {
 		remsg.setStatus(true);
 		return remsg;
 	}
+
+
+	/**
+	 * 获取38节的权益
+	 * @param request
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping("/get_38Interests")
+	public ResultMsg get38Interests(HttpServletRequest request) throws Exception{
+		ResultMsg remsg=new ResultMsg();
+		List<ProductColor> productColorList = new ArrayList<>();
+		ProductColor productColor = productColorService.selectProductColorById(48);
+		productColorList.add(productColor);
+		remsg.setData(productColorList);
+		remsg.setStatus(true);
+		return remsg;
+	}
+
 }

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/order/OrderHandler.java

@@ -249,7 +249,7 @@ public class OrderHandler {
 			}
 			couponItemDtoList.add(cid);
 		}
-		
+
 		dto.setCouponItems(couponItemDtoList);
 
 		dto.setUserIsVip(member.getUserIsVip());
@@ -259,6 +259,8 @@ public class OrderHandler {
 		dto.setSuccess(true); // 请求成功
 		dto.setMeonyProportion(0);
 		dto.setBalance(member.getUserIncome());
+
+		dto.setUser38Interests(1);	//有权益
 		
 		dto.setDisable(disable);
 		

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

@@ -962,4 +962,6 @@
     }
 </script>
 </body>
-</html>
+</html>
+
+