From 24ecaf2a9595cdffbc89d509ed906f32d0784c2c Mon Sep 17 00:00:00 2001 From: fengb Date: Wed, 23 Aug 2023 17:23:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8D=95=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BB=98=E6=AC=BE=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fengb --- .../mall/dao/mapper/SaleDetailMapper.java | 3 +- .../cc/hiver/mall/dao/mapper/SaleMapper.java | 4 +- .../main/java/cc/hiver/mall/entity/Sale.java | 12 ++++ .../cc/hiver/mall/entity/SaleExample.java | 70 +++++++++++++++++++ .../src/main/resources/mapper/SaleMapper.xml | 35 +++++++--- 5 files changed, 111 insertions(+), 13 deletions(-) diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleDetailMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleDetailMapper.java index 3384e4f4..f182ffce 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleDetailMapper.java +++ b/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 { long countByExample(SaleDetailExample example); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleMapper.java index d17ed2ee..90c99731 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleMapper.java +++ b/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 { long countByExample(SaleExample example); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Sale.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Sale.java index b6f332fd..d913773f 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Sale.java +++ b/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); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleExample.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleExample.java index 5cbf06a0..0abdc556 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleExample.java +++ b/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 values) { + addCriterion("pay_status in", values, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusNotIn(List 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; diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml index e01c2d82..7998dd61 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml @@ -16,6 +16,7 @@ + @@ -84,8 +85,8 @@ 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