angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity

## 自助撤单能看到分公司报的进提货的订单（358）；

This commit is contained in:
cabbage 2025-08-21 15:07:17 +08:00
parent 3d10722857
commit 215cdd89aa
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java
View File

@ -61,8 +61,6 @@ public class ApiOrderController extends BaseController {
private ISaDeliverService iSaDeliverService; private ISaDeliverService iSaDeliverService;
@Autowired @Autowired
private IOrderBusinessService iOrderBusinessService; private IOrderBusinessService iOrderBusinessService;
@Autowired
private ISaDeliverItemsService saDeliverItemsService;
@DubboReference @DubboReference
ICurrencyServiceApi iCurrencyServiceApi; ICurrencyServiceApi iCurrencyServiceApi;
@ -537,8 +535,6 @@ public class ApiOrderController extends BaseController {
if (null != param.getCreationTimeEnd()) { if (null != param.getCreationTimeEnd()) {
param.setCreationTimeEnd(DateUtils.getEndTime(param.getCreationTimeEnd())); param.setCreationTimeEnd(DateUtils.getEndTime(param.getCreationTimeEnd()));
} }
// 会员ID
Long userId = SecurityUtils.getUserId();
// 返回的订单数据 // 返回的订单数据
List<MyOrderVO> myOrderList = new ArrayList<>(); List<MyOrderVO> myOrderList = new ArrayList<>();

2
bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml
View File

@ -529,7 +529,7 @@
<choose> <choose>
<when test="param.orderStatus == 1"> <when test="param.orderStatus == 1">
<!-- 前台如果查询待发货，需要包括已合单 --> <!-- 前台如果查询待发货，需要包括已合单 -->
and soi.order_status in (1, 2) and soi.order_status in (1, 2, 6)
</when> </when>
<otherwise> <otherwise>
and soi.order_status = #{param.orderStatus} and soi.order_status = #{param.orderStatus}