diff --git a/mallinkService/src/main/java/com/iformall/domain/po/PosOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/PosOrder.java
index 31bdcc489..190bfcd18 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/PosOrder.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/PosOrder.java
@@ -3,7 +3,6 @@ package com.iformall.domain.po;
import lombok.Data;
import javax.persistence.*;
import java.util.*;
-import java.math.*;
import javax.persistence.Transient;
import java.util.List;
import javax.persistence.Id;
@@ -26,10 +25,14 @@ public class PosOrder implements Serializable {
private String posOrderNo;
@io.swagger.annotations.ApiModelProperty(value="支付类型(1: 独立核销, 2:支付)",name="type")
private Integer type;
- @io.swagger.annotations.ApiModelProperty(value="订单状态:0-待付款;1-已支付;2-已取消(限定时间内未付款);3-待退款;4-已退款;5-退款失败",name="orderStatus")
+ @io.swagger.annotations.ApiModelProperty(value="订单状态:0-待付款/待核销;1-已支付;2-已取消(限定时间内未付款);3-待退款;4-已退款;5-退款失败",name="orderStatus")
private Integer orderStatus;
@io.swagger.annotations.ApiModelProperty(value="b端用户",name="buUserId")
private Long buUserId;
+ @io.swagger.annotations.ApiModelProperty(value="0: 付款 1: 退款 2:自动退款 3:A端退款",name="paymentType")
+ private Integer paymentType;
+ @io.swagger.annotations.ApiModelProperty(value="支付金额:允许有负数,退款时为负值。核销时,金额可以不填写",name="paymentType")
+ private Integer payment;
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
private Date createDate;
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumPosOrderType.java b/mallinkService/src/main/java/com/iformall/enums/EnumPosOrderType.java
new file mode 100644
index 000000000..6dc086784
--- /dev/null
+++ b/mallinkService/src/main/java/com/iformall/enums/EnumPosOrderType.java
@@ -0,0 +1,38 @@
+package com.iformall.enums;
+
+
+/**
+ * @author gongbiao
+ */
+
+public enum EnumPosOrderType {
+
+ VERIFY_INDEPENDENT(1,"独立核销"),
+ PAY(2,"支付")
+ ;
+
+ public static EnumPosOrderType getEnum(Integer code) {
+ for (EnumPosOrderType value : values()) {
+ if (value.getCode().equals(code)) {
+ return value;
+ }
+ }
+ return null;
+ }
+
+ private Integer code;
+ private String message;
+
+ EnumPosOrderType(Integer code, String message) {
+ this.code = code;
+ this.message = message;
+ }
+
+ public Integer getCode() {
+ return code;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+}
diff --git a/mallinkService/src/main/resources/mapper/PosOrderMapper.xml b/mallinkService/src/main/resources/mapper/PosOrderMapper.xml
index a006ce4e2..b3663fc51 100644
--- a/mallinkService/src/main/resources/mapper/PosOrderMapper.xml
+++ b/mallinkService/src/main/resources/mapper/PosOrderMapper.xml
@@ -8,6 +8,8 @@
+
+
@@ -35,7 +37,13 @@
and `bu_user_id` = #{buUserId}
-
+
+
+ and `payment_type` = #{paymentType}
+
+
+ and `payment` = #{payment}
+
and `create_date` = #{createDate}