From 5a168bc31780b894b1dadeeb2e46e4c19794ffcb Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 2 Jan 2019 12:44:48 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=82=A8=E5=80=BC=E5=8D=A1][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E5=8D=A1=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=A1=A5=E8=B4=B4=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/vo/WxCardVo.java | 6 ++++++ .../src/main/resources/mapper/WxCardInfoMapper.xml | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) 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 d88fd10c7..244941a1e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java @@ -41,6 +41,12 @@ public class WxCardVo extends WxCardInfo { /**购买金额**/ @io.swagger.annotations.ApiModelProperty(value = "购买金额", name = "salePrice") private Integer salePrice; + /**补贴类型**/ + @io.swagger.annotations.ApiModelProperty(value = "补贴类型", name = "subsidyType") + private Integer subsidyType; + /**补贴金额**/ + @io.swagger.annotations.ApiModelProperty(value = "补贴金额", name = "subsidyNum") + private Integer subsidyNum; /**购买人ID*/ diff --git a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml index ef0bcfad2..26e79483d 100644 --- a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml @@ -97,6 +97,8 @@ + + @@ -112,7 +114,7 @@ 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.`cover_img`, c.`title`, c.`sub_title`, c.`detail`, c.`unit`, c.`remark`, c.`sale_price`, c.`price`, c.`subsidy_type`, c.`subsidy_num`, 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 ou_phone