From 821b83f7c6dce0e26771a708bb9685011bfa6d67 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 24 Dec 2025 14:03:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=98=BE=E5=BC=8F=E6=8A=9B=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/MkDistributionUserService.java | 27 ++++++++++--------- .../impl/MkDistributionUserServiceImpl.java | 5 ++-- 2 files changed, 18 insertions(+), 14 deletions(-) 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 0cbeeeb27..4fec029cb 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 @@ -1,7 +1,9 @@ package com.czg.market.service; +import cn.hutool.core.exceptions.ValidateException; import com.czg.account.entity.UserInfo; import com.czg.constant.TableValueConstant; +import com.czg.exception.CzgException; import com.czg.market.dto.MkDistributionUserDTO; import com.czg.market.dto.MkDistributionWithdrawFlowDTO; import com.czg.market.entity.MkDistributionConfig; @@ -57,7 +59,7 @@ public interface MkDistributionUserService extends IService /** * 分销员中心-绑定邀请人 */ - void bindInviteUser(MkDistributionUserDTO param); + void bindInviteUser(MkDistributionUserDTO param) throws CzgException, ValidateException; /** * 获取分销员分页列表 @@ -85,6 +87,7 @@ public interface MkDistributionUserService extends IService * 更新分销员 */ void updateDistributionUserById(MkDistributionUserDTO param); + /** * 重置分销员等级 */ @@ -100,15 +103,14 @@ public interface MkDistributionUserService extends IService void deleteDistributionUser(Long id, Long shopId); - Boolean cashPayOrder(long adminId, MkDistributionPayDTO payParam); /** * 分销员开通 * * @param shopUserId 用户 - * @param amount 金额 - * @param shopId 店铺id + * @param amount 金额 + * @param shopId 店铺id */ void open(Long shopUserId, BigDecimal amount, Long shopId, Long sourceId); @@ -141,15 +143,16 @@ public interface MkDistributionUserService extends IService /** * 微信转账回调 + * * @param outBillNo 转账单号 - * @param state ACCEPTED：单据已受理 - * PROCESSING：单据处理中，转账结果尚未明确，如一直处于此状态，建议检查账户余额是否足够 - * WAIT_USER_CONFIRM：待收款用户确认，可拉起微信收款确认页面进行收款确认 - * TRANSFERING：转账中，转账结果尚未明确，可拉起微信收款确认页面再次重试确认收款 - * SUCCESS： 转账成功 - * FAIL： 转账失败 - * CANCELING： 撤销中 - * CANCELLED： 已撤销 + * @param state ACCEPTED：单据已受理 + * PROCESSING：单据处理中，转账结果尚未明确，如一直处于此状态，建议检查账户余额是否足够 + * WAIT_USER_CONFIRM：待收款用户确认，可拉起微信收款确认页面进行收款确认 + * TRANSFERING：转账中，转账结果尚未明确，可拉起微信收款确认页面再次重试确认收款 + * SUCCESS： 转账成功 + * FAIL： 转账失败 + * CANCELING： 撤销中 + * CANCELLED： 已撤销 */ void withdrawNotify(String outBillNo, String state, String failReason); 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 edbd838ba..bbaa8c290 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 @@ -3,6 +3,7 @@ package com.czg.service.market.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.exceptions.ValidateException; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdcardUtil; import cn.hutool.core.util.StrUtil; @@ -234,7 +235,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl= config.getRewardCount()) { log.info("分销员{}已达到奖励次数上限, 次数: {}", currentDistributionUser.getId(), config.getRewardCount()); return; - }else { + } else { log.info("分销员奖励次数: {}", count); } } From b359b08713faeb463a5fd1d278b2b81c71075f19 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 24 Dec 2025 14:27:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=98=BE=E5=BC=8F=E6=8A=9B=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/controller/NotifyController.java | 3 +-- .../com/czg/exception/CzgControllerAdvice.java | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 5 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 a3657bec8..ad5b51dc0 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 @@ -4,8 +4,8 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.IoUtil; import com.alibaba.fastjson2.JSONObject; import com.czg.CzgPayUtils; -import com.czg.account.entity.ShopUser; import com.czg.account.service.ShopUserService; +import com.czg.constants.PayTypeConstants; import com.czg.entity.CzgBaseRespParams; import com.czg.market.entity.MkShopConsumeDiscountRecord; import com.czg.market.service.MkDistributionUserService; @@ -13,7 +13,6 @@ import com.czg.market.service.MkShopConsumeDiscountRecordService; import com.czg.market.service.OrderInfoService; import com.czg.order.entity.OrderInfo; import com.czg.order.entity.OrderPayment; -import com.czg.constants.PayTypeConstants; import com.czg.order.service.OrderInfoCustomService; import com.czg.order.service.OrderPaymentService; import com.czg.service.market.service.impl.AppWxServiceImpl; diff --git a/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java b/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java index c07d32e2e..b4aeb5569 100644 --- a/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java +++ b/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java @@ -86,7 +86,6 @@ public class CzgControllerAdvice { } - /** * 处理自定义异常 */ @@ -164,9 +163,20 @@ public class CzgControllerAdvice { @ExceptionHandler(value = Exception.class) @ResponseStatus(HttpStatus.OK) public CzgResult errorHandler(Exception ex) { -// setErrorLog(ex); - // 3. 处理未捕获的异常（系统异常，隐藏敏感信息） log.error("系统未处理异常", ex); + Throwable rootCause = ex; + while (rootCause.getCause() != null && !(rootCause instanceof CzgException)) { + rootCause = rootCause.getCause(); + } + + // 2. 如果根因是CzgException，直接抛出/返回该异常 + if (rootCause instanceof CzgException exception) { + return CzgResult.failure(exception.getCode(), exception.getMsg()); + }else if (rootCause instanceof ValidateException exception) { + return CzgResult.failure(exception.getStatus(), exception.getMessage()); + } + + // 3. 非业务异常，按原有逻辑处理 return CzgResult.failure(CzgRespCode.SYSTEM_ERROR.getCode(), "系统错误，请联系管理员"); } From 441ede37cf774b20a1f16d10d5e95fb7349e7b6d Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 24 Dec 2025 14:42:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MkShopConsumeDiscountRecordServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java index af88c754d..5f61c2353 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java @@ -106,13 +106,14 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl