From 336ec15bdbf135b6a064881ea7f0d642dbca65e4 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 19 Dec 2018 13:38:54 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=82=A8=E5=80=BC=E5=8D=A1][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]:c=E7=AB=AF=E5=8D=A1=E5=8C=85=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponOrderController.java | 13 +++++++++++ .../com/iformall/domain/vo/WxCardCVo.java | 22 +++++++++++++++++++ .../resources/mapper/WxCouponOrderMapper.xml | 9 ++++++++ 3 files changed, 44 insertions(+) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index a47ddf55e..2d1cf24df 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -11,6 +11,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -19,7 +20,9 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; @RestController @@ -99,6 +102,16 @@ public class WxCouponOrderController extends BaseController { } if (cardCVo == null) cardCVo = new WxCardCVo(); cardCVo.setOwnerId(getUserId()); + if(StringUtils.isNotBlank(cardCVo.getStatusStr())) { + String [] statusAttr = cardCVo.getStatusStr().split(","); + List tmpList = new ArrayList(); + for(String status: statusAttr) { + tmpList.add(Integer.valueOf(status)); + } + if(!tmpList.isEmpty()) { + cardCVo.setStatusS(tmpList); + } + } if (cardCVo.getCouponOrderStatus() == null) cardCVo.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); else if (cardCVo.getCouponOrderStatus() == EnumCouponOrderStatus.CARD_USING.getCode()) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java index d5d86a04e..701066809 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java @@ -90,6 +90,12 @@ public class WxCardCVo extends WxCouponOrder { @io.swagger.annotations.ApiModelProperty(value="卡消费列表",name="cardSpendList") private List cardSpendList; + @Transient + protected List statusS; + + @Transient + protected String statusStr; + public List getMerchantVoList() { return merchantVoList; @@ -173,4 +179,20 @@ public class WxCardCVo extends WxCouponOrder { public void setCardSpendList(List cardSpendList) { this.cardSpendList = cardSpendList; } + + public List getStatusS() { + return statusS; + } + + public void setStatusS(List statusS) { + this.statusS = statusS; + } + + public String getStatusStr() { + return statusStr; + } + + public void setStatusStr(String statusStr) { + this.statusStr = statusStr; + } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 786497ec5..c2db9bb08 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -696,6 +696,15 @@ and co.coupon_order_status = #{couponOrderStatus} + + and co.status = #{status} + + + and `status` in in + + #{sItem} + + order by ${sortColumns}