老用户回馈页面

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

@@ -47,6 +47,9 @@ public class CartDto implements Serializable{
 
 	private String productColorDes;			//产品颜色
 
+	private String colorImg;			//产品颜色图片
+
+
 	
 	public String getProductColor() {
 		return productColor;
@@ -177,4 +180,12 @@ public class CartDto implements Serializable{
 	public void setProductColorDes(String productColorDes) {
 		this.productColorDes = productColorDes;
 	}
+
+	public String getColorImg() {
+		return colorImg;
+	}
+
+	public void setColorImg(String colorImg) {
+		this.colorImg = colorImg;
+	}
 }

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

@@ -36,6 +36,8 @@ public class CouponItemDto implements java.io.Serializable{
 	private String couponItemRemark;			//优惠券详情备注
 	private PageBean page;						//分页
 
+	private Integer isCanUsed;	//前端判断是否能够使用  1：可用  2：不能用
+
 	private Exchange exchange;	//
 	
 	public String getCouponItemId() {
@@ -136,4 +138,12 @@ public class CouponItemDto implements java.io.Serializable{
 	public void setExchange(Exchange exchange) {
 		this.exchange = exchange;
 	}
+
+	public Integer getIsCanUsed() {
+		return isCanUsed;
+	}
+
+	public void setIsCanUsed(Integer isCanUsed) {
+		this.isCanUsed = isCanUsed;
+	}
 }

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

@@ -236,7 +236,7 @@ PUBLIC
 			C.CART_ID cartId, G.PRODUCT_ID cartProductId, pc.COLOR_ID cartColorId, G.PRODUCT_STATUS productStatus, 
 			C.CART_NUM cartNum, G.PRODUCT_NAME productName, pc.COLOR_DISCOUNT productPrice, 
 			G.PRODUCT_INTRODUCE_IMG productIntroduceImg, pc.COLOR_PRICE productDiscount, PC.COLOR_69CODE productRemark, 
-			pc.COLOR_NAME productColor, G.PRODUCT_TYPE productType ,G.product_color_des
+			pc.COLOR_NAME productColor, G.PRODUCT_TYPE productType ,G.product_color_des,PC.color_img AS colorImg
 		FROM 
 			TB_IAMBERRY_SHOP_CART C 
 		LEFT JOIN TB_IAMBERRY_PRODUCT_INFO G ON C.CART_PRODUCT_ID = G.PRODUCT_ID 

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

@@ -146,28 +146,6 @@ public class OrderHandler {
 			return msg;
 		}
 		
-		//判断是否为金牌会员下线，如果是，则以优惠价显示，如果不是则按原价显示
-		//查询金牌会员模板id
-		int templateId = systemService.selectOneShopRuleById(114).getRuleNum().intValue();
-		//如果模板id等于金牌会模板id，则该用户为金牌会员下线
-//		if (member.getUserDealers() != null && member.getTemplateId() != null
-//				&& templateId == member.getTemplateId().intValue() && member.getUserResType().intValue() == 3) {
-//			//若果是金牌会员下线，产品的价格就以优惠价显示
-//			if (cartDtos != null && cartDtos.size() >= 1) {
-//				for (CartDto cartDto : cartDtos) {
-//					UserGiftDto userGiftDto = new UserGiftDto();
-//					userGiftDto.setUserLevel(2);
-//					userGiftDto.setUserProductId(cartDto.getCartProductId());
-//					userGiftDto.setUserColorId(cartDto.getCartColorId());
-//					//根据商品id和会员等级查询礼品信息
-//					userGiftDto = productInfoService.selectUserGift(userGiftDto);
-//					if (userGiftDto != null) {
-//						cartDto.setProductPrice(userGiftDto.getUserDiscount());
-//					}
-//				}
-//			}
-//		}
-		
 		//根据openid查询该用户是否购买过订单
 		ShopSalesOrderDto shopSalesOrderDto = new ShopSalesOrderDto();
 		shopSalesOrderDto.setSalesOpenid(member.getUserOpenid());
@@ -236,7 +214,9 @@ public class OrderHandler {
 		for (CouponItemDto cid : list){
 
 			if(total < cid.getCouponConsumeEnough()){
-				break;
+				cid.setIsCanUsed(2);
+			}else{
+				cid.setIsCanUsed(1);
 			}
 
 			if(3 == cid.getCouponType()){
@@ -255,12 +235,17 @@ public class OrderHandler {
 						}
 					}
 					if(fl){
-						couponItemDtoList.add(cid);
+						cid.setIsCanUsed(1);
+//						couponItemDtoList.add(cid);
+					}else{
+						cid.setIsCanUsed(2);
 					}
 				}
 			}else{
-				couponItemDtoList.add(cid);
+				cid.setIsCanUsed(1);
+//				couponItemDtoList.add(cid);
 			}
+			couponItemDtoList.add(cid);
 		}
 		
 		dto.setCouponItems(couponItemDtoList);

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

@@ -1,13 +1,13 @@
 jdbc.driver=com.mysql.jdbc.Driver
 
-jdbc.url=jdbc:mysql://watero2db.mysql.rds.aliyuncs.com/test_watero?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/watero_test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
 jdbc.username=watero
-jdbc.password=wateroTech123
+jdbc.password=Watero1234
 
 
-#jdbc.url=jdbc:mysql://watero2db.mysql.rds.aliyuncs.com/watero?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+#jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/watero?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
 #jdbc.username=watero
-#jdbc.password=wateroTech123
+#jdbc.password=Watero1234
 
 
 #pool settings

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

@@ -89,7 +89,7 @@
 	</div>
 
 	<div class="index-title go_web_shop">
-		<strong>WaterO水机</strong><span class="mui-pull-right"><font>更多</font><span class="mui-icon mui-icon-arrowright"></span></span>
+		<strong>WaterO净水机</strong><span class="mui-pull-right"><font>更多</font><span class="mui-icon mui-icon-arrowright"></span></span>
 	</div>
 	<!--list开始-->
 	<div class="chanpin-box">
@@ -264,8 +264,8 @@
     });
     $(document).ready(function(){
         var d = new Date().getTime();//当前时间戳
-        //弹窗提示时间为2月9日-2月22日
-        if(d > 1518019200000 && d < 1519315200000) {
+        //弹窗提示时间为1月18日-2月13日
+		if (d > 1547740800000 && d < 1550073599000) {
             if(!window.localStorage) {
                 mui.alert("您的浏览器不支持localStorage");
             } else {