1

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

@@ -262,10 +262,9 @@ public class OrderServiceImpl implements OrderService {
 					+ " where sod.sSalesOrderID = ?";
 			orderDtlList = jdbcTemplate.queryForList(sql2, salesOrderId);
 		}
-		String sqlPay = "" + "select " + "sum(case when sPayTypeID = '1' then nPayAmount else 0 end) nCashPayAmount, "
-				+ "sum(case when sPayTypeID = 'WxPay' then nPayAmount else 0 end) nWxPayAmount, "
-				+ "sum(case when sPayTypeID = 'Coupon' then nPayAmount else 0 end) nCouponPayAmount, "
-				+ "sum(nPayAmount) nTotalPayAmount " + "from tSalesOrderPay where sSalesOrderID = ?";
+		String sqlPay = "select sPayTypeID, sPayType, nPayAmnount, sOutTradeNO, sStatusID = case when nTag&2=2 then '1' else '0' end, sStatus = case when nTag&2=2 then '已付款' else '未付款' end "
+		              + "from tSalesOrderPay "
+		              + "where sSalesOrderID = ? ";
 		Map<String, Object> payMap = jdbcTemplate.queryForMap(sqlPay, salesOrderId);
 		payMap.put("nOrderTotalAmount", orderMap.get("nTotalSaleAmount"));
 		return Rjx.jsonOk().set("payData", payMap).set("list", orderMap).set("detail", orderDtlList).toJson();