Browse Source

bug

release_toaliyun_real
zhengfangyuan 3 years ago
parent
commit
a9a64679b3
1 changed files with 18 additions and 3 deletions
  1. +18
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java

+ 18
- 3
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java View File

@@ -68,13 +68,28 @@ public class WxCouponController extends BaseController {
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "券投放-列表")
public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize,Boolean isList) {
logger.debug("[" + getIpAddr() + "] WxCouponController::list");
if (wxCoupon == null) wxCoupon = new WxCoupon();
wxCoupon.updateTenantInfo(getTenantInfo());

//默认A端建券
return couponList(wxCoupon, pageNum, pageSize, isList);
}
@ApiOperation("父券分页列表接口")
@GetMapping("parentCouponList")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
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());
wxCoupon.setParentTenantId(null);
return couponList(wxCoupon, pageNum, pageSize, isList);
}
private ResultData couponList(WxCoupon wxCoupon, Integer pageNum, Integer pageSize,Boolean isList) {
//默认A端建券
if(null == wxCoupon.getSourceType()){
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
}


Loading…
Cancel
Save