From 5191ddea0827bfd9a2544496e2c5205c249a0b64 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 19 Dec 2018 14:37:44 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=82=A8=E5=80=BC=E5=8D=A1][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]:admin=E7=AB=AF=E5=94=AE=E5=8D=A1=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=8F=8A=E6=B6=88=E8=B4=B9=E6=B5=81=E6=B0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxCardPayController.java | 2 +- .../java/com/iformall/domain/po/WxCardInfo.java | 3 +-- .../java/com/iformall/domain/vo/WxCardVo.java | 9 +++++---- .../main/resources/mapper/WxCardInfoMapper.xml | 15 ++++++++------- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java index 057ead7ed..c9728e582 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java @@ -72,7 +72,7 @@ public class WxCardPayController extends BaseController { } } final PageInfo page = wxCardInfoService.listAsPage(wxCardVo, pageNum, pageSize); - return new ResultData(); + return new ResultData(page); } @ApiOperation("C端扫B端储值卡交易流水(消费记录 + 补贴)列表接口") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java index d299c1b30..2ef9dc477 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java @@ -1,6 +1,7 @@ package com.iformall.domain.po; import lombok.Data; + import javax.persistence.*; import java.util.*; import javax.persistence.Transient; @@ -55,8 +56,6 @@ public class WxCardInfo implements Serializable { @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java index 167c3ef19..8ac258612 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java @@ -1,19 +1,16 @@ package com.iformall.domain.vo; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import com.iformall.domain.po.WxCardInfo; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; import lombok.ToString; import javax.persistence.Transient; import java.util.Date; import java.util.List; -@JsonIgnoreProperties(value = {"handler"}) @Data -@NoArgsConstructor @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxCardVo extends WxCardInfo { @@ -56,6 +53,10 @@ public class WxCardVo extends WxCardInfo { @io.swagger.annotations.ApiModelProperty(value = "该订单对应券的实际过期时间 ", name = "expiredTime") private Date expiredTime; + /**状态**/ + @io.swagger.annotations.ApiModelProperty(value = "状态", name = "status") + private Integer status; + /**购买人昵称*/ @io.swagger.annotations.ApiModelProperty(value="购买人昵称",name="cNickName") diff --git a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml index 32de4076a..7004b116c 100644 --- a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml @@ -49,7 +49,7 @@ and `share_fee_amount` = #{shareFeeAmount} - + and `remaining_share_fee_amount` = #{remainingShareFeeAmount} @@ -98,6 +98,7 @@ + @@ -108,9 +109,9 @@ ci.`id`,ci.`tenant_id`,ci.`coupon_id`,ci.`transaction_id`,ci.`amount`,ci.`sale_amount`,ci.`remaining_amount`,ci.`service_fee_amount`,ci.`share_fee_amount`,ci.`remaining_share_fee_amount`, ci.`create_date`,ci.`update_date`, - c.`cover_img`, c.`title`, c.`sub_title`, c.`detail`, c.`unit`, c.`remark`, c.`sale_price`, c.`price`, c.`status` - co.`c_user_id`, co.`owner_id`, co.`expired_time`, - cu.`nick_name` as c_nick_name, ow.`nick_name` as o_nick_name, ow.`phone` as o_phone + c.`cover_img`, c.`title`, c.`sub_title`, c.`detail`, c.`unit`, c.`remark`, c.`sale_price`, c.`price`, + co.`c_user_id`, co.`owner_id`, co.`expired_time`, co.`coupon_order_status` as status, + cu.`nick_name` as c_nick_name, ou.`nick_name` as o_nick_name, ou.`phone` as o_phone @@ -142,7 +143,7 @@ and ci.`share_fee_amount` = #{shareFeeAmount} - + and ci.`remaining_share_fee_amount` = #{remainingShareFeeAmount} @@ -152,13 +153,13 @@ and ci.`update_date` = #{updateDate} - and `status` = #{status} + and status = #{status} and o_phone = #{oPhone} - and `status` in in + and status in #{sItem}