| @@ -178,7 +178,7 @@ public class WxCashBackActivityController extends BaseController { | |||||
| TenantEntity tenantInfo = getTenantInfo(); | TenantEntity tenantInfo = getTenantInfo(); | ||||
| WxCashBackActivity activity = wxCashBackActivityService.getActivityById(id, tenantInfo.getTenantId()); | WxCashBackActivity activity = wxCashBackActivityService.getActivityById(id, tenantInfo.getTenantId()); | ||||
| activity.setItemList(wxCashBackActivityService.getActivityItems(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); | return new ResultData(activity); | ||||
| } | } | ||||
| @@ -1,5 +1,6 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableField; | |||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import lombok.Data; | import lombok.Data; | ||||
| @@ -24,4 +25,7 @@ public class WxCashBackActivityMerchant extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "最低订单金额", name = "merchantId") | @io.swagger.annotations.ApiModelProperty(value = "最低订单金额", name = "merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| @TableField(exist = false) | |||||
| private WxMerchant merchant; | |||||
| } | } | ||||
| @@ -61,7 +61,7 @@ public interface WxCashBackActivityService { | |||||
| List<WxCashBackActivityItem> getActivityItems(Long activityId,String tenantId); | List<WxCashBackActivityItem> getActivityItems(Long activityId,String tenantId); | ||||
| List<WxCashBackActivityMerchant> getActivityMerchants(Long activityId,String tenantId); | |||||
| List<WxCashBackActivityMerchant> getActivityMerchants(Long activityId,String tenantId,boolean hasMerchantInfo); | |||||
| void exportData(List objectList,String sheetName,Class objectCalss,HttpServletRequest request, HttpServletResponse response); | void exportData(List objectList,String sheetName,Class objectCalss,HttpServletRequest request, HttpServletResponse response); | ||||
| @@ -304,11 +304,31 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService | |||||
| } | } | ||||
| @Override | @Override | ||||
| public List<WxCashBackActivityMerchant> getActivityMerchants(Long activityId, String tenantId) { | |||||
| public List<WxCashBackActivityMerchant> getActivityMerchants(Long activityId, String tenantId,boolean hasMerchantInfo) { | |||||
| WxCashBackActivityMerchant m = new WxCashBackActivityMerchant(); | WxCashBackActivityMerchant m = new WxCashBackActivityMerchant(); | ||||
| m.setActivityId(activityId); | m.setActivityId(activityId); | ||||
| m.setTenantId(tenantId); | m.setTenantId(tenantId); | ||||
| return wxCashBackActivityMerchantMapper.findList(m); | |||||
| List<WxCashBackActivityMerchant> amlist = wxCashBackActivityMerchantMapper.findList(m); | |||||
| if (hasMerchantInfo && null != amlist && amlist.size() > 0 ) { | |||||
| WxMerchant mq = new WxMerchant(); | |||||
| mq.setTenantId(tenantId); | |||||
| List<WxMerchant> mlist = wxMerchantMapper.findList(mq); | |||||
| Map<Long,WxMerchant> merchantMap = new HashMap<Long,WxMerchant>(); | |||||
| 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 | @Override | ||||