Skip to content

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

需求 #16303

parent 4905b68b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
src/main/java/com/egolm/shop/api/service/impl/OrderServiceImpl.java
View file @ d84bef4b
...@@ -326,6 +326,7 @@ public class OrderServiceImpl implements OrderService { ...@@ -326,6 +326,7 @@ public class OrderServiceImpl implements OrderService {
" left join tSalesOrderSubDtl sos on sos.sSalesOrderID = sod.sSalesOrderID \r\n" + " left join tSalesOrderSubDtl sos on sos.sSalesOrderID = sod.sSalesOrderID \r\n" +
" and sos.sAgentContractNO = sod.sAgentContractNO \r\n" + " and sos.sAgentContractNO = sod.sAgentContractNO \r\n" +
" and sos.nGoodsID = sod.nGoodsID \r\n" + " and sos.nGoodsID = sod.nGoodsID \r\n" +
" and sos.nIdx = sod.nIdx \r\n" +
" and (sos.nTag&1 = sod.nTag&1 or sos.nTag&1-1 = sod.nTag&1-1) \r\n" + " and (sos.nTag&1 = sod.nTag&1 or sos.nTag&1-1 = sod.nTag&1-1) \r\n" +
"where sod.sSalesOrderID = ? "; "where sod.sSalesOrderID = ? ";
orderDtlList = jdbcTemplate.queryForList(sql2, salesOrderId); orderDtlList = jdbcTemplate.queryForList(sql2, salesOrderId);
......
src/main/resources/templates/redmine.html
View file @ d84bef4b
...@@ -24,8 +24,9 @@ ...@@ -24,8 +24,9 @@
</head> </head>
<body> <body>
<div id="app"> <div id="app">
<el-divider content-position="left">V1.1.6 2023-12-28</el-divider> <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>
<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>
<p class="title">1.getOrderDetail接口增加返加create_time</p> <p class="title">1.getOrderDetail接口增加返加create_time</p>
<el-divider content-position="left">V1.1.4 2023-11-28</el-divider> <el-divider content-position="left">V1.1.4 2023-11-28</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