From c83e7a70411dbd3066c1060229d9fdfb5f88fa11 Mon Sep 17 00:00:00 2001 From: dzq Date: Fri, 27 Jun 2025 16:22:02 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=A2=E5=8D=95):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=BF=90=E8=A1=8C=E6=A8=A1=E5=BC=8F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在订单表和订单商品表中添加mode字段,支持多种运行模式(支付/审批/借还/会员/耗材模式) 同时更新DTO和查询条件以支持新模式字段 --- .../agileboot/domain/shop/order/db/ShopOrderEntity.java | 4 ++++ .../domain/shop/order/db/ShopOrderGoodsEntity.java | 4 ++++ .../com/agileboot/domain/shop/order/dto/ShopOrderDTO.java | 4 ++++ .../domain/shop/order/query/SearchShopOrderQuery.java | 2 ++ sql/20250625.sql | 8 ++++++++ 5 files changed, 22 insertions(+) diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/ShopOrderEntity.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/ShopOrderEntity.java index 6bfbf85..dc3be8f 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/ShopOrderEntity.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/ShopOrderEntity.java @@ -77,6 +77,10 @@ public class ShopOrderEntity extends BaseEntity { @TableField("`status`") private Integer status; + @ApiModelProperty("运行模式(0-支付模式 1-审批模式 2-借还模式 3-会员模式 4-耗材模式)") + @TableField("mode") + private Integer mode; + @ApiModelProperty("支付状态(1未支付 2已支付 3退款中 4已退款)") @TableField("pay_status") private Integer payStatus; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/ShopOrderGoodsEntity.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/ShopOrderGoodsEntity.java index 66184a7..ade2eb1 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/ShopOrderGoodsEntity.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/ShopOrderGoodsEntity.java @@ -72,6 +72,10 @@ public class ShopOrderGoodsEntity extends BaseEntity { @TableField("`status`") private Integer status; + @ApiModelProperty("运行模式(0-支付模式 1-审批模式 2-借还模式 3-会员模式 4-耗材模式)") + @TableField("mode") + private Integer mode; + @ApiModelProperty("企业微信id") @TableField("corpid") private String corpid; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/dto/ShopOrderDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/dto/ShopOrderDTO.java index fd75518..cfc7ea3 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/dto/ShopOrderDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/dto/ShopOrderDTO.java @@ -39,6 +39,10 @@ public class ShopOrderDTO { private BigDecimal totalAmount; @ApiModelProperty("订单状态(1待付款 2已付款 3已发货 4已完成 5已取消)") private Integer status; + + @ApiModelProperty("运行模式(0-支付模式 1-审批模式 2-借还模式 3-会员模式 4-耗材模式)") + private Integer mode; + @ApiModelProperty("支付状态(1未支付 2已支付 3退款中 4已退款)") private Integer payStatus; @ApiModelProperty("已扣减库存(0否 1是)") diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java index 7addcd7..ab698dc 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java @@ -27,6 +27,7 @@ public class SearchShopOrderQuery extends AbstractPageQuery { private String paymentMethod; private String corpid; private Integer returnStatus; + private Integer mode; @Override public QueryWrapper addQueryCondition() { @@ -53,6 +54,7 @@ public class SearchShopOrderQuery extends AbstractPageQuery { .eq(cabinetId != null, "cc.cabinet_id", cabinetId) .eq(goodsId!= null, "og.goods_id", goodsId) .eq(status != null, "o.status", status) + .eq(mode != null, "o.mode", mode) .eq(payStatus != null, "o.pay_status", payStatus) .eq(StrUtil.isNotEmpty(paymentMethod), "o.payment_method", paymentMethod) .eq(StrUtil.isNotBlank(corpid), "o.corpid", corpid) diff --git a/sql/20250625.sql b/sql/20250625.sql index b515914..48016d7 100644 --- a/sql/20250625.sql +++ b/sql/20250625.sql @@ -7,3 +7,11 @@ ALTER TABLE `cabinet_cell` ADD COLUMN `is_rented` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否已租用:0-未租用,1-已租用' AFTER `cell_price`; + +ALTER TABLE `shop_order` +ADD COLUMN `mode` tinyint NOT NULL DEFAULT '0' COMMENT '运行模式(0-支付模式 1-审批模式 2-借还模式 3-会员模式 4-耗材模式)' +AFTER `status`; + +ALTER TABLE `shop_order_goods` +ADD COLUMN `mode` tinyint NOT NULL DEFAULT '0' COMMENT '运行模式(0-支付模式 1-审批模式 2-借还模式 3-会员模式 4-耗材模式)' +AFTER `status`;