Browse Source

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

limin 7 years ago
parent
commit
f2d0e59ac9

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

@@ -1047,7 +1047,7 @@
   	,f.name as initiateName ,e.reason ,date_format(e.create_time,'%Y-%m-%d' ) as backDate,e.id as backId
   	</if>
   	<if test="specially == 4">
-  	,f.name as consultantName
+  	,f.name as consultantName,a.settlement_amount as settlementAmount
   	</if>
   	from t_order_new a  left join `user` b on a.buyer_id=b.id 
   	left join admin c on a.salesman_id=c.id
@@ -1137,6 +1137,7 @@
   	</if>
   	<if test="specially == 4">
   	and a.process_status in (4,5,6)
+  	and a.order_status not in(5,7)
   	</if>
   	<if test="specially == 5">
   	and c.department_id=(select department_id from admin where  id= #{aid,jdbcType=VARCHAR})

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

@@ -668,7 +668,7 @@
     left join admin d on a.task_receiver=d.id
     left join t_order_new e on a.order_no=e.order_no
     left join user f on e.buyer_id=f.id
-    where e.delete_sign=0 
+    where e.delete_sign=0  and e.order_status not in (5,7)
     <if test="specially == 0">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
     and a.commodity_quantity =1
@@ -709,7 +709,7 @@
   	from t_order_task a 
     left join admin d on a.task_receiver=d.id
     left join t_order_new e on a.order_no=e.order_no
-    where e.delete_sign=0 
+    where e.delete_sign=0  and e.order_status not in (5,7)
     <if test="specially == 0">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
     and a.commodity_quantity =1

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

@@ -29,8 +29,8 @@ import com.goafanti.order.enums.OrderNewState;
 import com.goafanti.order.enums.ProjectNewStage;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.impl.OrderNewServiceImpl;
-//@Component
-@Controller
+@Component
+//@Controller
 public class OrderDunTask {
 	@Autowired
 	private OrderNewService orderNewService;
@@ -41,8 +41,8 @@ public class OrderDunTask {
 	 * 每天凌晨2点轮询处理需要催款的信息
 	 */
 	
-//	@Scheduled(cron = "0 25 16  * * ?") 
-	@RequestMapping(value = "/open/updateorderDun", method = RequestMethod.GET)
+	@Scheduled(cron = "0 0 16  * * ?") 
+//	@RequestMapping(value = "/open/updateorderDun", method = RequestMethod.GET)
   	@Transactional(rollbackFor=Exception.class)
 	public void updateorderDun(){
   		try {

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -177,6 +177,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (task2.getSuperId()!=null) {//是否有父项目
 			TOrderTask task3 =tOrderTaskMapper.selectBySuperId(task2.getSuperId());
 			task3.setId(Integer.valueOf(task2.getSuperId()));
+			task3.setSuperId(null);
 			tOrderTaskMapper.updateByPrimaryKeySelective(task3);
 			TOrderTask task4 = tOrderTaskMapper.selectByPrimaryKey(Integer.valueOf(task2.getSuperId()));
 			meanwhileUpdateOrder(task4);