|
|
|
@@ -57,13 +57,13 @@ public class WxCouponSendController extends BaseController { |
|
|
|
if (null == wxCouponSend) wxCouponSend = new WxCouponSend(); |
|
|
|
wxCouponSend.setTenantId(getTenantId()); |
|
|
|
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); |
|
|
|
} |
|
|
|
} |
|
|
|
// 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); |
|
|
|
PageInfo<WxCouponSendVo> page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); |
|
|
|
@@ -143,7 +143,7 @@ public class WxCouponSendController extends BaseController { |
|
|
|
@ApiImplicitParam(name = "sendType", value = "注券类型(会员生日券时必传)", dataType = "int", paramType = "query") |
|
|
|
}) |
|
|
|
@SystemControllerLog(description = "注券-删除") |
|
|
|
public ResultData delete(Long id,Integer sendType) { |
|
|
|
public ResultData delete(Long id) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxCouponSendController::delete"); |
|
|
|
WxCouponSend wxCouponSend = wxCouponSendService.getById(id); |
|
|
|
if (wxCouponSend == null) |
|
|
|
|