Skip to content

S
shop
Commit 8fd412bc authored by 张永's avatar 张永
Browse files
Options

V1.1.7

parent d84bef4b
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 9 deletions
pom.xml
View file @ 8fd412bc
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
</executions> </executions>
<configuration> <configuration>
<repository>dockerhub.linkfern.com/b2c/shopapi</repository> <repository>dockerhub.linkfern.com/b2c/shopapi</repository>
<tag>V1.1.6</tag> <tag>V1.1.7</tag>
<buildArgs> <buildArgs>
<JAR_FILE>${project.build.finalName}.jar</JAR_FILE> <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
</buildArgs> </buildArgs>
......
src/main/java/com/egolm/shop/api/service/impl/OrderServiceImpl.java
View file @ 8fd412bc
...@@ -331,7 +331,7 @@ public class OrderServiceImpl implements OrderService { ...@@ -331,7 +331,7 @@ public class OrderServiceImpl implements OrderService {
"where sod.sSalesOrderID = ? "; "where sod.sSalesOrderID = ? ";
orderDtlList = jdbcTemplate.queryForList(sql2, salesOrderId); orderDtlList = jdbcTemplate.queryForList(sql2, salesOrderId);
} }
Map<String, Object> payMap = new HashMap<String,Object>(); /* Map<String, Object> payMap = new HashMap<String,Object>();
try { 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 " 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),':','') " + ", create_time = replace(convert(varchar(10),dCreateDate,120),'-','') + replace(convert(varchar(10),dCreateDate,108),':','') "
...@@ -340,9 +340,25 @@ public class OrderServiceImpl implements OrderService { ...@@ -340,9 +340,25 @@ public class OrderServiceImpl implements OrderService {
payMap = jdbcTemplate.queryForMap(sqlPay, salesOrderId); payMap = jdbcTemplate.queryForMap(sqlPay, salesOrderId);
payMap.put("nOrderTotalAmount", orderMap.get("nTotalSaleAmount")); payMap.put("nOrderTotalAmount", orderMap.get("nTotalSaleAmount"));
} catch (Exception e) { } catch (Exception e) {
} }*/
List<Map<String, Object>> payList = 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 = ? ";
payList = jdbcTemplate.queryForList(sqlPay, salesOrderId);
if(payList != null && payList.size()>0) {
for(int i =0;i<payList.size();i++) {
Map<String, Object> payMap = payList.get(i);
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", payList).set("list", orderMap).set("detail", orderDtlList).toJson();
} }
@Override @Override
...@@ -519,18 +535,24 @@ public class OrderServiceImpl implements OrderService { ...@@ -519,18 +535,24 @@ public class OrderServiceImpl implements OrderService {
String sql3 = "select sSubOrderID, nOrderMoney, sAocOrderID, sAocOrderNumber, nOrderNum, nPickupNum, sExpressNO, sExpressName from tSalesOrderDeliverSub where nTag&1 = 0 and sSubOrderID = ?"; 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); List<Map<String, Object>> deliverSubList = jdbcTemplate.queryForList(sql3, subOrderID);
Map<String, Object> payMap = new HashMap<String,Object>(); List<Map<String, Object>> payList = new ArrayList<Map<String, Object>>();
try { 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 " 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 " + "from tSalesOrderPay "
+ "where sSalesOrderID = ? "; + "where sSalesOrderID = ? ";
payMap = jdbcTemplate.queryForMap(sqlPay, subOrderMap.get("sSalesOrderID")); payList = jdbcTemplate.queryForList(sqlPay, subOrderMap.get("sSalesOrderID"));
payMap.put("nOrderTotalAmount", orderMap.get("nTotalSaleAmount")); if(payList != null && payList.size()>0) {
for(int i =0;i<payList.size();i++) {
Map<String, Object> payMap = payList.get(i);
payMap.put("nOrderTotalAmount", orderMap.get("nTotalSaleAmount"));
}
}
} catch (Exception e) { } catch (Exception e) {
} }
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", payList)
.set("subOrder", subOrderMap).set("list", dtlList).toJson(); .set("subOrder", subOrderMap).set("list", dtlList).toJson();
} }
......
src/main/resources/templates/redmine.html
View file @ 8fd412bc
...@@ -24,7 +24,9 @@ ...@@ -24,7 +24,9 @@
</head> </head>
<body> <body>
<div id="app"> <div id="app">
<el-divider content-position="left">V1.1.6 2024-1-4</el-divider> <el-divider content-position="left">V1.1.7 2024-1-11</el-divider>
<p class="title">1.订单详情返回payData改为多条返回</p>
<el-divider content-position="left">V1.1.6 2024-1-4</el-divider>
<p class="title">1.Bug #16271 增加了处理非当前经销商的数据，但是用户无法知道商品为啥被删掉了</p> <p class="title">1.Bug #16271 增加了处理非当前经销商的数据，但是用户无法知道商品为啥被删掉了</p>
<p class="title">1.需求 #16303 订单详情显示重复商品BUG</p> <p class="title">1.需求 #16303 订单详情显示重复商品BUG</p>
<el-divider content-position="left">V1.1.5 2023-12-25</el-divider> <el-divider content-position="left">V1.1.5 2023-12-25</el-divider>
......
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