Browse Source

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

anderx 6 years ago
parent
commit
599b82b6b2

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

@@ -1209,7 +1209,8 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	left join admin f on e.initiate=f.id
   	</if>
   	<if test="specially == 4">
-  	left join (select * from t_order_task where super_id is null )  e on e.order_no=a.order_no
+  	left join (select min(id)id,order_no from t_order_task where main=1 group by order_no) ex on ex.order_no=a.order_no
+	left join t_order_task  e on e.id = ex.id
   	left join admin f on e.task_receiver=f.id
   	left join (select order_no from new_order_change group by order_no)g on a.order_no=g.order_no
   	</if>

+ 9 - 2
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -548,7 +548,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			pushTaskAndDun(nob.getId(),nob.getOrderNo());
 		}else if (nob.getType()==OrderChangeType.JJEBG.getCode()) {
 			o.setTotalAmount(nob.getTotalAmount());
-		}else if (nob.getType()==OrderChangeType.CB.getCode()||nob.getType()==OrderChangeType.ZS.getCode()) {
+		}else if (nob.getType()==OrderChangeType.CB.getCode()){
+			o.setTotalAmount(nob.getTotalAmount());
+			pushTaskAndDun(nob.getId(),nob.getOrderNo());
+		}else if (nob.getType()==OrderChangeType.ZS.getCode()) {
 			pushTaskAndDun(nob.getId(),nob.getOrderNo());
 		}
 		tOrderNewMapper.updateByPrimaryKeySelective(o);
@@ -594,9 +597,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			nd.setWaitDay(cd.getWaitDay());
 			nd.setStartTime(cd.getStartTime());
 			nd.setEffectiveCount(cd.getEffectiveCount());
+			if (cd.getDunType()==1) {
+				nd.setStatus(1);
+				nd.setStartTime(new Date());
+			}
 			newOrderDunMapper.insertSelective(nd);
 			}else if (cd.getType()==2) {
-				nd.setId(cd.getTid());
+				nd.setId(cd.getDid());
 				nd.setMoney(cd.getMoney());
 				newOrderDunMapper.updateByPrimaryKeySelective(nd);
 			}else if(cd.getType()==3) {