1

src/main/java/com/egolm/shop/api/service/impl/OrderServiceImpl.java

@@ -383,6 +383,18 @@ public class OrderServiceImpl implements OrderService {
 				subOrderID);
 		String sql3 = "select sSubOrderID, nOrderMoney, sAocOrderID, sAocOrderNumber, nOrderNum, nPickupNum, sExpressNO, sExpressName from tSalesOrderDeliverSub where nTag&1 = 0 and  sSubOrderID = ?";
 		List<Map<String, Object>> deliverSubList = jdbcTemplate.queryForList(sql3, subOrderID);
+		
+		Map<String, Object> payMap = new HashMap<String,Object>();
+		try {
+			String sqlPay = "select sPayTypeID, sPayType, nPayAmount, sOutTradeNO, sTransTraceNO, dPayDateTime, sStatusID = case when nTag&2=2 then '1' else '0' end, sStatus = case when nTag&2=2 then '已付款' else '未付款' end "
+			              + "from tSalesOrderPay "
+			              + "where sSalesOrderID = ? ";
+			payMap = jdbcTemplate.queryForMap(sqlPay, subOrderMap.get("sSalesOrderID"));
+			payMap.put("nOrderTotalAmount", orderMap.get("nTotalSaleAmount"));
+		} catch (Exception e) { 
+		}
+		
+		
 		return Rjx.jsonOk().set("deliver", deliver).set("deliverList", deliverSubList).set("order", orderMap)
 				.set("subOrder", subOrderMap).set("list", dtlList).toJson();
 	}