|
|
|
@@ -84,8 +84,22 @@ public class WxCouponController extends BaseController { |
|
|
|
public ResultData parentCouponList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize,Boolean isList) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxCouponController::list"); |
|
|
|
if (wxCoupon == null) wxCoupon = new WxCoupon(); |
|
|
|
wxCoupon.setTenantId(getTenantInfo().getParentTenantId()); |
|
|
|
TenantEntity mallTenantEntity = getTenantInfo(); |
|
|
|
wxCoupon.setTenantId(mallTenantEntity.getParentTenantId()); |
|
|
|
wxCoupon.setParentTenantId(null); |
|
|
|
//平台券 |
|
|
|
if (EnumCouponType.COUPON_DOUYIN_PLAT.getCode() == wxCoupon.getType()) { |
|
|
|
//查询已经分配了的parentCouponList |
|
|
|
WxCouponMall couponMall = new WxCouponMall(); |
|
|
|
couponMall.updateTenantInfo(wxCoupon); |
|
|
|
couponMall.setMallTenantId(mallTenantEntity.getTenantId()); |
|
|
|
List<Long> couponIds = wxCouponMallService.listCouponIds(couponMall); |
|
|
|
if (null != couponIds && couponIds.size() > 0 ) { |
|
|
|
wxCoupon.setIds(couponIds); |
|
|
|
}else { |
|
|
|
wxCoupon.setId(-1L); |
|
|
|
} |
|
|
|
} |
|
|
|
return couponList(wxCoupon, pageNum, pageSize, isList); |
|
|
|
} |
|
|
|
|
|
|
|
|