From af6cf5eca6c95e91206f36547ded05f04757b337 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 21 Mar 2019 17:33:15 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponController.java | 30 ++++++++++++++----- .../main/resources/mapper/WxCouponMapper.xml | 14 ++++----- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java index b7d374d5b..46e5fe738 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java @@ -1,11 +1,10 @@ package com.iformall.controller; +import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.MailMsg; import com.iformall.domain.po.WxCoupon; import com.iformall.enums.*; -import com.iformall.mq.MqBaseProducer; import com.iformall.service.WxCouponService; import com.iformall.utils.DateUtils; import io.swagger.annotations.Api; @@ -16,11 +15,7 @@ import org.apache.commons.collections.map.HashedMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.web.bind.annotation.*; - -import javax.mail.internet.MimeMessage; -import java.text.SimpleDateFormat; import java.util.*; @RestController @@ -138,7 +133,19 @@ public class WxCouponController extends BaseController { if(wxCoupon.getEnddate() == null){ wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); } - result.put("list",wxCouponService.findCountData(wxCoupon,pageNum,pageSize)); + PageInfo pageInfo = wxCouponService.findCountData(wxCoupon,pageNum,pageSize); + for (WxCoupon coupon:pageInfo.getList()) { + if(coupon.getSaleAmount() == null){ + coupon.setSaleAmount(0); + } + if(coupon.getSumPayment() == null){ + coupon.setSumPayment(0); + } + if(coupon.getSumSubsidy() == null){ + coupon.setSumSubsidy(0); + } + } + result.put("list",pageInfo); return new ResultData(result); } @@ -159,7 +166,14 @@ public class WxCouponController extends BaseController { if(wxCoupon.getEnddate() == null){ wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); } - return new ResultData(wxCouponService.findCouponData(wxCoupon,pageNum,pageSize)); + + PageInfo pageInfo = wxCouponService.findCouponData(wxCoupon,pageNum,pageSize); + for (WxCoupon coupon:pageInfo.getList()) { + if(coupon.getSumSubsidy() == null){ + coupon.setSumSubsidy(0); + } + } + return new ResultData(); } @ApiOperation("砍价营销列表接口") diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 9733ecd4e..ca9e23e6a 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -713,7 +713,7 @@