|
|
|
@@ -72,7 +72,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { |
|
|
|
* 前端排序:时间、商户总库存、商户已发数、商户剩余 |
|
|
|
*/ |
|
|
|
if (Objects.equals(EnumCouponSendSendType.MERCHANT.getCode(), record.getSendType())) { |
|
|
|
String sortStr = null; |
|
|
|
String sortStr = null; |
|
|
|
if (Objects.equals(record.getSortColumn(), WxCouponSend.SORT_MERCHANT_LNVENTORY) || |
|
|
|
Objects.equals(record.getSortColumn(), WxCouponSend.SORT_MERCHANT_SEND) || |
|
|
|
Objects.equals(record.getSortColumn(), WxCouponSend.SORT_REMAIN)) { |
|
|
|
@@ -94,6 +94,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { |
|
|
|
cs.setExpired(expired); |
|
|
|
} |
|
|
|
} else { |
|
|
|
record.setStatus(EnumCouponSendStatus.VALID.getCode()); |
|
|
|
record.setSortColumns(BaseEntity.SortField.CreateDate_DESC); |
|
|
|
pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponSendMapper.findListVo(record)); |
|
|
|
for (WxCouponSendVo cs:pageInfo.getList()) |
|
|
|
@@ -181,6 +182,9 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { |
|
|
|
@Override |
|
|
|
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) |
|
|
|
public void updateInvalid(WxCouponSend record) { |
|
|
|
if (Objects.equals(record.getStatus(), EnumCouponSendStatus.INVALID.getCode())) { |
|
|
|
return; |
|
|
|
} |
|
|
|
record.setStatus(EnumCouponSendStatus.INVALID.getCode()); |
|
|
|
record.setUpdateDate(new Date()); |
|
|
|
if (Objects.equals(record.getSendType(), EnumCouponSendSendType.MERCHANT.getCode())) { |
|
|
|
|