From f619aa52103c5d81bea2a672f4435d4c3f971a79 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 7 Nov 2018 16:37:52 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=B7=E5=8D=A1=E6=94=AF=E4=BB=98][?= =?UTF-8?q?=E6=94=B6=E9=93=B6=E5=8F=B0]:=E8=AE=A2=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/domain/po/WxOrder.java | 12 +++++++++ .../com/iformall/domain/po/WxPayOrder.java | 26 ++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java index 7ecdeb86e..a6e3c2c59 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java @@ -59,6 +59,9 @@ public class WxOrder implements Serializable { /*券ID-产品ID将来的产品都会放在coupon表里**/ @io.swagger.annotations.ApiModelProperty(value="券ID",name="couponId") private Long couponId; + /*类型0:券,1:刷卡支付金**/ + @io.swagger.annotations.ApiModelProperty(value="类型",name="type") + private Integer type; /*0: 付款 1: 退款**/ @io.swagger.annotations.ApiModelProperty(value="0: 付款 1: 退款",name="paymentType") private Integer paymentType; @@ -118,6 +121,14 @@ public class WxOrder implements Serializable { this.couponId = _couponId; } + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + public Integer getPaymentType() { return paymentType; } @@ -172,6 +183,7 @@ public class WxOrder implements Serializable { ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") ,BUserId_ASC("`b_user_id` ASC"),BUserId_DESC("`b_user_id` DESC") ,CouponId_ASC("`coupon_id` ASC"),CouponId_DESC("`coupon_id` DESC") + ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") ,PaymentType_ASC("`payment_type` ASC"),PaymentType_DESC("`payment_type` DESC") ,Payment_ASC("`payment` ASC"),Payment_DESC("`payment` DESC") ,PaymentTime_ASC("`payment_time` ASC"),PaymentTime_DESC("`payment_time` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java index 2efe3c68f..60b2f5594 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java @@ -56,6 +56,12 @@ public class WxPayOrder implements Serializable { /**用户ID**/ @io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId") private Long cUserId; + /**B端用户ID**/ + @io.swagger.annotations.ApiModelProperty(value="B端用户ID",name="bUserId") + private Long bUserId; + /**扫码授权编码**/ + @io.swagger.annotations.ApiModelProperty(value="扫码授权编码",name="authCode") + private String authCode; /**ip地址**/ @io.swagger.annotations.ApiModelProperty(value="ip地址",name="ip") private String ip; @@ -125,7 +131,23 @@ public class WxPayOrder implements Serializable { this.cUserId = cUserId; } - public String getIp() { + public Long getbUserId() { + return bUserId; + } + + public void setbUserId(Long bUserId) { + this.bUserId = bUserId; + } + + public String getAuthCode() { + return authCode; + } + + public void setAuthCode(String authCode) { + this.authCode = authCode; + } + + public String getIp() { return ip; } public void setIp(String _ip) { @@ -215,6 +237,8 @@ public class WxPayOrder implements Serializable { ,UpdateTime_ASC("`update_time` ASC"),UpdateTime_DESC("`update_time` DESC") ,OrderId_ASC("`order_id` ASC"),OrderId_DESC("`order_id` DESC") ,CUserId_ASC("`c_user_id` ASC"),CUserId_DESC("`c_user_id` DESC") + ,BUserId_ASC("`b_user_id` ASC"),BUserId_DESC("`b_user_id` DESC") + ,AuthCode_ASC("`auth_code` ASC"),AuthCode_DESC("`auth_code` DESC") ,Ip_ASC("`ip` ASC"),Ip_DESC("`ip` DESC") ,PayAmount_ASC("`pay_amount` ASC"),PayAmount_DESC("`pay_amount` DESC") ,PayTimeStart_ASC("`pay_time_start` ASC"),PayTimeStart_DESC("`pay_time_start` DESC")