Skip to content

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

V1.1.5

parent ac36097c
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
pom.xml
View file @ c88d178d
......@@ -207,7 +207,7 @@
</executions>
<configuration>
<repository>dockerhub.linkfern.com/b2c/shopapi</repository>
<tag>V1.1.4</tag>
<tag>V1.1.5</tag>
<buildArgs>
<JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
</buildArgs>
......
src/main/java/com/egolm/shop/api/service/impl/OrderServiceImpl.java
View file @ c88d178d
......@@ -333,7 +333,8 @@ public class OrderServiceImpl implements OrderService {
Map<String, Object> payMap = new HashMap<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 "
+ ", create_time = replace(convert(varchar(10),dCreateDate,120),'-','') + replace(convert(varchar(10),dCreateDate,108),':','') "
+ "from tSalesOrderPay "
+ "where sSalesOrderID = ? ";
payMap = jdbcTemplate.queryForMap(sqlPay, salesOrderId);
payMap.put("nOrderTotalAmount", orderMap.get("nTotalSaleAmount"));
......
src/main/resources/templates/redmine.html
View file @ c88d178d
......@@ -24,6 +24,8 @@
</head>
<body>
<div id="app">
<el-divider content-position="left">V1.1.5 2023-12-25</el-divider>
<p class="title">1.getOrderDetail接口增加返加create_time</p>
<el-divider content-position="left">V1.1.4 2023-11-28</el-divider>
<p class="title">1.需求 #16076 购物车更新数量时抛出负数异常</p>
<el-divider content-position="left">V1.1.3 2023-11-03</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