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-core/src/main/java/com/iamberry/wechat/core/entity/WechatUtils.java

@@ -75,6 +75,7 @@ public class WechatUtils {
 		if (cookies == null) {
 			throw new UserNotLoginException();
 		}
+
 		for (Cookie cookie : cookies) {
 			if (cookie.getName().equals("WATERO_WEB_PF")) {
 				continue;

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminOrderHandlers.java

@@ -618,7 +618,7 @@ public class AdminOrderHandlers {
                         String payMoney = df.format((float)currentOrder.getSalesYetAmount()/100) + "元";
                         try {
                             sendMessageUtil.orderApplyRefund("尊敬的朵粉，您的退款申请被退回：",payMoney,itemList.get(0).getItemProductName(),orderId,
-                                    "请确认您的退款申请信息填写无误。\\r\\n如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",currentOrder.getSalesOpenid(),null);
+                                    "请确认您的退款申请信息填写无误。\\n如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",currentOrder.getSalesOpenid(),ResultInfo.ORDER_DETAIL + orderId);
                         } catch (Exception e) {
                             logger.info("订单号："+ orderId +"的订单驳回退款，发送微信消息失败!");
                         }
@@ -666,7 +666,7 @@ public class AdminOrderHandlers {
                         String payMoney = df.format((float)currentOrder.getSalesYetAmount()/100) + "元";
                         try {
                             sendMessageUtil.orderApplyRefund("尊敬的朵粉，您的退款申请已通过：",payMoney,itemList.get(0).getItemProductName(),orderId,
-                                    "退款金额将在三个工作日内退款到您的支付账户。\\r\\n如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",currentOrder.getSalesOpenid(),null);
+                                    "退款金额将在三个工作日内退款到您的支付账户。\\n如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",currentOrder.getSalesOpenid(),ResultInfo.ORDER_DETAIL + orderId);
                         } catch (Exception e) {
                             logger.info("订单号："+ orderId +"的订单同意退款，发送微信消息失败!");
                         }

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

@@ -122,8 +122,8 @@ public class OrderHandler {
 
 		OrderPayDto dto = new OrderPayDto();
 		// 用户信息
-		Member member = WechatUtils.getUserBySession(request);
-		member = memberService.getMemberByUserId(member.getUserId());
+		String openId  = WechatUtils.getUserBySession(request).getUserOpenid();
+		Member member = memberService.getMemberByUserOpenId(openId);
 		String cartIds = request.getParameter("cartIds");
 		if (cartIds == null) {
 			msg.setMessage(ResultInfo.cartEmptyError);
@@ -166,7 +166,7 @@ public class OrderHandler {
 
 		List<CartDto> tempCarts = new ArrayList<CartDto>();
 		for (CartDto cartDto : cartDtos) {
-			if (cartDto.getProductStatus() != null && cartDto.getProductStatus().intValue() == 1) {
+			if (cartDto.getProductStatus() != null ) {
 				total += cartDto.getCartNum() * cartDto.getProductPrice();
 				sum++;
 				tempCarts.add(cartDto);
@@ -178,12 +178,10 @@ public class OrderHandler {
 				}
 			}
 		}
-
 		if (sum <= 0) {
 			msg.setMessage(ResultInfo.cartEmptyError);
 			return msg;
 		}
-
 		//查询所有优惠券
 		CouponItemDto cDto = new CouponItemDto();
 		cDto.setUseropenid(member.getUserOpenid());

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

@@ -34,7 +34,7 @@ public class OrderCloseListener {
 	public final static Map<String, Object> validateCodeMap = new ConcurrentHashMap<>(); 
 	
 	public void closeOrderByCreateTime() {
-		System.out.println("走一走关闭订单的这个");
+		/*System.out.println("走一走关闭订单的这个");
 		
 		Order order = new Order();
 		//获取规则表中对于订单关闭限定的时间
@@ -91,7 +91,7 @@ public class OrderCloseListener {
 		//修改优惠券状态
 		if (itemList.size()> 0) {
 			couponItemService.updateCouponItemList(itemList);
-		}
+		}*/
 	}
 	
 	//时间大于5分钟的，全部都 移除.......