以旧换新

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java

@@ -30,7 +30,9 @@ public class CouponItemDto implements java.io.Serializable{
 	@DateTimeFormat(pattern="yyyy-MM-dd")  
 	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") 
 	private Date couponUseDate;					//使用时间
-	
+
+	private String couponRemark;					//备注
+
 	private Date beginDate;						//开始时间
 	private Date endDate;						//结束时间
 	private String couponItemRemark;			//优惠券详情备注
@@ -126,7 +128,12 @@ public class CouponItemDto implements java.io.Serializable{
 	public void setCouponType(Integer couponType) {
 		this.couponType = couponType;
 	}
-	
-	
-	
+
+	public String getCouponRemark() {
+		return couponRemark;
+	}
+
+	public void setCouponRemark(String couponRemark) {
+		this.couponRemark = couponRemark;
+	}
 }

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/couponItemMapper.xml

@@ -23,7 +23,8 @@
  	<select id="getCouponItemDtoList" resultType="CouponItemDto" parameterType="CouponItemDto">
  		SELECT 
  			<include refid="allField"></include>,
- 		CT.COUPON_TYPE couponType	
+ 		CT.COUPON_TYPE couponType,
+		CT.coupon_remark couponRemark
  		FROM TB_IAMBERRY_COUPON_ITEM CI
  		JOIN TB_IAMBERRY_COUPON_TYPE CT ON CI.COUPON_ID=CT.COUPON_ID
 		<where>

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

@@ -152,7 +152,8 @@ public class OrderHandler {
 		// 判断当前提交的购物车ID，有多少产品在售
 		int total = 0; // 支付金额
 		int sum = 0; // 产品数量
-		
+		int productIdW6 = 0; // W6水机数量
+
 		List<CartDto> tempCarts = new ArrayList<CartDto>();
 		for (CartDto cartDto : cartDtos) {
 			switch (cartDto.getCartIsSource()) {
@@ -170,7 +171,9 @@ public class OrderHandler {
 				cartDto.setSalesUserGiftList(giftList);
 				tempCarts.add(cartDto);
 			}
-
+			if(cartDto.getCartProductId() == 39){
+				productIdW6 ++;
+			}
 		}
 		if (sum <= 0) {
 			msg.setMessage(ResultInfo.cartEmptyError);
@@ -185,8 +188,17 @@ public class OrderHandler {
 		cDto.setPage(new PageBean());
 		cDto.getPage().setPageSize(12);
 		//cDto.getPage().setPageNumber(pageNO);
-		List<CouponItemDto> list = couponItemService.getCouponItemDtoList(cDto);
-		
+		List<CouponItemDto> list = new ArrayList<CouponItemDto>();
+		List<CouponItemDto> couponItemDtolist = couponItemService.getCouponItemDtoList(cDto);
+		for (CouponItemDto cid : couponItemDtolist) {
+			if(cid.getCouponId() == 20000||cid.getCouponId() == 20001){
+				if(productIdW6 > 0){
+					list.add(cid);
+				}
+			}else{
+				list.add(cid);
+			}
+		}
 		dto.setCouponItems(list);
 		
 		request.getSession().setAttribute("cartIds", cartIds);