From 909f61fdd5dc8dac256e91a942ae6b0bfd9c439a Mon Sep 17 00:00:00 2001 From: dzq Date: Mon, 9 Jun 2025 08:23:13 +0800 Subject: [PATCH] =?UTF-8?q?feat(shop/order):=20=E6=B7=BB=E5=8A=A0=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E5=BE=AE=E4=BF=A1id=E5=AD=97=E6=AE=B5=E5=88=B0?= =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=92=8C=E8=AE=A2=E5=8D=95=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在店铺和订单相关的DTO、Entity及查询类中添加corpid字段，用于存储企业微信id信息 同时更新数据库表结构，为shop、shop_order和shop_order_goods表添加corpid字段 --- .../domain/shop/order/db/ShopOrderEntity.java | 4 ++++ .../domain/shop/order/db/ShopOrderGoodsEntity.java | 3 +++ .../domain/shop/order/dto/ShopOrderDTO.java | 3 +++ .../shop/order/query/SearchShopOrderQuery.java | 2 ++ .../agileboot/domain/shop/shop/db/ShopEntity.java | 3 +++ .../com/agileboot/domain/shop/shop/dto/ShopDTO.java | 2 ++ .../domain/shop/shop/query/SearchShopQuery.java | 2 ++ sql/20250605.sql | 12 +++++++++++- 8 files changed, 30 insertions(+), 1 deletion(-) 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 209cae2..ef2ed13 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 @@ -65,6 +65,10 @@ public class ShopOrderEntity extends BaseEntity { @TableField("biz_order_id") private String bizOrderId; + @ApiModelProperty("企业微信id") + @TableField("corpid") + private String corpid; + @ApiModelProperty("订单总金额") @TableField("total_amount") private BigDecimal totalAmount; 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 e4c0f23..55c653f 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 @@ -68,6 +68,9 @@ public class ShopOrderGoodsEntity extends BaseEntity { @TableField("`status`") private Integer status; + @ApiModelProperty("企业微信id") + @TableField("corpid") + private String corpid; @Override public Serializable pkVal() { 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 6afd70c..fd75518 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 @@ -54,4 +54,7 @@ public class ShopOrderDTO { private Integer isInternal; @ApiModelProperty("业务系统订单ID（对接外部系统）") private String bizOrderId; + + @ApiModelProperty("企业微信id") + private String corpid; } \ No newline at end of file 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 590ffe2..c651859 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 @@ -25,6 +25,7 @@ public class SearchShopOrderQuery extends AbstractPageQuery { private Date endTime; private Date payTime; private String paymentMethod; + private String corpid; @Override public QueryWrapper addQueryCondition() { @@ -44,6 +45,7 @@ public class SearchShopOrderQuery extends AbstractPageQuery { .eq(status != null, "o.status", status) .eq(payStatus != null, "o.pay_status", payStatus) .eq(StrUtil.isNotEmpty(paymentMethod), "o.payment_method", paymentMethod) + .eq(StrUtil.isNotBlank(corpid), "o.corpid", corpid) .between(startTime != null && endTime != null, "o.create_time", startTime, endTime) .between(payTime != null, "o.pay_time", payTime == null ? null : DateUtil.beginOfDay(payTime).toJdkDate(), diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/db/ShopEntity.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/db/ShopEntity.java index 44e6352..a780df5 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/db/ShopEntity.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/db/ShopEntity.java @@ -35,6 +35,9 @@ public class ShopEntity extends BaseEntity { @TableField("shop_name") private String shopName; + @ApiModelProperty("企业微信id") + @TableField("corpid") + private String corpid; @Override public Serializable pkVal() { diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/dto/ShopDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/dto/ShopDTO.java index b404979..587f10f 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/dto/ShopDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/dto/ShopDTO.java @@ -24,4 +24,6 @@ public class ShopDTO { @ExcelColumn(name = "商店名称") private String shopName; + @ExcelColumn(name = "企业微信id") + private String corpid; } \ No newline at end of file diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/query/SearchShopQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/query/SearchShopQuery.java index 851440c..9bc882e 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/query/SearchShopQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/query/SearchShopQuery.java @@ -15,6 +15,7 @@ public class SearchShopQuery extends AbstractPageQuery { private String enable; private Date startTime; private Date endTime; + private String corpid; @Override public QueryWrapper addQueryCondition() { @@ -23,6 +24,7 @@ public class SearchShopQuery extends AbstractPageQuery { queryWrapper .like(StrUtil.isNotEmpty(shopName), "shop_name", shopName) .eq(StrUtil.isNotEmpty(enable), "enable", enable) + .eq(StrUtil.isNotEmpty(corpid), "corpid", corpid) .between(startTime != null && endTime != null, "create_time", startTime, endTime); this.timeRangeColumn = "create_time"; diff --git a/sql/20250605.sql b/sql/20250605.sql index 2a7fd81..05f508a 100644 --- a/sql/20250605.sql +++ b/sql/20250605.sql @@ -55,4 +55,14 @@ CREATE TABLE `approval_goods` ( KEY `idx_external_goods_id` (`external_goods_id`), KEY `idx_corpid` (`corpid`), KEY `idx_update_time` (`update_time`) -) ENGINE=InnoDB AUTO_INCREMENT=87 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='申请领用商品信息表'; \ No newline at end of file +) ENGINE=InnoDB AUTO_INCREMENT=87 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='申请领用商品信息表'; + +ALTER TABLE `shop` +ADD COLUMN `corpid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '企业微信id' +AFTER `shop_name`; + +ALTER TABLE `shop_order` +ADD COLUMN `corpid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '企业微信id'; + +ALTER TABLE `shop_order_goods` +ADD COLUMN `corpid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '企业微信id'; \ No newline at end of file