From ffee069910e7196abb4930197113a392db6abffe Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Sat, 29 Mar 2025 10:38:47 +0800 Subject: [PATCH] =?UTF-8?q?feaet:=E5=85=85=E5=80=BC=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=88=B0=E6=AD=A3=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/800pjcloudx_wallet.sql | 35 +++-- .../core/constant/enums/MerchantTypeEnum.java | 4 +- .../service/impl/HardManagerServiceImpl.java | 1 - .../pjcloud/admin/api/dto/DeptAllListDto.java | 2 + .../admin/api/feign/RemoteUserService.java | 1 + .../admin/controller/SysUserController.java | 5 +- .../pjcloud/admin/service/SysUserService.java | 3 + .../service/impl/SysUserServiceImpl.java | 31 +++++ .../main/resources/mapper/SysDeptMapper.xml | 9 +- .../api/constant/mch/WalletMchSupType.java | 30 +++++ .../pjcloud/wallet/api/dto/MchManageDto.java | 3 +- .../wallet/api/dto/mch/MchDeptDto.java | 26 ++++ .../wallet/api/dto/mch/MchDeptUserDto.java | 9 -- .../wallet/api/dto/mch/MchRuleJoinDto.java | 9 ++ .../api/dto/mch/MchRulePriceConfigDto.java | 9 ++ .../api/dto/rule/WalletRuleMchConfigDto.java | 8 -- .../dto/rule/WalletRulePriceConfigDto.java | 8 -- .../wallet/api/entity/mch/MchDeptEntity.java | 83 ++++++++++++ .../api/entity/mch/MchDeptUserEntity.java | 91 ------------- .../api/entity/{ => mch}/MchManageEntity.java | 10 +- .../MchRuleJoinDtoEntity.java} | 12 +- .../MchRulePriceConfigEntity.java} | 8 +- .../pjcloud/wallet/api/vo/MchManageVo.java | 7 +- .../wallet/api/vo/mch/MchDeptUserVo.java | 9 -- .../pjcloud/wallet/api/vo/mch/MchDeptVo.java | 25 ++++ .../MchRuleJoinDtoVo.java} | 6 +- .../api/vo/mch/MchRulePriceConfigVo.java | 8 ++ .../api/vo/rule/WalletRulePriceConfigVo.java | 8 -- .../controller/WalletFreezeController.java | 4 - .../controller/mch/MchDeptController.java | 91 +++++++++++++ .../controller/mch/MchDeptUserController.java | 116 ---------------- .../{ => mch}/MchManageController.java | 15 ++- .../MchRuleJoinController.java} | 54 +++----- .../MchRulePriceConfigController.java} | 20 +-- .../third/WalletThirdZyController.java | 4 +- .../wallet/mapper/MchManageMapper.java | 6 +- .../wallet/mapper/mch/MchDeptUserMapper.java | 13 +- .../rule/WalletRuleMchConfigMapper.java | 10 +- .../rule/WalletRulePriceConfigMapper.java | 4 +- .../wallet/service/MchDeptService.java | 27 ++++ .../wallet/service/MchDeptUserService.java | 8 -- .../wallet/service/MchManageService.java | 11 +- .../service/MchRuleJoinControllerService.java | 17 +++ .../service/WalletRuleMchConfigService.java | 17 --- .../service/WalletRulePriceConfigService.java | 10 +- .../wallet/service/WalletThirdZyService.java | 4 + .../service/impl/WalletActiveServiceImpl.java | 2 +- .../impl/WalletTransactionServiceImpl.java | 8 ++ .../service/impl/mch/MchDeptServiceImpl.java | 126 ++++++++++++++++++ .../impl/mch/MchDeptUserServiceImpl.java | 13 -- .../impl/{ => mch}/MchManageServiceImpl.java | 62 ++++++++- .../mch/MchRuleJoinControllerServiceImpl.java | 30 +++++ .../MchRulePriceConfigServiceImpl.java} | 30 ++--- .../WalletRechargeApplyServiceImpl.java | 16 ++- .../rule/WalletRuleMchConfigServiceImpl.java | 29 ---- .../impl/thrid/WalletThirdZyServiceImpl.java | 26 ++-- .../resources/mapper/mch/MchDeptMapper.xml | 66 +++++++++ .../mapper/mch/MchDeptUserMapper.xml | 18 --- .../mapper/{ => mch}/MchManageMapper.xml | 6 +- .../MchRuleJoinMapper.xml} | 4 +- .../MchRulePriceConfigMapper.xml} | 2 +- 61 files changed, 839 insertions(+), 490 deletions(-) create mode 100644 pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/mch/WalletMchSupType.java create mode 100644 pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/mch/MchDeptDto.java delete mode 100644 pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/mch/MchDeptUserDto.java create mode 100644 pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/mch/MchRuleJoinDto.java create mode 100644 pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/mch/MchRulePriceConfigDto.java delete mode 100644 pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/rule/WalletRuleMchConfigDto.java delete mode 100644 pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/rule/WalletRulePriceConfigDto.java create mode 100644 pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchDeptEntity.java delete mode 100644 pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchDeptUserEntity.java rename pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/{ => mch}/MchManageEntity.java (95%) rename pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/{rule/WalletRuleMchConfigEntity.java => mch/MchRuleJoinDtoEntity.java} (87%) rename pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/{rule/WalletRulePriceConfigEntity.java => mch/MchRulePriceConfigEntity.java} (90%) delete mode 100644 pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/mch/MchDeptUserVo.java create mode 100644 pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/mch/MchDeptVo.java rename pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/{rule/WalletRuleMchConfigVo.java => mch/MchRuleJoinDtoVo.java} (63%) create mode 100644 pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/mch/MchRulePriceConfigVo.java delete mode 100644 pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/rule/WalletRulePriceConfigVo.java create mode 100644 pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/mch/MchDeptController.java delete mode 100644 pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/mch/MchDeptUserController.java rename pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/{ => mch}/MchManageController.java (91%) rename pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/{rule/WalletRuleMchConfigController.java => mch/MchRuleJoinController.java} (59%) rename pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/{rule/WalletRulePriceConfigController.java => mch/MchRulePriceConfigController.java} (79%) create mode 100644 pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/MchDeptService.java delete mode 100644 pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/MchDeptUserService.java create mode 100644 pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/MchRuleJoinControllerService.java delete mode 100644 pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRuleMchConfigService.java create mode 100644 pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchDeptServiceImpl.java delete mode 100644 pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchDeptUserServiceImpl.java rename pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/{ => mch}/MchManageServiceImpl.java (83%) create mode 100644 pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchRuleJoinControllerServiceImpl.java rename pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/{rule/WalletRulePriceConfigServiceImpl.java => mch/MchRulePriceConfigServiceImpl.java} (75%) delete mode 100644 pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/rule/WalletRuleMchConfigServiceImpl.java create mode 100644 pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchDeptMapper.xml delete mode 100644 pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchDeptUserMapper.xml rename pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/{ => mch}/MchManageMapper.xml (81%) rename pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/{rule/WalletRuleMchConfigMapper.xml => mch/MchRuleJoinMapper.xml} (95%) rename pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/{rule/WalletRulePriceConfigMapper.xml => mch/MchRulePriceConfigMapper.xml} (93%) diff --git a/db/800pjcloudx_wallet.sql b/db/800pjcloudx_wallet.sql index 58d141db1..6b7fed1b6 100644 --- a/db/800pjcloudx_wallet.sql +++ b/db/800pjcloudx_wallet.sql @@ -64,23 +64,22 @@ 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 +DROP TABLE IF EXISTS `mch_dept`; +CREATE TABLE mch_dept ( - 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', + id bigint NOT NULL COMMENT '主键', + mch_id bigint NOT NULL COMMENT '商户id', + 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 ='用户部门商户关系表'; + COLLATE = utf8mb4_general_ci COMMENT ='商户部门关系表'; -- ---------------------------- -- Table structure for wallet_manage @@ -113,10 +112,10 @@ CREATE TABLE wallet_manage CREATE INDEX idx_dept_id ON wallet_manage (user_id); -- ---------------------------- --- Table structure for wallet_rule_price_config +-- Table structure for mch_rule_price_config -- ---------------------------- -DROP TABLE IF EXISTS wallet_rule_price_config; -CREATE TABLE wallet_rule_price_config +DROP TABLE IF EXISTS mch_rule_price_config; +CREATE TABLE mch_rule_price_config ( id bigint NOT NULL COMMENT '主键', rule_price_type varchar(64) NOT NULL COMMENT '规则类型', @@ -135,8 +134,8 @@ CREATE TABLE wallet_rule_price_config -- ---------------------------- -- Table structure for wallet_rule_mch_config -- ---------------------------- -DROP TABLE IF EXISTS wallet_rule_mch_config; -CREATE TABLE wallet_rule_mch_config +DROP TABLE IF EXISTS mch_rule_join; +CREATE TABLE mch_rule_join ( id bigint NOT NULL COMMENT '主键', source_mch_id bigint NOT NULL COMMENT '源商户id', diff --git a/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/enums/MerchantTypeEnum.java b/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/enums/MerchantTypeEnum.java index 5403a03a1..81fb03f69 100644 --- a/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/enums/MerchantTypeEnum.java +++ b/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/enums/MerchantTypeEnum.java @@ -7,8 +7,8 @@ import lombok.RequiredArgsConstructor; @Getter public enum MerchantTypeEnum { CANTEEN("1", "食堂"), - SUPERMARKET("2", "合作超市"), - SELF_SUPERMARKET("3", "自营超市"), + SUPERMARKET("2", "合作商家"), + SELF_SUPERMARKET("3", "自营商家"), ; /** diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java index 435eb4830..3ff254153 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java @@ -30,7 +30,6 @@ import com.bsd.pjcloud.hard.service.HardManagerService; import com.bsd.pjcloud.hard.mqtt.config.MqttConfig; import com.bsd.pjcloud.hard.utils.MqTopicUtil; import com.bsd.pjcloud.mqtt.api.feign.RemoteMqttEventService; -import com.bsd.pjcloud.wallet.api.entity.MchManageEntity; import com.bsd.pjcloud.wallet.api.feign.RemoteMchService; import com.bsd.pjcloud.wallet.api.utils.WalletDataUtil; import com.bsd.pjcloud.wallet.api.vo.MchManageVo; diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/DeptAllListDto.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/DeptAllListDto.java index f5ab38542..48bb0eb77 100644 --- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/DeptAllListDto.java +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/DeptAllListDto.java @@ -13,4 +13,6 @@ public class DeptAllListDto { private Boolean isInclude; + private String isSyncZy; + } diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java index 135e5707a..64e51160e 100644 --- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java @@ -40,6 +40,7 @@ import java.util.Set; @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.UPMS_SERVICE) public interface RemoteUserService { + @NoToken @PostMapping("/user/inner-page") R> getRemoteUserPage(@RequestParam Long current, @RequestParam Long size, @RequestBody UserDTO userDTO); diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java index 63ab689c1..69692f12b 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java @@ -211,15 +211,16 @@ public class SysUserController { /** * 分页查询用户 */ + @Inner @PostMapping("/inner-page") - public R> getRemoteUserPage(@RequestParam Long current, @RequestParam Long size, @RequestBody UserDTO userDTO) { + public R> innerPage(@RequestParam Long current, @RequestParam Long size, @RequestBody UserDTO userDTO) { if (ObjectUtil.isEmpty(userDTO.getIsFindCheckUser())) { userDTO.setIsFindCheckUser(true); } Page pageParams = new Page(); pageParams.setCurrent(current); pageParams.setSize(size); - return R.ok(userService.getUsersWithRolePage(pageParams, userDTO).getRecords()); + return R.ok(userService.innerPage(pageParams, userDTO).getRecords()); } /** diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserService.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserService.java index f5d0b23eb..cfaa7d60e 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserService.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserService.java @@ -61,6 +61,8 @@ public interface SysUserService extends IService { */ IPage getUsersWithRolePage(Page page, UserDTO userDTO); + IPage innerPage(Page page, UserDTO userDTO); + /** * 删除用户 * @@ -214,6 +216,7 @@ public interface SysUserService extends IService { /** * 根据用户名或者手机号获取数据库权限的用户信息 + * * @param eq * @return */ diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java index 83383ee08..696b6b3eb 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java @@ -268,6 +268,37 @@ public class SysUserServiceImpl extends ServiceImpl impl return list; } + @Override + public IPage innerPage(Page page, UserDTO userDTO) { + IPage list = baseMapper.getUserVosPage(page, userDTO, null); + if (ObjectUtil.isNotEmpty(list.getRecords())) { + List userIds = list.getRecords().stream().map(UserVO::getUserId).distinct().toList(); + if (ObjectUtil.isNotEmpty(userIds)) { + SysUserFaceDto faceDto = new SysUserFaceDto(); + List faceList = sysUserFaceMapper.groupConcatFaces(faceDto); + DataUtil.convertFacesList(list.getRecords(), CollectionUtils.convertMap(faceList, SysUserFaceVo::getUserId)); + } + // 审批流程 + if (userDTO.getIsFindCheckUser()) { + List processInstanceIds = list.getRecords().stream().map(UserVO::getProcessId).filter(ObjectUtil::isNotEmpty).distinct().toList(); + if (ObjectUtil.isNotEmpty(processInstanceIds)) { + List taskList = flowUtil.queryProcessInstanceList(SecurityUtils.getUser().getId().toString(), processInstanceIds); + if (ObjectUtil.isNotEmpty(taskList)) { + Map taskMap = CollectionUtils.convertMap(taskList, TaskDto::getProcessInstanceId); + CollectionUtils.convertList(list.getRecords(), v -> { + TaskDto task = taskMap.get(v.getProcessId()); + if (ObjectUtil.isNotEmpty(task)) { + v.setIsCheckUser(true); + } + return v; + }); + } + } + } + } + return list; + } + /** * 通过ID查询用户信息 * diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysDeptMapper.xml b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysDeptMapper.xml index 2b0f16b9b..26f0f5838 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysDeptMapper.xml +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysDeptMapper.xml @@ -24,6 +24,7 @@ + @@ -37,6 +38,7 @@ a.name, a.hard_group_id, a.sort_order, + a.is_sync_zy, a.create_by, a.update_by, a.create_time, @@ -50,6 +52,9 @@ AND a.dept_id = #{dto.deptId} + + AND a.is_sync_zy = #{dto.isSyncZy} + @@ -69,9 +74,11 @@ + + + + + \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchDeptUserMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchDeptUserMapper.xml deleted file mode 100644 index 0d82e8ccf..000000000 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchDeptUserMapper.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/MchManageMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchManageMapper.xml similarity index 81% rename from pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/MchManageMapper.xml rename to pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchManageMapper.xml index ca14f6af0..400887fe2 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/MchManageMapper.xml +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchManageMapper.xml @@ -2,7 +2,7 @@ - + @@ -14,6 +14,10 @@ + + + + diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/rule/WalletRuleMchConfigMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchRuleJoinMapper.xml similarity index 95% rename from pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/rule/WalletRuleMchConfigMapper.xml rename to pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchRuleJoinMapper.xml index b4cdc813b..eb8aaf4fc 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/rule/WalletRuleMchConfigMapper.xml +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchRuleJoinMapper.xml @@ -2,7 +2,7 @@ - + @@ -42,7 +42,7 @@ - p.id as rulePirceConfigId, p.rule_price_type, diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/rule/WalletRulePriceConfigMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchRulePriceConfigMapper.xml similarity index 93% rename from pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/rule/WalletRulePriceConfigMapper.xml rename to pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchRulePriceConfigMapper.xml index 39e197642..cef2a381c 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/rule/WalletRulePriceConfigMapper.xml +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchRulePriceConfigMapper.xml @@ -3,7 +3,7 @@ - +