diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java b/mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java
index f9dad36e2..bf58749d3 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java
@@ -84,6 +84,9 @@ public class WxPayOrder implements Serializable {
/*支付状态: 0-支付中;1-支付成功;2-支付失败**/
@io.swagger.annotations.ApiModelProperty(value="支付状态: 0-支付中;1-支付成功;2-支付失败",name="payOrderStatus")
private Integer payOrderStatus;
+ /*分账状态: 0-未分账;1-分账**/
+ @io.swagger.annotations.ApiModelProperty(value="分账状态: 0-未分账;1-分账",name="payOrderStatus")
+ private boolean share;
/*支付失败原因**/
@io.swagger.annotations.ApiModelProperty(value="支付失败原因",name="failReason")
private String failReason;
@@ -174,6 +177,15 @@ public class WxPayOrder implements Serializable {
public void setPayOrderStatus(Integer _payOrderStatus) {
payOrderStatus = _payOrderStatus;
}
+
+ public boolean isShare() {
+ return share;
+ }
+
+ public void setShare(boolean share) {
+ this.share = share;
+ }
+
public String getFailReason() {
return failReason;
}
@@ -200,6 +212,7 @@ public class WxPayOrder implements Serializable {
,PayVendor_ASC("`pay_vendor` ASC"),PayVendor_DESC("`pay_vendor` DESC")
,PayOrderNo_ASC("`pay_order_no` ASC"),PayOrderNo_DESC("`pay_order_no` DESC")
,PayOrderStatus_ASC("`pay_order_status` ASC"),PayOrderStatus_DESC("`pay_order_status` DESC")
+ ,Share_ASC("`share` ASC"),Share_DESC("`share` DESC")
,FailReason_ASC("`fail_reason` ASC"),FailReason_DESC("`fail_reason` DESC")
;
private String value;
diff --git a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml
index 526b439f1..ba43d7505 100644
--- a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml
@@ -17,11 +17,12 @@
+
- `id`,`tenant_id`,`create_time`,`update_time`,`order_id`,`c_user_id`,`ip`,`pay_amount`,`pay_time_start`,`pay_time_end`,`prepay_id`,`transaction_id`,`pay_vendor`,`pay_order_no`,`pay_order_status`,`fail_reason`
+ `id`,`tenant_id`,`create_time`,`update_time`,`order_id`,`c_user_id`,`ip`,`pay_amount`,`pay_time_start`,`pay_time_end`,`prepay_id`,`transaction_id`,`pay_vendor`,`pay_order_no`,`pay_order_status`,`share`,`fail_reason`
@@ -86,6 +87,9 @@
and `pay_order_status` = #{payOrderStatus}
+
+ and `share` = #{share}
+
and `fail_reason` like concat('%', #{failReason},'%')