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 e19cf94..d620c92 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 @@ -43,6 +43,18 @@ public class ShopEntity extends BaseEntity { @TableField("belong_type") private Integer belongType; + @ApiModelProperty("运行模式(0-支付模式 1-审批模式 2-借还模式 3-会员模式 4-耗材模式)") + @TableField("mode") + private Integer mode; + + @ApiModelProperty("借呗支付(1-正常使用 0-禁止使用)") + @TableField("balance_enable") + private Integer balanceEnable; + + @ApiModelProperty("封面图URL") + @TableField("cover_img") + private String coverImg; + @Override public Serializable pkVal() { return this.shopId; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/db/ShopServiceImpl.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/db/ShopServiceImpl.java index 3c1dddb..08e7b29 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/db/ShopServiceImpl.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/db/ShopServiceImpl.java @@ -53,6 +53,7 @@ public class ShopServiceImpl extends ServiceImpl impleme public List getShopListByCorpid(String corpid) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("corpid", corpid) + .ne("mode", 4) .eq("deleted", 0); return this.list(queryWrapper); } 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 dc6193d..6e06ec3 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 @@ -31,4 +31,13 @@ public class ShopDTO { @ExcelColumn(name = "归属类型(0-借还柜 1-固资通)") private Integer belongType; + + @ExcelColumn(name = "运行模式(0-支付模式 1-审批模式 2-借还模式 3-会员模式 4-耗材模式)") + private Integer mode; + + @ExcelColumn(name = "借呗支付(1-正常使用 0-禁止使用)") + private Integer balanceEnable; + + @ExcelColumn(name = "封面图URL") + private String coverImg; } \ 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 3d2d942..e7b22e3 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 @@ -17,6 +17,8 @@ public class SearchShopQuery extends AbstractPageQuery { private Date endTime; private String corpid; private Integer belongType; + private Integer mode; + private Integer balanceEnable; @Override public QueryWrapper addQueryCondition() { @@ -27,6 +29,8 @@ public class SearchShopQuery extends AbstractPageQuery { .eq(StrUtil.isNotEmpty(enable), "enable", enable) .eq(StrUtil.isNotEmpty(corpid), "corpid", corpid) .eq(belongType != null, "belong_type", belongType) + .eq(mode != null, "mode", mode) + .eq(balanceEnable != null, "balance_enable", balanceEnable) .between(startTime != null && endTime != null, "create_time", startTime, endTime); this.timeRangeColumn = "create_time"; diff --git a/sql/20250611.sql b/sql/20250611.sql index fb79c8c..3859171 100644 --- a/sql/20250611.sql +++ b/sql/20250611.sql @@ -8,4 +8,16 @@ AFTER `corpid`; ALTER TABLE `return_approval` ADD COLUMN `audit_userid` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '审批人企业UserID' -AFTER `corpid`; \ No newline at end of file +AFTER `corpid`; + +ALTER TABLE `shop` +ADD COLUMN `mode` TINYINT NOT NULL DEFAULT 0 COMMENT '运行模式(0-支付模式 1-审批模式 2-借还模式 3-会员模式 4-耗材模式)' +AFTER `belong_type`; + +ALTER TABLE `shop` +ADD COLUMN `balance_enable` TINYINT NOT NULL DEFAULT 1 COMMENT '借呗支付(1-正常使用 0-禁止使用)' +AFTER `mode`; + +ALTER TABLE `shop` +ADD COLUMN `cover_img` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '封面图URL' +AFTER `balance_enable`; \ No newline at end of file