|
|
|
@@ -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<WxCashBackActivity> listActivityAsPage(WxCashBackActivity record, Integer pageIndex, Integer pageSize) { |
|
|
|
if (null != record.getMerchantId()) { |
|
|
|
List<Long> 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<Long> allMids = wxCashBackActivityMapper.findIds(_a); |
|
|
|
List<Long> 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<Long> 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)); |
|
|
|
|