Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

# Conflicts:
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java
#	tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/couponItemMapper.xml

tooth-common-web/src/main/java/com/iamberry/common/web/SimpleCORSFilter.java

@@ -32,6 +32,7 @@ public class SimpleCORSFilter implements Filter {
 		origins.add("m.watero.cn");
 		origins.add("static.watero.cn");
 		origins.add("static.iamberry.com");
+		origins.add("s.iamberry.com");
 	}
     public void init(FilterConfig filterConfig) throws ServletException {}
     public void doFilter(ServletRequest servletRequest, ServletResponse

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

@@ -256,8 +256,7 @@ public class CartHandlers {
 	public ResultMsg  addCart(HttpServletRequest request,
 							  @RequestParam("colorId") Integer colorId,
 							  @RequestParam(value = "cartNum", required = false, defaultValue = "1") Integer cartNum) throws Exception {
-//		String openId  = WechatUtils.getUserBySession(request).getUserOpenid();
-		String openId  = "oZ9pv02WMRQgyDVRY1a_daYecwHI";
+		String openId  = WechatUtils.getUserBySession(request).getUserOpenid();
 		ResultMsg remsg=new ResultMsg();
 
 		if (colorId == null || "".equals(colorId) || "null".equals(colorId)) {
@@ -406,7 +405,6 @@ public class CartHandlers {
 		}
 		bean.setText(openId);
 		bean.setPaperData(pageNO, pageSize);
-		System.out.println(bean.getMinNum() + "-->" + bean.getMaxNum());
 		List<ShopOrderAndItemDto> shopOrderList = cartService.selectShopOrder(bean);
 		ShopSystemRule shopSystemRule = this.adminOrderService.getReluByRid(109);
 

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

@@ -187,15 +187,20 @@ public class OrderHandler {
 		//cDto.setPage(new PageBean());
 		//cDto.getPage().setPageSize(12);
 		//cDto.getPage().setPageNumber(pageNO);
-		List<CouponItemDto> list = couponItemService.getCouponItemDtoList(cDto);
-		for(CouponItemDto couponItemDto : list){
+		List<CouponItemDto> couponItemDtoList = couponItemService.getCouponItemDtoList(cDto);
+		List<CouponItemDto> list = new ArrayList<>();
+		for(CouponItemDto couponItemDto : couponItemDtoList){
+			boolean flag = true;
 			if(couponItemDto.getCouponIsNewPeople() == 1 && member.getUserIdentity() != 1){  //当券为新人券，用户为非会员时，需要有牙刷，结算才可以使用该券
-				if(!disable){		//没有牙刷
-					couponItemDto.setCouponIsUse(2);
-					couponItemDto.setCouponNoUseReason("需要购买牙刷才能使用");
+				if(!disable){		//订单中没有牙刷
+					flag = false;
 				}
 			}
+			if(flag){
+				list.add(couponItemDto);
+			}
 		}
+		/*插入优惠券*/
 		dto.setCouponItems(list);
 
 		dto.setCartId(cartIds);// 购物车ID