From 1ebbb5b1e876fdb33cf0e3ae80c9f388025da413 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 28 Mar 2025 14:48:09 +0800 Subject: [PATCH 1/3] 111 --- db/800pjcloudx_wallet.sql | 4 ++++ .../wallet/api/entity/MchManageEntity.java | 24 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/db/800pjcloudx_wallet.sql b/db/800pjcloudx_wallet.sql index 4d136a394..373166028 100644 --- a/db/800pjcloudx_wallet.sql +++ b/db/800pjcloudx_wallet.sql @@ -33,6 +33,7 @@ DROP TABLE IF EXISTS `mch_manage`; CREATE TABLE mch_manage ( id bigint NOT NULL COMMENT '主键', + parent_id bigint NOT NULL COMMENT '主键', dept_id bigint NOT NULL COMMENT '绑定的部门id', default_wallet_type_id bigint DEFAULT NULL COMMENT '商户默认使用的钱包类型', hard_group_id bigint COMMENT '设备分组id', @@ -45,6 +46,9 @@ CREATE TABLE mch_manage job_time varchar(256) DEFAULT NULL COMMENT '商户营业时间', address_des varchar(256) DEFAULT NULL COMMENT '商户地址', sort int NOT NULL COMMENT '排序', + discounts_price varchar(256) NOT NULL COMMENT '优惠价格(没实际作用)', + cooperation_status varchar(64) NOT NULL COMMENT '合作状态', + mch_count int NOT NULL COMMENT '分店数量', create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', create_time datetime DEFAULT NULL COMMENT '创建时间', update_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人', diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/MchManageEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/MchManageEntity.java index 2519afbad..6f8700bbd 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/MchManageEntity.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/MchManageEntity.java @@ -30,6 +30,12 @@ public class MchManageEntity extends Model { @Schema(description = "主键") private Long id; + /** + * 父商家id + */ + @Schema(description = "父商家id") + private Long parentId; + /** * 绑定的部门id - 商户的部门id */ @@ -118,6 +124,24 @@ public class MchManageEntity extends Model { @Schema(description = "排序") private Long sort; + /** + * 优惠价格(没实际作用) + */ + @Schema(description = "优惠价格(没实际作用)") + private String discountsPrice; + + /** + * 合作状态 + */ + @Schema(description = "合作状态") + private String cooperationStatus; + + /** + * 分店数量 + */ + @Schema(description = "分店数量") + private Long mchCount; + /** * 创建时间 */ From 60d0c0090320d6548af3ee75ffa5268604ea4d6a Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 28 Mar 2025 15:20:07 +0800 Subject: [PATCH 2/3] 11 --- db/800pjcloudx_wallet.sql | 21 +++++++++++++++++++ .../controller/MchManageController.java | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/db/800pjcloudx_wallet.sql b/db/800pjcloudx_wallet.sql index 373166028..58d141db1 100644 --- a/db/800pjcloudx_wallet.sql +++ b/db/800pjcloudx_wallet.sql @@ -61,6 +61,27 @@ CREATE TABLE mch_manage COLLATE = utf8mb4_general_ci COMMENT ='商户管理'; CREATE INDEX idx_dept_id ON mch_manage (dept_id); +-- ---------------------------- +-- Table structure for mch_dpet_user +-- ---------------------------- +DROP TABLE IF EXISTS `mch_dept_user`; +CREATE TABLE mch_dept_user +( + id bigint NOT NULL COMMENT '主键', + mch_id bigint NOT NULL COMMENT '商户id', + user_id bigint NOT NULL COMMENT '用户id', + user_dept_id bigint NOT NULL COMMENT '用户部门id', + create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + create_time datetime DEFAULT NULL COMMENT '创建时间', + update_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人', + update_time datetime DEFAULT NULL COMMENT '修改时间', + del_flag char(1) COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记', + tenant_id bigint DEFAULT NULL COMMENT '租户ID', + PRIMARY KEY (id) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_general_ci COMMENT ='用户部门商户关系表'; + -- ---------------------------- -- Table structure for wallet_manage -- ---------------------------- diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java index 9750a4656..74919996b 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java @@ -61,7 +61,7 @@ public class MchManageController { @Inner @GetMapping("/get-by-dept-id") - public R getByDeptId(@RequestParam("deptId") Long deptId, MerchantTypeEnum type) { + public R getByDeptId(@RequestParam("deptId") Long deptId, MerchantTypeEnum type) { MchManageVo mchManage = mchManageService.getByDeptId(deptId, type); if (ObjectUtil.isEmpty(mchManage)) return R.failed("商户不存在"); return R.ok(mchManage); From c281382a864fc8def5defb19d0bda00ff20677b8 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 28 Mar 2025 15:21:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=85=85=E5=80=BC?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wallet/mapper/recharge/WalletRechargeApplyMapper.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeApplyMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeApplyMapper.java index 7cbaa276e..fe828b73c 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeApplyMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeApplyMapper.java @@ -60,6 +60,12 @@ public interface WalletRechargeApplyMapper extends PjcloudBaseMapper