11

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

@@ -355,20 +355,20 @@ public class OrderServiceImpl implements OrderService {
 					"where sod.sSalesOrderID = ? "; 
 			orderDtlList = readJdbcTemplate.queryForList(sql2, salesOrderId);
 		}
-	 	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 "
 					+ ", create_time = replace(convert(varchar(10),dCreateDate,120),'-','') + replace(convert(varchar(10),dCreateDate,108),':','') " 
 					+ "from tSalesOrderPay "
 			              + "where sSalesOrderID = ?  and sOutTradeNO not like '%_D' ";
-			payMap = readJdbcTemplate.queryForMap(sqlPay, salesOrderId);
-			payMap.put("nOrderTotalAmount", orderMap.get("nTotalSaleAmount"));
+			payMap = readJdbcTemplate.queryForList(sqlPay, salesOrderId);
+			//payMap.put("nOrderTotalAmount", orderMap.get("nTotalSaleAmount"));
 		} catch (Exception e) { 
 		} 
 		 
 		Map<String,Object> appOrderPayCountdownMap = this.getAgentSystemCtrlMap("AppOrderPayCountdown", agentID);
 		
-		return Rjx.jsonOk().set("payData", payMap).set("list", orderMap).set("detail", orderDtlList).set("AppOrderPayCountdown", appOrderPayCountdownMap).toJson();
+		return Rjx.jsonOk().set("payData", payMap).set("list", orderMap).set("nOrderTotalAmount", orderMap.get("nTotalSaleAmount")).set("detail", orderDtlList).set("AppOrderPayCountdown", appOrderPayCountdownMap).toJson();
 	}
 
 	@Override