111

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

@@ -589,19 +589,19 @@ public class OrderServiceImpl implements OrderService {
 		List<Map<String, Object>> deliverSubList = readJdbcTemplate.queryForList(sql3, subOrderID);
 		
   
-		Map<String, Object> payMap = new HashMap<String,Object>();
+		List<Map<String, Object>> payMap = new ArrayList<Map<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 = ? and sOutTradeNO not like '%_D' ";
-			payMap = readJdbcTemplate.queryForMap(sqlPay, subOrderMap.get("sSalesOrderID"));
-			payMap.put("nOrderTotalAmount", orderMap.get("nTotalSaleAmount"));
+			payMap = readJdbcTemplate.queryForList(sqlPay, subOrderMap.get("sSalesOrderID"));
+			//payMap.put("nOrderTotalAmount", orderMap.get("nTotalSaleAmount"));
 		} catch (Exception e) { 
 		} 
 		
 		Map<String,Object> appOrderPayCountdownMap = this.getAgentSystemCtrlMap("AppOrderPayCountdown", agentID);
 		
-		return Rjx.jsonOk().set("deliver", deliver).set("deliverList", deliverSubList).set("order", orderMap).set("payData", payMap)
+		return Rjx.jsonOk().set("deliver", deliver).set("deliverList", deliverSubList).set("order", orderMap).set("payData", payMap).set("nOrderTotalAmount", orderMap.get("nTotalSaleAmount"))
 				.set("subOrder", subOrderMap).set("list", dtlList).set("AppOrderPayCountdown", appOrderPayCountdownMap).toJson();
 	}