From 05ac6a573311cad97a67efb8052f7ca47f3074ec Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 15 Feb 2022 11:10:34 +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 | 3 ++- 1 file changed, 2 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 e9f8b9a0f..e7c52886a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -2252,6 +2252,7 @@ public class WxOrderServiceImpl implements WxOrderService { WxCouponOrder couponOrder = wxCouponOrderMapper.findDetailOfCUser(couponOrderList.get(0).getId(), tenantEntity.getTenantId()); vo.initByCouponOrder(couponOrder); } + vo.setMerchantVoList(wxMerchantService.findMerchantListByProduct(tenantEntity, order.getProductId(), false)); voList.add(vo); } return voList; @@ -3090,7 +3091,7 @@ public class WxOrderServiceImpl implements WxOrderService { recordQ.updateTenantInfo(border); recordQ.setComposeOrderId(wxBatchOrder.getId()); List listOfCUser = wxOrderMapper.findListOfCUser(recordQ); - List wxOrderCouponVos = toOrderCouponVoList(border, listOfCUser, true); + List wxOrderCouponVos = toWxOrderCouponVoList(border, listOfCUser); wxBatchOrder.setOrders(wxOrderCouponVos); } return wxBatchOrder;