Browse Source

Merge branch 'test' of http://git.jishutao.com/jishutao/kede-server.git into test

limin 7 years ago
parent
commit
b6dc5f8009

+ 5 - 1
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1152,7 +1152,11 @@
   	<if test="starTime !=null and endTime !=null">
   	and a.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
-  	order by a.order_status,a.create_time desc
+  	order by 
+  	<if test="specially == 4">
+  	a.process_status,
+  	</if>
+  	a.order_status,a.create_time desc
   	<if test="page_sql!=null">
 			${page_sql}
 	</if>

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -684,7 +684,7 @@
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>
     <if test="name != null">
-  	and a.commodity_name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
+  	and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
   	<if test="orderNo != null">
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
@@ -725,7 +725,7 @@
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>
     <if test="name != null">
-  	and a.commodity_name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
+  	and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
   	<if test="orderNo != null">
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}

+ 1 - 1
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -41,7 +41,7 @@ public class OrderDunTask {
 	 * 每天凌晨2点轮询处理需要催款的信息
 	 */
 	
-	@Scheduled(cron = "0 27 17  * * ?") 
+	@Scheduled(cron = "0 0 11  * * ?") 
 	@RequestMapping(value = "/open/updateorderDun", method = RequestMethod.GET)
   	@Transactional(rollbackFor=Exception.class)
 	public void updateorderDun(){