From 74edb21abb7c782f37b0e38984915b25cec65c8c Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 8 Apr 2019 17:43:22 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E5=88=B8][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=A1=E5=88=B8=E7=9A=84=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E7=AD=96=E7=95=A5=E4=B8=BA=E6=9B=B4=E6=94=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=80=92=E5=BA=8F,=E9=80=82=E5=BA=94=E7=BD=AE=E9=A1=B6?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxCouponChannelController.java | 2 +- .../java/com/iformall/controller/WxCouponChannelController.java | 2 +- .../com/iformall/service/impl/WxCouponChannelServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponChannelController.java index 428ba8f92..930c997ad 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -54,7 +54,7 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setStatus(null); } wxCouponChannel.setTenantId(getUser().getTenantId()); - wxCouponChannel.setSortColumns(WxCouponChannel.Field.Id_DESC); + wxCouponChannel.setSortColumns(WxCouponChannel.Field.UpdateDate_DESC); final PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 97e7bb0e2..314fc2d02 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -39,7 +39,7 @@ public class WxCouponChannelController extends BaseController { if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); wxCouponChannel.setTenantId(getTenantId()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); - wxCouponChannel.setSortColumns(WxCouponChannel.Field.CreateDate_DESC); + wxCouponChannel.setSortColumns(WxCouponChannel.Field.UpdateDate_DESC); PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index 0d3727a7e..669b79328 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -67,7 +67,6 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { record.setId(idWorker.nextId()); wxCouponChannelMapper.insertSelective(record); } else { - if (record.getCouponId() != null && record.getStatus() != null) { WxCouponChannel orignal = getById(record.getId()); if (orignal.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()) @@ -100,6 +99,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { wxOrderService.updateOrderGroupStatusByCouponChannelId(record.getId(), record.getTenantId(), EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); } } + record.setUpdateDate(new Date()); wxCouponChannelMapper.updateByPrimaryKeySelective(record); } return new ResultData();