From 89a3142def0470a7becc421af972ac4db13063ff Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 14 Feb 2022 17:08:36 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=82=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxOrderServiceImpl.java | 4 +++- .../src/main/resources/mapper/WxBatchOrderMapper.xml | 3 +++ mallinkService/src/main/resources/mapper/WxOrderMapper.xml | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index e39f70caf..b4bf37699 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -3070,7 +3070,9 @@ public class WxOrderServiceImpl implements WxOrderService { batchOrderQ.setCUserId(wxOrder.getCUserId()); batchOrderQ.setPayVendor(wxOrder.getPayVendor()); List composeOrderIds = wxOrderMapper.getComposeOrderIds(wxOrder); - if(composeOrderIds != null && composeOrderIds.size() > 0){ + if(composeOrderIds == null || composeOrderIds.isEmpty()){ + batchOrderQ.setId(-999L); + }else{ batchOrderQ.setIds(composeOrderIds); } PageInfo page = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxBatchOrderMapper.findCOrderList(batchOrderQ)); diff --git a/mallinkService/src/main/resources/mapper/WxBatchOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxBatchOrderMapper.xml index 1e91f81a7..e5d86842d 100644 --- a/mallinkService/src/main/resources/mapper/WxBatchOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBatchOrderMapper.xml @@ -71,6 +71,9 @@ and o.`parent_tenant_id` = #{parentTenantId} + + and o.`id` = #{id} + and o.pay_vendor = #{payVendor} diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 9cd7a7348..3e6587806 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -1128,6 +1128,7 @@