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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
cabbage 2025-06-20 14:23:38 +08:00
parent ec017257eb 00fffa4c93
commit c0509060ee
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,7 +242,15 @@ public class ApiOrderController extends BaseController {
orderQueryWrapper.eq(SaOrder::getOrderCode, orderCode).and(wrapper -> wrapper.eq(SaOrder::getPkMember, userId).or().eq(SaOrder::getPkCreator, userId)); orderQueryWrapper.eq(SaOrder::getOrderCode, orderCode).and(wrapper -> wrapper.eq(SaOrder::getPkMember, userId).or().eq(SaOrder::getPkCreator, userId));
SaOrder saOrder = iSaOrderService.getOne(orderQueryWrapper); SaOrder saOrder = iSaOrderService.getOne(orderQueryWrapper);
if (null != saOrder) { if (null != saOrder) {
if (EOrderStatus.DELIVERED.getValue() != saOrder.getOrderStatus()) { List<SaOrderItems> itemList = iSaOrderItemsService.queryDeliverByOrder(saOrder.getPkId());
boolean statusFlag = false;
for (SaOrderItems item : itemList) {
log.info("orderItem status : {}", item.getOrderStatus());
if (EOrderStatus.DELIVERED.getValue() != item.getOrderStatus()) {
statusFlag = true;
}
}
if (statusFlag) {
// 订单状态不为待收货 // 订单状态不为待收货
return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_STATUS_NOT)); return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_STATUS_NOT));
} }

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

@ -1015,7 +1015,7 @@
<!-- 查询订单发货信息 --> <!-- 查询订单发货信息 -->
<select id="queryDeliverByOrder" resultMap="SaOrderItems"> <select id="queryDeliverByOrder" resultMap="SaOrderItems">
select distinct soi.logistics_code, soi.logistics_company select distinct soi.logistics_code, soi.logistics_company, soi.ORDER_STATUS
from sa_order_items soi from sa_order_items soi
where soi.del_flag = 0 where soi.del_flag = 0
and soi.pk_order = #{pkOrder} and soi.pk_order = #{pkOrder}