From 3ee3c14f72ad47a7ca80f362ae4d258705aca2e5 Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 2 Mar 2024 19:56:52 +0800 Subject: [PATCH] fix --- .../market/WxCashBackActivityController.java | 2 +- .../domain/po/WxCashBackActivityMerchant.java | 4 ++++ .../service/WxCashBackActivityService.java | 2 +- .../impl/WxCashBackActivityServiceImpl.java | 24 +++++++++++++++++-- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java index 8d85e1065..72545e3e2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java @@ -178,7 +178,7 @@ public class WxCashBackActivityController extends BaseController { TenantEntity tenantInfo = getTenantInfo(); WxCashBackActivity activity = wxCashBackActivityService.getActivityById(id, tenantInfo.getTenantId()); activity.setItemList(wxCashBackActivityService.getActivityItems(id, tenantInfo.getTenantId())); - activity.setMerchantList(wxCashBackActivityService.getActivityMerchants(id, tenantInfo.getTenantId())); + activity.setMerchantList(wxCashBackActivityService.getActivityMerchants(id, tenantInfo.getTenantId(),true)); return new ResultData(activity); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityMerchant.java index 6e0709e63..432720714 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityMerchant.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; @@ -24,4 +25,7 @@ public class WxCashBackActivityMerchant extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "最低订单金额", name = "merchantId") private Long merchantId; + @TableField(exist = false) + private WxMerchant merchant; + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCashBackActivityService.java b/mallinkService/src/main/java/com/iformall/service/WxCashBackActivityService.java index b72539cda..ee0ce7e9b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCashBackActivityService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCashBackActivityService.java @@ -61,7 +61,7 @@ public interface WxCashBackActivityService { List getActivityItems(Long activityId,String tenantId); - List getActivityMerchants(Long activityId,String tenantId); + List getActivityMerchants(Long activityId,String tenantId,boolean hasMerchantInfo); void exportData(List objectList,String sheetName,Class objectCalss,HttpServletRequest request, HttpServletResponse response); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java index e2d43fb66..f8d046f56 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java @@ -304,11 +304,31 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService } @Override - public List getActivityMerchants(Long activityId, String tenantId) { + public List getActivityMerchants(Long activityId, String tenantId,boolean hasMerchantInfo) { WxCashBackActivityMerchant m = new WxCashBackActivityMerchant(); m.setActivityId(activityId); m.setTenantId(tenantId); - return wxCashBackActivityMerchantMapper.findList(m); + List amlist = wxCashBackActivityMerchantMapper.findList(m); + if (hasMerchantInfo && null != amlist && amlist.size() > 0 ) { + WxMerchant mq = new WxMerchant(); + mq.setTenantId(tenantId); + List mlist = wxMerchantMapper.findList(mq); + Map merchantMap = new HashMap(); + if (null != mlist && mlist.size() > 0 ) { + for (WxMerchant _m : mlist) { + merchantMap.put(_m.getId(), _m); + } + } + for (WxCashBackActivityMerchant am : amlist) { + if (null != am.getMerchantId()) { + WxMerchant _mm = merchantMap.get(am.getMerchantId()); + if (null != _mm) { + am.setMerchant(_mm); + } + } + } + } + return amlist; } @Override