|
|
|
@@ -48,19 +48,28 @@ public class WxCouponSendController extends BaseController { |
|
|
|
@GetMapping("list") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "merchantName", value = "merchantName", dataType = "String", paramType = "query"), |
|
|
|
}) |
|
|
|
@SystemControllerLog(description = "注券-列表") |
|
|
|
public ResultData list(@ModelAttribute WxCouponSend wxCouponSend, Integer pageNum, Integer pageSize) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxCouponSendController::list"); |
|
|
|
if (null == wxCouponSend) wxCouponSend = new WxCouponSend(); |
|
|
|
wxCouponSend.setTenantId(getTenantId()); |
|
|
|
wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); |
|
|
|
Integer valid = EnumCouponSendStatus.VALID.getCode(); |
|
|
|
if (Objects.equals(EnumCouponSendSendType.MERCHANT.getCode(), wxCouponSend.getSendType())) { |
|
|
|
if (Objects.nonNull(wxCouponSend.getStatus())) { |
|
|
|
valid = wxCouponSend.getStatus(); |
|
|
|
} else { |
|
|
|
wxCouponSend.setStatus(null); |
|
|
|
} |
|
|
|
} |
|
|
|
wxCouponSend.setStatus(valid); |
|
|
|
wxCouponSend.setSortColumns(BaseEntity.SortField.CreateDate_DESC); |
|
|
|
final PageInfo<WxCouponSendVo> page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); |
|
|
|
PageInfo<WxCouponSendVo> page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); |
|
|
|
|
|
|
|
for (WxCouponSendVo cs:page.getList()) |
|
|
|
cs.setSendCount(wxCouponActionLogService.getCountByChannelId(getTenantId(), cs.getSendType(), cs.getId())); |
|
|
|
|
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -110,7 +119,7 @@ public class WxCouponSendController extends BaseController { |
|
|
|
//商户卡库存校验 |
|
|
|
if(Objects.equals(wxCouponSend.getSendType(),EnumCouponSendSendType.MERCHANT.getCode())) { |
|
|
|
JSONObject jo = JSONObject.parseObject(wxCouponSend.getConditions()) ; |
|
|
|
if(Objects.isNull(jo)||!jo.containsKey(WxCouponSend.KEY_LIMIT)) { |
|
|
|
if(Objects.isNull(jo)||!jo.containsKey(WxCouponSend.KEY_MERCHANT_LNVENTORY)) { |
|
|
|
return new ResultData(ErrorCode.COUPON_SEND_LIMIT_VERIFY); |
|
|
|
} |
|
|
|
WxCoupon queryById = new WxCoupon() ; |
|
|
|
@@ -119,7 +128,7 @@ public class WxCouponSendController extends BaseController { |
|
|
|
if(Objects.isNull(wxCouponOfDb)) { |
|
|
|
return new ResultData(ErrorCode.COUPON_IS_EMPTY); |
|
|
|
} |
|
|
|
if(jo.getInteger(WxCouponSend.KEY_LIMIT) >wxCouponOfDb.getRemainInventory()) { |
|
|
|
if(jo.getInteger(WxCouponSend.KEY_MERCHANT_LNVENTORY) >wxCouponOfDb.getRemainInventory()) { |
|
|
|
return new ResultData(ErrorCode.REMAIN_IS_EMPTY); |
|
|
|
} |
|
|
|
} |
|
|
|
|