diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java index 8fe0c89cd..bcac2e4e8 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java @@ -77,6 +77,7 @@ public class WxCashBackActivityController extends BaseController { } } wxCashBackActivity.setSortColumns(SortField.CreateDate_DESC); + wxCashBackActivity.setHasGenericMerchant(true); final PageInfo page = wxCashBackActivityService.listActivityAsPage(wxCashBackActivity, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java index 8f8d16b89..6accfa897 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java @@ -63,7 +63,8 @@ public class WxCashBackActivity extends TenantEntity { @TableField(exist = false) private Long merchantId; - + @TableField(exist = false) + private boolean hasGenericMerchant; } 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 b436d9566..e2d43fb66 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java @@ -13,6 +13,7 @@ import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCUserBasicInfoVo; import com.iformall.enums.EnumCashBackActivityItemRule; import com.iformall.enums.EnumCashBackActivityRecordStatus; +import com.iformall.enums.EnumYesOrNo; import com.iformall.mapper.WxCashBackActivityItemMapper; import com.iformall.mapper.WxCashBackActivityMapper; import com.iformall.mapper.WxCashBackActivityMerchantMapper; @@ -52,11 +53,30 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService @Override public PageInfo listActivityAsPage(WxCashBackActivity record, Integer pageIndex, Integer pageSize) { if (null != record.getMerchantId()) { - List aids = wxCashBackActivityMerchantMapper.findActivityIdList(record.getMerchantId(), record.getTenantId()); - if (null == aids || aids.size() <= 0 ) { - record.setId(-1L); + //如果包含所有商户通用的活动 + if (record.isHasGenericMerchant()) { + WxCashBackActivity _a = new WxCashBackActivity(); + _a.updateTenantInfo(record); + _a.setAllMerchant(EnumYesOrNo.YES.getCode()); + List allMids = wxCashBackActivityMapper.findIds(_a); + List aids = wxCashBackActivityMerchantMapper.findActivityIdList(record.getMerchantId(), record.getTenantId()); + if (null == aids || aids.size() <= 0 ) { + if (null == allMids || allMids.size() <= 0 ) { + record.setId(-1L); + }else { + record.setIds(allMids); + } + }else { + allMids.addAll(aids); + record.setIds(allMids); + } }else { - record.setIds(aids); + List aids = wxCashBackActivityMerchantMapper.findActivityIdList(record.getMerchantId(), record.getTenantId()); + if (null == aids || aids.size() <= 0 ) { + record.setId(-1L); + }else { + record.setIds(aids); + } } } return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCashBackActivityMapper.findList(record));