From 4b2e26d0462fd625658e77a31ed666d57524cf88 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 17 Jan 2022 15:33:02 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=81.merchant?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/service/WxMerchantService.java | 2 ++ .../iformall/service/impl/WxCouponOrderServiceImpl.java | 3 ++- .../com/iformall/service/impl/WxMerchantServiceImpl.java | 8 +++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 8ef51024c..d87a7522b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -188,5 +188,7 @@ public interface WxMerchantService { Map detailByShopId(TenantEntity tenantInfo, Long shopId); + List newFindWithShopByCouponId(TenantEntity tenantInfo, Long couponId); + List newFindByCouponId(TenantEntity tenantInfo, Long couponId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 31caf143c..e4159aa07 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -647,8 +647,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { cvo.setPickStartDate(coupon.getPickStartDate()); cvo.setPickEndDate(coupon.getPickEndDate()); cvo.setAutoRefund(coupon.getAutoRefund()); + cvo.setMerchantVoList(wxMerchantService.newFindWithShopByCouponId(cvo,coupon.getId())); } - cvo.setMerchantVoList(wxMerchantService.newFindByCouponId(cvo,cvo.getCouponId())); return cvo; } catch (IllegalAccessException | InvocationTargetException e) { logger.error("getCouponOrderCVo error.",e); @@ -785,6 +785,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { cvo.setValidStartDate(coupon.getValidStartDate()); cvo.setValidEndDate(coupon.getValidEndDate()); cvo.setAutoRefund(coupon.getAutoRefund()); + cvo.setMerchantVoList(wxMerchantService.newFindByCouponId(cvo,coupon.getId())); } WxCouponCar couponCar= couponCarMap.get(cvo.getCouponId()); if (null != couponCar) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index a339be149..8251e3b60 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1196,11 +1196,17 @@ public class WxMerchantServiceImpl implements WxMerchantService { return null; } + @Override + public List newFindWithShopByCouponId(TenantEntity tenantInfo, Long couponId) { + List wxMerchantVoList = this.newFindByCouponId(tenantInfo, couponId); + handleShopVo(tenantInfo,wxMerchantVoList); + return wxMerchantVoList; + } + @Override public List newFindByCouponId(TenantEntity tenantInfo, Long couponId) { List merchantIds = wxCouponMerchantMapper.findMerchantByProductId(tenantInfo.getTenantId(), couponId); List wxMerchantVoList = wxMerchantMapper.newFindListCVo(tenantInfo.getTenantId(),merchantIds); - handleShopVo(tenantInfo,wxMerchantVoList); return wxMerchantVoList; }