diff --git a/db/800pjcloudx_wallet.sql b/db/800pjcloudx_wallet.sql index aeb003c47..bb6bf0f6d 100644 --- a/db/800pjcloudx_wallet.sql +++ b/db/800pjcloudx_wallet.sql @@ -173,6 +173,53 @@ CREATE TABLE wallet_type ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT ='钱包类型'; +-- ---------------------------- +-- Table structure for wallet_rule_join +-- ---------------------------- +DROP TABLE IF EXISTS wallet_rule_join; +CREATE TABLE wallet_rule_join +( + id BIGINT(19) not null comment '主键', + source_wallet_type_id BIGINT(19) not null comment '源钱包类型id', + target_wallet_type_id BIGINT(19) not null comment '目标钱包类型id', + balance_multiple int DEFAULT 0 NOT NULL COMMENT '钱包转换百分比', + status VARCHAR(64) default '0' 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 '修改人', + 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_rule_transaction +-- ---------------------------- +DROP TABLE IF EXISTS wallet_rule_transaction; +CREATE TABLE wallet_rule_transaction +( + id BIGINT(19) not null comment '主键', + source_wallet_id BIGINT(19) not null comment '源钱包id', + target_wallet_id BIGINT(19) not null comment '目标钱包id', + source_wallet_balance int not null comment '源钱包余额', + target_wallet_balance int not null comment '目标钱包余额', + balance int DEFAULT 0 NOT NULL COMMENT '转换金额', + after_balance int DEFAULT 0 NOT NULL COMMENT '转换后的金额', + balance_multiple int DEFAULT 0 NOT NULL COMMENT '钱包转换百分比', + status VARCHAR(64) default '0' 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 '修改人', + 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_active diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletRulePriceTypeEnum.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/mch/WalletMchRulePriceTypeEnum.java similarity index 75% rename from pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletRulePriceTypeEnum.java rename to pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/mch/WalletMchRulePriceTypeEnum.java index 62551ae1f..6547b04ff 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletRulePriceTypeEnum.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/mch/WalletMchRulePriceTypeEnum.java @@ -1,4 +1,4 @@ -package com.bsd.pjcloud.wallet.api.constant; +package com.bsd.pjcloud.wallet.api.constant.mch; import cn.hutool.core.util.ObjectUtil; import lombok.AllArgsConstructor; @@ -11,7 +11,7 @@ import java.util.Arrays; */ @Getter @AllArgsConstructor -public enum WalletRulePriceTypeEnum { +public enum WalletMchRulePriceTypeEnum { STRIDE_LIMIT("10", "跨单位额外支付"), EVERY_LIMIT("20", "每餐额外支付"), ; @@ -19,7 +19,7 @@ public enum WalletRulePriceTypeEnum { private final String code; private final String desc; - public static WalletRulePriceTypeEnum valueOfByCode(String code) { + public static WalletMchRulePriceTypeEnum valueOfByCode(String code) { if (ObjectUtil.isEmpty(code)) return null; return Arrays.stream(values()).filter(v -> ObjectUtil.equals(code, v.getCode())).findFirst().get(); } diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/rule/WalletRuleJoinDto.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/rule/WalletRuleJoinDto.java new file mode 100644 index 000000000..cf20316f0 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/rule/WalletRuleJoinDto.java @@ -0,0 +1,14 @@ +package com.bsd.pjcloud.wallet.api.dto.rule; + +import com.bsd.pjcloud.wallet.api.entity.rule.WalletRuleJoinEntity; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class WalletRuleJoinDto extends WalletRuleJoinEntity { +} diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchRulePriceConfigEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchRulePriceConfigEntity.java index 1149d0f8e..0da29e5d4 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchRulePriceConfigEntity.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchRulePriceConfigEntity.java @@ -25,6 +25,7 @@ public class MchRulePriceConfigEntity extends Model { /** * 规则类型 + * @see */ @Schema(description = "规则类型") private String rulePriceType; diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/rule/WalletRuleJoinEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/rule/WalletRuleJoinEntity.java new file mode 100644 index 000000000..05af772cf --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/rule/WalletRuleJoinEntity.java @@ -0,0 +1,94 @@ +package com.bsd.pjcloud.wallet.api.entity.rule; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.bsd.pjcloud.common.core.util.TenantTable; +import java.time.LocalDateTime; + +/** + * 钱包规则配置 + */ +@Data +@TenantTable +@TableName("wallet_rule_join") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "钱包规则配置") +public class WalletRuleJoinEntity extends Model { + + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="主键") + private Long id; + + /** + * 源钱包类型id + */ + @Schema(description="源钱包类型id") + private Long sourceWalletTypeId; + + /** + * 目标钱包类型id + */ + @Schema(description="目标钱包类型id") + private Long targetWalletTypeId; + + /** + * 钱包转换百分比 + */ + @Schema(description="钱包转换百分比") + private Integer balanceMultiple; + + /** + * 是否启用 + */ + @Schema(description="是否启用") + private String status; + + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="修改人") + private String updateBy; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="修改时间") + private LocalDateTime updateTime; + + /** + * 删除标记 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description="删除标记") + private String delFlag; + + /** + * 租户ID + */ + @Schema(description="租户ID") + private Long tenantId; +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/rule/WalletRuleJoinVo.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/rule/WalletRuleJoinVo.java new file mode 100644 index 000000000..fd709165d --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/rule/WalletRuleJoinVo.java @@ -0,0 +1,15 @@ +package com.bsd.pjcloud.wallet.api.vo.rule; + +import com.bsd.pjcloud.wallet.api.entity.rule.WalletRuleJoinEntity; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class WalletRuleJoinVo extends WalletRuleJoinEntity { +} diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/rule/WalletRuleJoinController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/rule/WalletRuleJoinController.java new file mode 100644 index 000000000..c45463c86 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/rule/WalletRuleJoinController.java @@ -0,0 +1,82 @@ +package com.bsd.pjcloud.wallet.controller.rule; + +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.wallet.api.entity.rule.WalletRuleJoinEntity; +import com.bsd.pjcloud.wallet.service.WalletRuleJoinService; +import org.springframework.security.access.prepost.PreAuthorize; +import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.HttpHeaders; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; + +/** + * 钱包规则配置 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/wallet-rule-join") +@Tag(description = "wallet-rule-join", name = "钱包规则配置管理") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class WalletRuleJoinController { + + private final WalletRuleJoinService walletRuleJoinService; + + @Operation(summary = "分页查询", description = "分页查询") + @GetMapping("/page") + @PreAuthorize("@pms.hasPermission('wallet_walletRuleJoin_view')") + public R getWalletRuleJoinPage(@ParameterObject Page page, @ParameterObject WalletRuleJoinEntity walletRuleJoin) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + return R.ok(walletRuleJoinService.page(page, wrapper)); + } + + @Operation(summary = "通过id查询", description = "通过id查询") + @GetMapping("/{id}") + @PreAuthorize("@pms.hasPermission('wallet_walletRuleJoin_view')") + public R getById(@PathVariable("id") Long id) { + return R.ok(walletRuleJoinService.getById(id)); + } + + @Operation(summary = "新增钱包规则配置", description = "新增钱包规则配置") + @SysLog("新增钱包规则配置") + @PostMapping + @PreAuthorize("@pms.hasPermission('wallet_walletRuleJoin_add')") + public R save(@RequestBody WalletRuleJoinEntity walletRuleJoin) { + return R.ok(walletRuleJoinService.save(walletRuleJoin)); + } + + @Operation(summary = "修改钱包规则配置", description = "修改钱包规则配置") + @SysLog("修改钱包规则配置") + @PutMapping + @PreAuthorize("@pms.hasPermission('wallet_walletRuleJoin_edit')") + public R updateById(@RequestBody WalletRuleJoinEntity walletRuleJoin) { + return R.ok(walletRuleJoinService.updateById(walletRuleJoin)); + } + + @Operation(summary = "通过id删除钱包规则配置", description = "通过id删除钱包规则配置") + @SysLog("通过id删除钱包规则配置") + @DeleteMapping + @PreAuthorize("@pms.hasPermission('wallet_walletRuleJoin_del')") + public R removeById(@RequestBody Long[] ids) { + return R.ok(walletRuleJoinService.removeBatchByIds(CollUtil.toList(ids))); + } + + @ResponseExcel + @GetMapping("/export") + @PreAuthorize("@pms.hasPermission('wallet_walletRuleJoin_export')") + public List export(WalletRuleJoinEntity walletRuleJoin, Long[] ids) { + return walletRuleJoinService.list(Wrappers.lambdaQuery(walletRuleJoin).in(ArrayUtil.isNotEmpty(ids), WalletRuleJoinEntity::getId, ids)); + } +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/rule/WalletRuleMchConfigMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/mch/WalletRuleMchConfigMapper.java similarity index 76% rename from pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/rule/WalletRuleMchConfigMapper.java rename to pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/mch/WalletRuleMchConfigMapper.java index f35ecfd6f..8e7b144ed 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/rule/WalletRuleMchConfigMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/mch/WalletRuleMchConfigMapper.java @@ -1,14 +1,11 @@ -package com.bsd.pjcloud.wallet.mapper.rule; +package com.bsd.pjcloud.wallet.mapper.mch; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; import com.bsd.pjcloud.wallet.api.dto.mch.MchRuleJoinDto; -import com.bsd.pjcloud.wallet.api.entity.mch.MchManageEntity; import com.bsd.pjcloud.wallet.api.entity.mch.MchRuleJoinDtoEntity; import com.bsd.pjcloud.wallet.api.vo.mch.MchRuleJoinDtoVo; -import com.github.yulichang.query.MPJLambdaQueryWrapper; -import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/rule/WalletRulePriceConfigMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/mch/WalletRulePriceConfigMapper.java similarity index 92% rename from pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/rule/WalletRulePriceConfigMapper.java rename to pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/mch/WalletRulePriceConfigMapper.java index 69044f20f..869c51b9f 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/rule/WalletRulePriceConfigMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/mch/WalletRulePriceConfigMapper.java @@ -1,4 +1,4 @@ -package com.bsd.pjcloud.wallet.mapper.rule; +package com.bsd.pjcloud.wallet.mapper.mch; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -8,7 +8,6 @@ import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; import com.bsd.pjcloud.wallet.api.dto.mch.MchRulePriceConfigDto; import com.bsd.pjcloud.wallet.api.entity.mch.MchRulePriceConfigEntity; import com.bsd.pjcloud.wallet.api.vo.mch.MchRulePriceConfigVo; -import com.github.yulichang.query.MPJLambdaQueryWrapper; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/rule/WalletRuleJoinMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/rule/WalletRuleJoinMapper.java new file mode 100644 index 000000000..acbfbd060 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/rule/WalletRuleJoinMapper.java @@ -0,0 +1,11 @@ +package com.bsd.pjcloud.wallet.mapper.rule; + +import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.wallet.api.entity.rule.WalletRuleJoinEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface WalletRuleJoinMapper extends PjcloudBaseMapper { + + +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRuleJoinService.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRuleJoinService.java new file mode 100644 index 000000000..4f9673f55 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRuleJoinService.java @@ -0,0 +1,8 @@ +package com.bsd.pjcloud.wallet.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.wallet.api.entity.rule.WalletRuleJoinEntity; + +public interface WalletRuleJoinService extends IService { + +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchRuleJoinControllerServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchRuleJoinControllerServiceImpl.java index e9ada9649..1ecd6ae92 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchRuleJoinControllerServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchRuleJoinControllerServiceImpl.java @@ -5,13 +5,16 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.common.data.datascope.DataScope; +import com.bsd.pjcloud.wallet.api.constant.mch.WalletMchRulePriceTypeEnum; import com.bsd.pjcloud.wallet.api.dto.mch.MchRuleJoinDto; import com.bsd.pjcloud.wallet.api.entity.mch.MchManageEntity; import com.bsd.pjcloud.wallet.api.entity.mch.MchRuleJoinDtoEntity; +import com.bsd.pjcloud.wallet.api.entity.mch.MchRulePriceConfigEntity; import com.bsd.pjcloud.wallet.api.vo.mch.MchRuleJoinDtoVo; -import com.bsd.pjcloud.wallet.mapper.rule.WalletRuleMchConfigMapper; +import com.bsd.pjcloud.wallet.mapper.mch.WalletRuleMchConfigMapper; import com.bsd.pjcloud.wallet.service.MchManageService; import com.bsd.pjcloud.wallet.service.MchRuleJoinControllerService; +import com.bsd.pjcloud.wallet.service.WalletRulePriceConfigService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -27,14 +30,19 @@ import java.util.ArrayList; public class MchRuleJoinControllerServiceImpl extends ServiceImpl implements MchRuleJoinControllerService { private final MchManageService mchManageService; + private final WalletRulePriceConfigService rulePriceConfigService; @Override public Long create(MchRuleJoinDtoEntity dto) { if (existMchRuleJoin(dto)) { throw new RuntimeException("绑定的规则类型不能重复"); } - if (areMchIdsDistinct(dto)) { - throw new RuntimeException("源商户与目标商户不能重复"); + // 查询配置规则 + MchRulePriceConfigEntity rulePriceConfig = rulePriceConfigService.getById(dto.getRulePriceConfigId()); + if (ObjectUtil.notEqual(rulePriceConfig.getRulePriceType(), WalletMchRulePriceTypeEnum.EVERY_LIMIT.getCode())) { + if (areMchIdsDistinct(dto)) { + throw new RuntimeException("源商户与目标商户不能重复"); + } } MchManageEntity targetMch = mchManageService.getById(dto.getTargetMchId()); if (ObjectUtil.isEmpty(targetMch)) { @@ -87,7 +95,6 @@ public class MchRuleJoinControllerServiceImpl extends ServiceImpl() .eq(ObjectUtil.isNotEmpty(dto.getSourceMchId()), MchRuleJoinDtoEntity::getSourceMchId, dto.getSourceMchId()) - .eq(ObjectUtil.isNotEmpty(dto.getTargetMchId()), MchRuleJoinDtoEntity::getTargetMchId, dto.getTargetMchId()) .eq(ObjectUtil.isNotEmpty(dto.getRulePriceConfigId()), MchRuleJoinDtoEntity::getRulePriceConfigId, dto.getRulePriceConfigId()) .ne(ObjectUtil.isNotEmpty(dto.getId()), MchRuleJoinDtoEntity::getId, dto.getId()) ); diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchRulePriceConfigServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchRulePriceConfigServiceImpl.java index 8e8a12e83..7dcf9372f 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchRulePriceConfigServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchRulePriceConfigServiceImpl.java @@ -10,7 +10,7 @@ import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.wallet.api.dto.mch.MchRulePriceConfigDto; import com.bsd.pjcloud.wallet.api.entity.mch.MchRulePriceConfigEntity; import com.bsd.pjcloud.wallet.api.vo.mch.MchRulePriceConfigVo; -import com.bsd.pjcloud.wallet.mapper.rule.WalletRulePriceConfigMapper; +import com.bsd.pjcloud.wallet.mapper.mch.WalletRulePriceConfigMapper; import com.bsd.pjcloud.wallet.service.WalletRulePriceConfigService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/rule/WalletRuleJoinServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/rule/WalletRuleJoinServiceImpl.java new file mode 100644 index 000000000..82a77bac0 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/rule/WalletRuleJoinServiceImpl.java @@ -0,0 +1,13 @@ +package com.bsd.pjcloud.wallet.service.impl.rule; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.wallet.api.entity.rule.WalletRuleJoinEntity; +import com.bsd.pjcloud.wallet.mapper.rule.WalletRuleJoinMapper; +import com.bsd.pjcloud.wallet.service.WalletRuleJoinService; +import org.springframework.stereotype.Service; +/** + * 钱包规则配置 + */ +@Service +public class WalletRuleJoinServiceImpl extends ServiceImpl implements WalletRuleJoinService { +} \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchRuleJoinMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchRuleJoinMapper.xml index fcb5df564..015011d50 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchRuleJoinMapper.xml +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchRuleJoinMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchRulePriceConfigMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchRulePriceConfigMapper.xml index 6bcca3487..1a896a330 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchRulePriceConfigMapper.xml +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchRulePriceConfigMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/rule/WalletRuleJoinMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/rule/WalletRuleJoinMapper.xml new file mode 100644 index 000000000..43eb3f1ca --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/rule/WalletRuleJoinMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file