From 4a08b64496d0f6763059b8806a5b41910c362c19 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 2 Jan 2019 15:14:48 +0800 Subject: [PATCH] =?UTF-8?q?[B=E7=AB=AF=E6=94=B6=E6=AC=BE=E7=A0=81=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2][=E4=BC=98?= =?UTF-8?q?=E5=8C=96]:B=E7=AB=AF=E6=94=B6=E6=AC=BE=E7=A0=81=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C25s->0.03s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/vo/WxOrderPayVo.java | 26 +++++++++++++++++++ .../main/resources/mapper/WxOrderMapper.xml | 11 ++++---- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayVo.java index 45a34c076..642a54e35 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayVo.java @@ -21,6 +21,14 @@ public class WxOrderPayVo extends WxOrder { @io.swagger.annotations.ApiModelProperty(value="用户绑定的手机号",name="cUserPhone") private String cUserPhone; + /**c用户昵称**/ + @io.swagger.annotations.ApiModelProperty(value="c用户昵称",name="nickName") + private String nickName; + + /**c用户名**/ + @io.swagger.annotations.ApiModelProperty(value="c用户名",name="cUserName") + private String cUserName; + public String getMerchantName() { return merchantName; } @@ -53,6 +61,24 @@ public class WxOrderPayVo extends WxOrder { this.cUserPhone = cUserPhone; } + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + @Override + public String getcUserName() { + return cUserName; + } + + @Override + public void setcUserName(String cUserName) { + this.cUserName = cUserName; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index e2a6faf26..2da3e4adb 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -273,6 +273,7 @@ + @@ -280,7 +281,8 @@ o.`id`,o.`order_number`,o.`tenant_id`,o.`c_user_id`,o.`product_id`,o.`type`, o.`payment_type`,o.`payment`,o.`payment_time`,o.`order_status`,o.`create_date`,o.`update_date`,o.`detail`, - m.name as merchant_name, bu.name, bu.phone as bphone, cu.phone,cu.c_user_name + m.name as merchant_name, bu.name, bu.phone as bphone, + cu.phone, cu.nick_name, cubi.name c_user_name