diff --git a/db/1000pjcloudx_thirdparty.sql b/db/1000pjcloudx_thirdparty.sql index caa10d65f..0561eec61 100644 --- a/db/1000pjcloudx_thirdparty.sql +++ b/db/1000pjcloudx_thirdparty.sql @@ -69,6 +69,7 @@ CREATE TABLE `third_pay_log` `biz_type` varchar(32) NOT NULL COMMENT '支付类型', `biz_id` varchar(2048) DEFAULT NULL COMMENT '支付类型id', `api_url` text DEFAULT NULL COMMENT 'api-url', + `header` text DEFAULT NULL COMMENT 'header', `res` text DEFAULT NULL COMMENT 'res', `req` text DEFAULT NULL COMMENT 'req', `error` text DEFAULT NULL COMMENT '调用错误', diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletManageEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletManageEntity.java index ad61d279d..ce49532a0 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletManageEntity.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletManageEntity.java @@ -82,7 +82,6 @@ public class WalletManageEntity extends Model { private Integer freezePrice; /** - * @deprecated 已废弃 * 是否冻结饭卡 */ @Schema(description = "是否冻结饭卡") diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletFreezeController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletFreezeController.java index f3f2c08c5..d8d4d8adf 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletFreezeController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletFreezeController.java @@ -54,13 +54,14 @@ public class WalletFreezeController { @PostMapping("/app/apply-freeze") @Operation(summary = "申请冻结") public R appApplyFreeze(@RequestBody WalletFreezeDto dto) { - if (ObjectUtil.isEmpty(dto.getWalletId())) { - throw new RuntimeException("钱包id不能为空"); + if (ObjectUtil.isEmpty(dto.getWalletTypeId())) { + throw new RuntimeException("钱包类型id不能为空"); } if (ObjectUtil.isEmpty(dto.getRemark())) { throw new RuntimeException("备注不能为空"); } PjcloudUser user = SecurityUtils.getUser(); + dto.setUserId(user.getId()); walletFreezeService.applyFreeze(dto, user); return R.ok(true); } @@ -94,7 +95,9 @@ public class WalletFreezeController { @PostMapping @PreAuthorize("@pms.hasPermission('wallet_walletFreeze_add')") public R save(@RequestBody WalletFreezeDto dto) { - return R.ok(walletFreezeService.create(dto)); + PjcloudUser user = SecurityUtils.getUser(); + walletFreezeService.applyFreeze(dto, user); + return R.ok(); } @Operation(summary = "新增饭卡冻结记录表", description = "新增饭卡冻结记录表") @@ -104,7 +107,8 @@ public class WalletFreezeController { public R appSave(@RequestBody WalletFreezeDto dto) { PjcloudUser loginUser = SecurityUtils.getUser(); dto.setUserId(loginUser.getId()); - return R.ok(walletFreezeService.create(dto)); + walletFreezeService.applyFreeze(dto, loginUser); + return R.ok(); } @Operation(summary = "修改饭卡冻结记录表", description = "修改饭卡冻结记录表") diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletFreezeService.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletFreezeService.java index 8e1fcd4a4..0b5af045b 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletFreezeService.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletFreezeService.java @@ -16,8 +16,6 @@ public interface WalletFreezeService extends IService { Page scopePageList(Page page, WalletFreezeDto dto); - Long create(WalletFreezeDto dto); - void applyCallback(ProcessNodeRecordAssignUserParamDto dto); void applyFreeze(WalletFreezeDto dto, PjcloudUser user); diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletFreezeServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletFreezeServiceImpl.java index ae2576e2c..6b54d5dae 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletFreezeServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletFreezeServiceImpl.java @@ -85,30 +85,6 @@ public class WalletFreezeServiceImpl extends ServiceImpl