diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java index 3794ee0e..828a2bc2 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java @@ -61,8 +61,6 @@ public class ApiOrderController extends BaseController { private ISaDeliverService iSaDeliverService; @Autowired private IOrderBusinessService iOrderBusinessService; - @Autowired - private ISaDeliverItemsService saDeliverItemsService; @DubboReference ICurrencyServiceApi iCurrencyServiceApi; @@ -537,8 +535,6 @@ public class ApiOrderController extends BaseController { if (null != param.getCreationTimeEnd()) { param.setCreationTimeEnd(DateUtils.getEndTime(param.getCreationTimeEnd())); } - // 会员ID - Long userId = SecurityUtils.getUserId(); // 返回的订单数据 List myOrderList = new ArrayList<>(); diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml index d4bcb027..b56c51d6 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml @@ -529,7 +529,7 @@ - and soi.order_status in (1, 2) + and soi.order_status in (1, 2, 6) and soi.order_status = #{param.orderStatus}