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-wechat-web/src/main/resources/iamberry-wechat-service-orderTesk.xml

@@ -22,8 +22,8 @@
 	<!-- 30天后返利的定时任务end -->
 	
 	<!-- 45分钟后订单关闭start -->
-	<bean id="closeOrder"
-		class="com.iamberry.wechat.handles.order.orderListener.OrderCloseListener" ></bean>
+	<!--<bean id="closeOrder"
+		class="com.iamberry.wechat.handles.order.orderListener.OrderCloseListener" ></bean>-->
 		
 	<!--<bean id="closeOrderTask"
 		class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
@@ -31,12 +31,11 @@
 		<property name="targetMethod" value="closeOrderByCreateTime" />
 		 <property name="concurrent" value="false" />
 	</bean>-->
-	
 	<!--<bean id="closeOrderTime"
 		class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
 		<property name="jobDetail" ref="closeOrderTask" />-->
 		<!-- cron表达式  秒 分 时 日 月  星期 年-->
-		<!--<property name="cronExpression" value="0 0/50 * * * ?" />
+		<!--<property name="cronExpression" value="0 0/3 * * * ?" />
 	</bean>-->
 	<!-- 45分钟后订单关闭end -->
 	

tooth-wechat-web/src/main/resources/iamberry-wechat-web-ioc.xml

@@ -54,7 +54,7 @@
     <task:annotation-driven/>
     
     <!-- 将30天后奖励积分的定时任务的xml引入-->
-	<!--<import resource="classpath:iamberry-wechat-service-orderTesk.xml"></import>-->
+	<import resource="classpath:iamberry-wechat-service-orderTesk.xml"></import>
 	
 	<import resource="classpath:iamberry-wechat-service-datasource.xml"/>