Bläddra i källkod

[刷卡支付][收银台]:订单,支付订单修改

release_toaliyun_real
Stormeye Wu 7 år sedan
förälder
incheckning
f619aa5210
2 ändrade filer med 37 tillägg och 1 borttagningar
  1. +12
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java
  2. +25
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java

+ 12
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java Visa fil

@@ -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")


+ 25
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java Visa fil

@@ -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")


Laddar…
Avbryt
Spara