| @@ -3,7 +3,6 @@ package com.iformall.domain.po; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import java.util.*; | import java.util.*; | ||||
| import java.math.*; | |||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| import java.util.List; | import java.util.List; | ||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| @@ -26,10 +25,14 @@ public class PosOrder implements Serializable { | |||||
| private String posOrderNo; | private String posOrderNo; | ||||
| @io.swagger.annotations.ApiModelProperty(value="支付类型(1: 独立核销, 2:支付)",name="type") | @io.swagger.annotations.ApiModelProperty(value="支付类型(1: 独立核销, 2:支付)",name="type") | ||||
| private Integer 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; | private Integer orderStatus; | ||||
| @io.swagger.annotations.ApiModelProperty(value="b端用户",name="buUserId") | @io.swagger.annotations.ApiModelProperty(value="b端用户",name="buUserId") | ||||
| private Long 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") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| @@ -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; | |||||
| } | |||||
| } | |||||
| @@ -8,6 +8,8 @@ | |||||
| <result column="type" jdbcType="INTEGER" property="type" /> | <result column="type" jdbcType="INTEGER" property="type" /> | ||||
| <result column="order_status" jdbcType="INTEGER" property="orderStatus" /> | <result column="order_status" jdbcType="INTEGER" property="orderStatus" /> | ||||
| <result column="bu_user_id" jdbcType="BIGINT" property="buUserId" /> | <result column="bu_user_id" jdbcType="BIGINT" property="buUserId" /> | ||||
| <result column="payment_type" jdbcType="INTEGER" property="paymentType" /> | |||||
| <result column="payment" jdbcType="INTEGER" property="payment" /> | |||||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate" /> | <result column="create_date" jdbcType="TIMESTAMP" property="createDate" /> | ||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> | <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> | ||||
| </resultMap> | </resultMap> | ||||
| @@ -35,7 +37,13 @@ | |||||
| </if> | </if> | ||||
| <if test=" null != buUserId "> | <if test=" null != buUserId "> | ||||
| and `bu_user_id` = #{buUserId} | and `bu_user_id` = #{buUserId} | ||||
| </if> | |||||
| </if> | |||||
| <if test=" null != paymentType "> | |||||
| and `payment_type` = #{paymentType} | |||||
| </if> | |||||
| <if test=" null != payment "> | |||||
| and `payment` = #{payment} | |||||
| </if> | |||||
| <if test=" null != createDate "> | <if test=" null != createDate "> | ||||
| and `create_date` = #{createDate} | and `create_date` = #{createDate} | ||||
| </if> | </if> | ||||