销售单表添加付款状态字段

Signed-off-by: fengb <fengbin1989@aliyun.com>

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleDetailMapper.java

@@ -5,9 +5,10 @@ import cc.hiver.mall.entity.SaleDetail;
 import cc.hiver.mall.entity.SaleDetailExample;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
-
+@Repository
 public interface SaleDetailMapper extends BaseMapper<SaleDetail> {
     long countByExample(SaleDetailExample example);
 

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleMapper.java

@@ -1,13 +1,13 @@
 package cc.hiver.mall.dao.mapper;
 
-import cc.hiver.mall.entity.PurchaseDetail;
 import cc.hiver.mall.entity.Sale;
 import cc.hiver.mall.entity.SaleExample;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
-
+@Repository
 public interface SaleMapper extends BaseMapper<Sale> {
     long countByExample(SaleExample example);
 

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Sale.java

@@ -44,6 +44,9 @@ public class Sale implements Serializable {
     @ApiModelProperty(value = "未收")
     private BigDecimal noEarn;
 
+    @ApiModelProperty(value = "收款状态 0-未收款 1-已收款")
+    private String payStatus;
+
     @ApiModelProperty(value = "订单状态 0-拣货中 1-已提交抢单 2-已取货 3-已送达")
     private String status;
 
@@ -179,6 +182,14 @@ public class Sale implements Serializable {
         this.noEarn = noEarn;
     }
 
+    public String getPayStatus() {
+        return payStatus;
+    }
+
+    public void setPayStatus(String payStatus) {
+        this.payStatus = payStatus;
+    }
+
     public String getStatus() {
         return status;
     }
@@ -255,6 +266,7 @@ public class Sale implements Serializable {
         sb.append(", realAmount=").append(realAmount);
         sb.append(", alreadyEarn=").append(alreadyEarn);
         sb.append(", noEarn=").append(noEarn);
+        sb.append(", payStatus=").append(payStatus);
         sb.append(", status=").append(status);
         sb.append(", transportType=").append(transportType);
         sb.append(", shareAddress=").append(shareAddress);

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleExample.java

@@ -976,6 +976,76 @@ public class SaleExample {
             return (Criteria) this;
         }
 
+        public Criteria andPayStatusIsNull() {
+            addCriterion("pay_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusIsNotNull() {
+            addCriterion("pay_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusEqualTo(String value) {
+            addCriterion("pay_status =", value, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusNotEqualTo(String value) {
+            addCriterion("pay_status <>", value, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusGreaterThan(String value) {
+            addCriterion("pay_status >", value, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("pay_status >=", value, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusLessThan(String value) {
+            addCriterion("pay_status <", value, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusLessThanOrEqualTo(String value) {
+            addCriterion("pay_status <=", value, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusLike(String value) {
+            addCriterion("pay_status like", value, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusNotLike(String value) {
+            addCriterion("pay_status not like", value, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusIn(List<String> values) {
+            addCriterion("pay_status in", values, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusNotIn(List<String> values) {
+            addCriterion("pay_status not in", values, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusBetween(String value1, String value2) {
+            addCriterion("pay_status between", value1, value2, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusNotBetween(String value1, String value2) {
+            addCriterion("pay_status not between", value1, value2, "payStatus");
+            return (Criteria) this;
+        }
+
         public Criteria andStatusIsNull() {
             addCriterion("status is null");
             return (Criteria) this;

hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml

@@ -16,6 +16,7 @@
     <result column="real_amount" jdbcType="DECIMAL" property="realAmount" />
     <result column="already_earn" jdbcType="DECIMAL" property="alreadyEarn" />
     <result column="no_earn" jdbcType="DECIMAL" property="noEarn" />
+    <result column="pay_status" jdbcType="VARCHAR" property="payStatus" />
     <result column="status" jdbcType="VARCHAR" property="status" />
     <result column="transport_type" jdbcType="VARCHAR" property="transportType" />
     <result column="share_address" jdbcType="VARCHAR" property="shareAddress" />
@@ -84,8 +85,8 @@
   </sql>
   <sql id="Base_Column_List">
     id, create_by, create_time, del_flag, update_by, update_time, user_id, shop_id, total_amount, 
-    discount, discount_amount, real_amount, already_earn, no_earn, status, transport_type, 
-    share_address, receive_address, province, city, area
+    discount, discount_amount, real_amount, already_earn, no_earn, pay_status, status, 
+    transport_type, share_address, receive_address, province, city, area
   </sql>
   <select id="selectByExample" parameterType="cc.hiver.mall.entity.SaleExample" resultMap="BaseResultMap">
     select
@@ -122,18 +123,18 @@
       del_flag, update_by, update_time, 
       user_id, shop_id, total_amount, 
       discount, discount_amount, real_amount, 
-      already_earn, no_earn, status, 
-      transport_type, share_address, receive_address, 
-      province, city, area
-      )
+      already_earn, no_earn, pay_status, 
+      status, transport_type, share_address, 
+      receive_address, province, city, 
+      area)
     values (#{id,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{userId,jdbcType=BIGINT}, #{shopId,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL}, 
       #{discount,jdbcType=DECIMAL}, #{discountAmount,jdbcType=DECIMAL}, #{realAmount,jdbcType=DECIMAL}, 
-      #{alreadyEarn,jdbcType=DECIMAL}, #{noEarn,jdbcType=DECIMAL}, #{status,jdbcType=VARCHAR}, 
-      #{transportType,jdbcType=VARCHAR}, #{shareAddress,jdbcType=VARCHAR}, #{receiveAddress,jdbcType=VARCHAR}, 
-      #{province,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{area,jdbcType=VARCHAR}
-      )
+      #{alreadyEarn,jdbcType=DECIMAL}, #{noEarn,jdbcType=DECIMAL}, #{payStatus,jdbcType=VARCHAR}, 
+      #{status,jdbcType=VARCHAR}, #{transportType,jdbcType=VARCHAR}, #{shareAddress,jdbcType=VARCHAR}, 
+      #{receiveAddress,jdbcType=VARCHAR}, #{province,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, 
+      #{area,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="cc.hiver.mall.entity.Sale">
     insert into t_sale
@@ -180,6 +181,9 @@
       <if test="noEarn != null">
         no_earn,
       </if>
+      <if test="payStatus != null">
+        pay_status,
+      </if>
       <if test="status != null">
         status,
       </if>
@@ -245,6 +249,9 @@
       <if test="noEarn != null">
         #{noEarn,jdbcType=DECIMAL},
       </if>
+      <if test="payStatus != null">
+        #{payStatus,jdbcType=VARCHAR},
+      </if>
       <if test="status != null">
         #{status,jdbcType=VARCHAR},
       </if>
@@ -319,6 +326,9 @@
       <if test="record.noEarn != null">
         no_earn = #{record.noEarn,jdbcType=DECIMAL},
       </if>
+      <if test="record.payStatus != null">
+        pay_status = #{record.payStatus,jdbcType=VARCHAR},
+      </if>
       <if test="record.status != null">
         status = #{record.status,jdbcType=VARCHAR},
       </if>
@@ -361,6 +371,7 @@
       real_amount = #{record.realAmount,jdbcType=DECIMAL},
       already_earn = #{record.alreadyEarn,jdbcType=DECIMAL},
       no_earn = #{record.noEarn,jdbcType=DECIMAL},
+      pay_status = #{record.payStatus,jdbcType=VARCHAR},
       status = #{record.status,jdbcType=VARCHAR},
       transport_type = #{record.transportType,jdbcType=VARCHAR},
       share_address = #{record.shareAddress,jdbcType=VARCHAR},
@@ -414,6 +425,9 @@
       <if test="noEarn != null">
         no_earn = #{noEarn,jdbcType=DECIMAL},
       </if>
+      <if test="payStatus != null">
+        pay_status = #{payStatus,jdbcType=VARCHAR},
+      </if>
       <if test="status != null">
         status = #{status,jdbcType=VARCHAR},
       </if>
@@ -453,6 +467,7 @@
       real_amount = #{realAmount,jdbcType=DECIMAL},
       already_earn = #{alreadyEarn,jdbcType=DECIMAL},
       no_earn = #{noEarn,jdbcType=DECIMAL},
+      pay_status = #{payStatus,jdbcType=VARCHAR},
       status = #{status,jdbcType=VARCHAR},
       transport_type = #{transportType,jdbcType=VARCHAR},
       share_address = #{shareAddress,jdbcType=VARCHAR},