From 06fe77e4b01af08bcc2d0fb0be300e2b36cb90d4 Mon Sep 17 00:00:00 2001 From: Burce Date: Mon, 2 Sep 2019 16:42:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E6=B3=A8=E5=88=B8->=E6=9F=A5?= =?UTF-8?q?=E6=89=BE=E6=9C=89=E6=95=88=E3=80=81=E6=97=A0=E6=95=88=E3=80=81?= =?UTF-8?q?=E8=BF=87=E6=9C=9F=E3=80=81=E6=9C=AA=E8=BF=87=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/market/WxCouponSendController.java | 3 +-- .../com/iformall/service/impl/WxCouponSendServiceImpl.java | 6 +++++- .../src/main/resources/mapper/WxCouponSendMapper.xml | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java index 5ca1c9eb6..8e75ec650 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java @@ -57,7 +57,7 @@ public class WxCouponSendController extends BaseController { logger.debug("[" + getIpAddr() + "] WxCouponSendController::list"); 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(); @@ -65,7 +65,6 @@ public class WxCouponSendController extends BaseController { // wxCouponSend.setStatus(null); // } // } - wxCouponSend.setStatus(valid); PageInfo page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index 612b96d66..cae8e1f06 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -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())) { diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index 858da37e1..6c8d1e800 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -113,7 +113,7 @@ from wx_coupon_send cs left join wx_coupon c on c.id = cs.coupon_id ) as tt - where tt.status = 0 + where 1=1 and ((tt.valid_type=1