diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbOrderInfoMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbOrderInfoMapper.java index eeb986a..ad45837 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbOrderInfoMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbOrderInfoMapper.java @@ -48,6 +48,8 @@ public interface TbOrderInfoMapper { List selectSkuByOrderId(String orderId); + List selectSkuByOrderIdAndType(String orderId); + TbOrderInfo selectById(Integer id); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java index 05a136e..44c3691 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -909,11 +909,21 @@ public class OrderService { orderInfo.setImgUrl("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240223/a04e0d3beef74d099ebd0fd1f7c41873.jpg"); } - List skuInfoPos=tbOrderInfoMapper.selectSkuByOrderId(orderInfo.getId().toString()); - if(Objects.isNull(skuInfoPos)||skuInfoPos.size()<0){ - skuInfoPos=new ArrayList<>(); + + if(orderInfo.getOrderType().equals("return")){ + List skuInfoPos=tbOrderInfoMapper.selectSkuByOrderIdAndType(orderInfo.getId().toString()); + if(Objects.isNull(skuInfoPos)||skuInfoPos.size()<0){ + skuInfoPos=new ArrayList<>(); + } + orderInfo.setSkuInfos(skuInfoPos); + }else { + List skuInfoPos=tbOrderInfoMapper.selectSkuByOrderId(orderInfo.getId().toString()); + if(Objects.isNull(skuInfoPos)||skuInfoPos.size()<0){ + skuInfoPos=new ArrayList<>(); + } + orderInfo.setSkuInfos(skuInfoPos); } - orderInfo.setSkuInfos(skuInfoPos); + orderInfo.setZdNo("POS"); orderInfo.setNames(orderInfo.getProductName() == null ? new String[]{""} : orderInfo.getProductName().split(",")); } diff --git a/src/main/resources/mapper/TbOrderInfoMapper.xml b/src/main/resources/mapper/TbOrderInfoMapper.xml index f50a2b4..7b74a28 100644 --- a/src/main/resources/mapper/TbOrderInfoMapper.xml +++ b/src/main/resources/mapper/TbOrderInfoMapper.xml @@ -610,5 +610,22 @@ select * from tb_order_info where trade_day = #{day} and table_id = #{masterId} + +