Commit cbb45ef6 authored by 张永's avatar 张永

1

parent 537acccb
...@@ -262,11 +262,16 @@ public class OrderServiceImpl implements OrderService { ...@@ -262,11 +262,16 @@ public class OrderServiceImpl implements OrderService {
+ " where sod.sSalesOrderID = ?"; + " where sod.sSalesOrderID = ?";
orderDtlList = jdbcTemplate.queryForList(sql2, salesOrderId); orderDtlList = jdbcTemplate.queryForList(sql2, salesOrderId);
} }
String sqlPay = "select sPayTypeID, sPayType, nPayAmount, sOutTradeNO, sStatusID = case when nTag&2=2 then '1' else '0' end, sStatus = case when nTag&2=2 then '已付款' else '未付款' end " Map<String, Object> payMap = new HashMap<String,Object>();
+ "from tSalesOrderPay " try {
+ "where sSalesOrderID = ? "; String sqlPay = "select sPayTypeID, sPayType, nPayAmount, sOutTradeNO, sStatusID = case when nTag&2=2 then '1' else '0' end, sStatus = case when nTag&2=2 then '已付款' else '未付款' end "
Map<String, Object> payMap = jdbcTemplate.queryForMap(sqlPay, salesOrderId); + "from tSalesOrderPay "
payMap.put("nOrderTotalAmount", orderMap.get("nTotalSaleAmount")); + "where sSalesOrderID = ? ";
payMap = jdbcTemplate.queryForMap(sqlPay, salesOrderId);
payMap.put("nOrderTotalAmount", orderMap.get("nTotalSaleAmount"));
} catch (Exception e) {
}
return Rjx.jsonOk().set("payData", payMap).set("list", orderMap).set("detail", orderDtlList).toJson(); return Rjx.jsonOk().set("payData", payMap).set("list", orderMap).set("detail", orderDtlList).toJson();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment