From 993b65caaee116f3eb4802d90287bb5b2ed6eaa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 28 Oct 2025 14:56:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E9=94=80=E5=85=85=E5=80=BC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/controller/NotifyController.java | 2 +- .../java/com/czg/market/service/MkDistributionUserService.java | 2 +- .../market/service/impl/MkDistributionUserServiceImpl.java | 2 +- .../service/order/service/impl/DistributionPayServiceImpl.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java index 185b2460f..8f2dd93c0 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java @@ -97,7 +97,7 @@ public class NotifyController { payment.setPayTime(DateUtil.date().toLocalDateTime()); payment.setRespJson(plainTextJson.toJSONString()); paymentService.updateById(payment); - distributionUserService.rechargeCallBack(payment.getSourceId(), payment.getShopId(), payment.getAmount(), payment.getId()); + distributionUserService.rechargeCallBack(payment.getShopId(), payment.getAmount(), payment.getId()); }catch (Exception e) { log.error("充值回调失败", e); return "SUCCESS"; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java index fef7d8d53..2982442a4 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java @@ -103,7 +103,7 @@ public interface MkDistributionUserService extends IService /** * 分销商户运营余额充值回调 */ - void rechargeCallBack(Long userId, Long shopId, BigDecimal amount, Long paymentId); + void rechargeCallBack(Long shopId, BigDecimal amount, Long paymentId); /** * 发放分销奖励 diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java index d49957056..2e8fd1589 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java @@ -453,7 +453,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl mchRecharge(String clientIP, MkDistributionPayDTO payParam) { - InitInfo initInfo = initPayment(payParam.getUserId(), payParam, true); + InitInfo initInfo = initPayment(payParam.getUserId() == null ? payParam.getShopId() : payParam.getUserId(), payParam, true); return wxService.v3Pay(initInfo.openId, payParam.getAmount(), "商户运营余额充值", initInfo.payment.getOrderNo(), initInfo.payment.getPayType()); } From 30c513d71d71862b0d2f4d8719edba2c7768a99d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 28 Oct 2025 15:03:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=86=E9=94=80=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/DistributionController.java | 146 +++++++++--------- .../service/MkDistributionConfigService.java | 2 + .../impl/MkDistributionConfigServiceImpl.java | 30 ++++ 3 files changed, 105 insertions(+), 73 deletions(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java index 034ac52f7..5a391bca5 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java @@ -40,78 +40,78 @@ public class DistributionController { @Resource private AppWxServiceImpl appWxService; -// /** -// * 配置信息详情 -// */ -// @SaAdminCheckPermission(value = "distribution:detail", name = "分销配置") -// @GetMapping -// public CzgResult detail() { -// return CzgResult.success(configService.detail(StpKit.USER.getShopId())); -// } -// -// /** -// * 配置信息修改 -// * -// * @return 是否成功 -// */ -// @SaAdminCheckPermission(value = "distribution:edit", name = "分销修改") -// @SaCheckMainShop -// @PutMapping -// public CzgResult edit( @RequestBody MkDistributionConfigDTO dto) { -// return CzgResult.success(configService.edit(StpKit.USER.getShopId(), dto)); -// } -// -// -// /** -// * 现金充值 -// * @param payParam 充值信息 -// * @return 是否成功 -// */ -// @PostMapping("/cashPay") -// public CzgResult cashPayOrder(@Validated @RequestBody MkDistributionPayDTO payParam) { -// AssertUtil.isNull(payParam.getShopId(), "店铺id不能为空"); -// AssertUtil.isNull(payParam.getAmount(), "充值金额不能为空"); -// AssertUtil.isTrue(payParam.getAmount().compareTo(BigDecimal.ZERO) == 0, "金额不为0"); -// return CzgResult.success(distributionUserService.cashPayOrder(StpKit.USER.getLoginIdAsLong(), payParam)); -// } -// -// /** -// * 金额记录 -// * @param type manual_recharge充值 self_recharge自助充值 refund退款 manual_sub手动扣减 sub统扣减 -// * @param key 搜索 -// */ -// @GetMapping("/flow") -// public CzgResult> flow(@RequestParam(required = false) Long shopId, @RequestParam(required = false) String type, @RequestParam(required = false) String key) { -// return CzgResult.success(distributionAmountFlowService.pageInfo(StpKit.USER.isAdmin() ? shopId : StpKit.USER.getShopId(), type, key)); -// } -// -// /** -// * 开通记录 -// * @param startTime 开始时间 -// * @param endTime 结束时间 -// * @param key 用户id昵称 -// */ -// @GetMapping("openFlow") -// public CzgResult> openFlow(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) String key) { -// return CzgResult.success(distributionAmountFlowService.openPageInfo(StpKit.USER.getShopId(), -// StrUtil.isNotBlank(startTime) ? DateUtil.parseLocalDateTime(startTime) : null, StrUtil.isNotBlank(endTime) ? DateUtil.parseLocalDateTime(endTime) : null, key)); -// } -// -// -// /** -// * 分销明细 -// * @param startTime 开始时间 -// * @param endTime 结束时间 -// * @param key 用户id昵称 -// * @param status pending待入账 success已入账 -// */ -// @GetMapping("distributionFlow") -// public CzgResult> distributionFlow(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, -// @RequestParam(required = false) String key, @RequestParam(required = false) String status, -// @RequestParam(required = false) Long id) { -// return CzgResult.success(distributionFlowService.pageInfo(StpKit.USER.getShopId(), -// StrUtil.isNotBlank(startTime) ? DateUtil.parseLocalDateTime(startTime) : null, StrUtil.isNotBlank(endTime) ? DateUtil.parseLocalDateTime(endTime) : null, key, status, id)); -// } + /** + * 配置信息详情 + */ + @SaAdminCheckPermission(value = "distribution:detail", name = "分销配置") + @GetMapping + public CzgResult detail() { + return CzgResult.success(configService.detail(StpKit.USER.getShopId())); + } + + /** + * 配置信息修改 + * + * @return 是否成功 + */ + @SaAdminCheckPermission(value = "distribution:edit", name = "分销修改") + @SaCheckMainShop + @PutMapping + public CzgResult edit( @RequestBody MkDistributionConfigDTO dto) { + return CzgResult.success(configService.edit(StpKit.USER.getShopId(), dto)); + } + + + /** + * 现金充值 + * @param payParam 充值信息 + * @return 是否成功 + */ + @PostMapping("/cashPay") + public CzgResult cashPayOrder(@Validated @RequestBody MkDistributionPayDTO payParam) { + AssertUtil.isNull(payParam.getShopId(), "店铺id不能为空"); + AssertUtil.isNull(payParam.getAmount(), "充值金额不能为空"); + AssertUtil.isTrue(payParam.getAmount().compareTo(BigDecimal.ZERO) == 0, "金额不为0"); + return CzgResult.success(distributionUserService.cashPayOrder(StpKit.USER.getLoginIdAsLong(), payParam)); + } + + /** + * 金额记录 + * @param type manual_recharge充值 self_recharge自助充值 refund退款 manual_sub手动扣减 sub统扣减 + * @param key 搜索 + */ + @GetMapping("/flow") + public CzgResult> flow(@RequestParam(required = false) Long shopId, @RequestParam(required = false) String type, @RequestParam(required = false) String key) { + return CzgResult.success(distributionAmountFlowService.pageInfo(StpKit.USER.isAdmin() ? shopId : StpKit.USER.getShopId(), type, key)); + } + + /** + * 开通记录 + * @param startTime 开始时间 + * @param endTime 结束时间 + * @param key 用户id昵称 + */ + @GetMapping("openFlow") + public CzgResult> openFlow(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) String key) { + return CzgResult.success(distributionAmountFlowService.openPageInfo(StpKit.USER.getShopId(), + StrUtil.isNotBlank(startTime) ? DateUtil.parseLocalDateTime(startTime) : null, StrUtil.isNotBlank(endTime) ? DateUtil.parseLocalDateTime(endTime) : null, key)); + } + + + /** + * 分销明细 + * @param startTime 开始时间 + * @param endTime 结束时间 + * @param key 用户id昵称 + * @param status pending待入账 success已入账 + */ + @GetMapping("distributionFlow") + public CzgResult> distributionFlow(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, + @RequestParam(required = false) String key, @RequestParam(required = false) String status, + @RequestParam(required = false) Long id) { + return CzgResult.success(distributionFlowService.pageInfo(StpKit.USER.getShopId(), + StrUtil.isNotBlank(startTime) ? DateUtil.parseLocalDateTime(startTime) : null, StrUtil.isNotBlank(endTime) ? DateUtil.parseLocalDateTime(endTime) : null, key, status, id)); + } /** @@ -136,7 +136,7 @@ public class DistributionController { */ @GetMapping("/rechargeQrCode") public CzgResult rechargeQrCode(@RequestParam BigDecimal amount) { - return CzgResult.success(appWxService.genCode("pages/pay", "amount=" + amount + "&shopId=" + StpKit.USER.getShopId())); + return CzgResult.success(configService.rechargeQrCode(StpKit.USER.getShopId(), amount)); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionConfigService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionConfigService.java index 0ad5d1475..39afe4e2d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionConfigService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionConfigService.java @@ -19,4 +19,6 @@ public interface MkDistributionConfigService extends IService