x

src/main/java/com/egolm/oms/service/impl/OrderServiceImpl.java

@@ -289,7 +289,18 @@ public class OrderServiceImpl implements OrderService {
 				+ "left join V_GetminAgentGoodsPic agp on agp.nAgentID = sosd.nAgentID and agp.nGoodsID = sosd.nGoodsID and agp.sPicTypeID = 1 where sosd.sSubOrderID  = ?";
 		List<Map<String, Object>> dtlList = jdbcTemplate.queryForList(sql, subOrderID);
 		Map<String, Object> deliver = jdbcTemplate.queryForMap("SELECT sum(a.nNum) nTotalCount, sum(a.nPrice * a.nNum) nTotalAmount FROM tSalesOrderDeliverSubDtl a where	a.sSubOrderID = ?", subOrderID);
-		return Rjx.jsonOk().set("deliver", deliver).set("order", orderMap).set("subOrder", subOrderMap).set("list", dtlList).toJson();
+		
+		
+		
+		
+		
+		
+		
+		String sql3 = "select sSubOrderID, nOrderMoney, nOrderNum, nPickupNum, sExpressNO, sExpressName from tSalesOrderDeliverSub where nTag&1 = 0 and  sSubOrderID = ?";
+		List<Map<String, Object>> deliverSubList = jdbcTemplate.queryForList(sql3, subOrderID);
+		
+		
+		return Rjx.jsonOk().set("deliver", deliver).set("deliverList", deliverSubList).set("order", orderMap).set("subOrder", subOrderMap).set("list", dtlList).toJson();
 	}
 
 	@Override