From 6396b676a63930d066232a1adfa63fe328597b4b Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 2 Aug 2019 17:59:04 +0800 Subject: [PATCH] =?UTF-8?q?[C=E7=AB=AF=E9=A6=96=E9=A1=B5][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=8D=A2=E4=B8=80=E6=8D=A2=E6=8B=BC=E5=9B=A2?= =?UTF-8?q?=E4=B8=8E=E7=A0=8D=E4=BB=B7]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponChannelController.java | 3 +-- .../iformall/service/WxCouponChannelService.java | 2 +- .../service/impl/WxCouponChannelServiceImpl.java | 14 ++++++++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 0150bfadb..0e13d506f 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -106,8 +106,7 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC); - WxCouponChannelVo vo = wxCouponChannelService.change(wxCouponChannel); - return new ResultData(vo); + return wxCouponChannelService.change(wxCouponChannel); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java index 70974113c..70d3b5043 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java @@ -70,6 +70,6 @@ public interface WxCouponChannelService { void updateStatusByCouponId(Long couponId,String tenantId,int status); - WxCouponChannelVo change(WxCouponChannel wxCouponChannel); + ResultData change(WxCouponChannel wxCouponChannel); } 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 9b5b86653..12f5447b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; +import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; @@ -138,7 +139,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { } @Override - public WxCouponChannelVo change(WxCouponChannel record) { + public ResultData change(WxCouponChannel record) { Long couponId = 0L; if (record.getCouponId() != null) { couponId = record.getCouponId(); @@ -146,10 +147,13 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { } List voList = wxCouponChannelMapper.findVoList(record); if (voList.isEmpty()) { - return null; + return new ResultData(Result.SUCCESS, "查询成功", null); } + Map data = new HashMap<>(); if (voList.size() == 1) { - return voList.get(0); + data.put("size", 1); + data.put("data", voList.get(0)); + return new ResultData(Result.SUCCESS, "查询成功", data); } Long finalCouponId = couponId; voList = voList.stream() @@ -157,7 +161,9 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { .collect(Collectors.toList()); int size = voList.size(); Random random = new Random(); - return voList.get(random.nextInt(size)); + data.put("size", size); + data.put("data", voList.get(random.nextInt(size))); + return new ResultData(Result.SUCCESS, "查询成功", data); } private boolean isCouponMerchantValid(Long couponId) {