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-tool/src/main/java/com/iamberry/wechat/tools/ResultInfo.java

@@ -105,7 +105,7 @@ public class ResultInfo {
 	/**
 	 * 订单详情
 	 */
-	public static String ORDER_DETAIL = "http://s.iamberry.com/soodo/wechat/order-details.html?orderId=";
+	public static String ORDER_DETAIL = "https://s.iamberry.com/soodo/wechat/order-details.html?orderId=";
 	/**
 	 * <礼品卡>推荐人推送消息 跳转页面
 	 */

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

@@ -35,7 +35,6 @@ public class OrderCloseListener {
 	
 	public void closeOrderByCreateTime() {
 		/*System.out.println("走一走关闭订单的这个");
-		
 		Order order = new Order();
 		//获取规则表中对于订单关闭限定的时间
 		ShopSystemRule shopSystemRule = adminOrderService.getReluByRid(104);
@@ -44,12 +43,11 @@ public class OrderCloseListener {
 		}
 		//获取的时间以分钟为单位，这里转换成秒，按秒计算
 		order.setDeadline((int)(shopSystemRule.getRuleNum() * 60));
-		
 		//查看待支付、创建时间过了 30分钟 的订单
 		List<Order> fiveorderList = adminOrderService.getOrderByCreateTimeAndFiveMinutes(order);
 		if (fiveorderList != null && fiveorderList.size() != 0) {
 			for (Order orders : fiveorderList) {
-//System.out.println("来发送---------");
+				//System.out.println("来发送---------");
 				//判断是否5分钟，是否已经发送过
 				if(!validateCodeMap.containsKey(orders.getSalesOrderid()) && !validateCodeMap.containsKey(orders.getSalesOpenid()) ){ //没有存在
 					//发送消息 DateTimeUtil.format(new Date(),NameUtils.DATE_TIME_FORMAT)
@@ -66,9 +64,7 @@ public class OrderCloseListener {
 			}
 		}
 		moveValidateCodeMap();
-		
-//System.out.println(validateCodeMap.size()+"这里大小咯");
-		
+		//System.out.println(validateCodeMap.size()+"这里大小咯");
 		//根据规定时间查询订单，查询出的订单都是大于45分钟的待支付订单，这时应关闭订单
 		List<Order> orderList = adminOrderService.getOrderByCreateTime(order);
 		List<String> list = new ArrayList<String>();	//大于45分钟 待支付的所有单号

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

@@ -67,8 +67,8 @@ public class OrderListener{
 					for (Order order : orderList) {
 						//修改订单表数据，并添加线下代理现金记录表数据
 						adminOrderService.updateOrderIntegral(order,agencySystemRule);
-		
-						
+
+
 					//推送消息
 						
 					//推送金额变动消息