diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java index a1476c99e..9879e89f3 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON; import com.google.common.collect.ImmutableMap; import com.jsowell.common.UserAgentUtils; import com.jsowell.common.annotation.Anonymous; +import com.jsowell.common.constant.Constants; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.enums.adapay.AdapayPayChannelEnum; @@ -275,8 +276,13 @@ public class PayController extends BaseController { throw new BusinessException(ReturnCodeEnum.CODE_TOKEN_ERROR); } dto.setMemberId(memberId); + // 判断appid,看是否为万车充,如果为万车充小程序,直接返回,不进行充值余额 + String appId = request.getHeader("appId"); + if (StringUtils.equals(appId, Constants.DEFAULT_APP_ID)) { + return new RestApiResponse<>(ReturnCodeEnum.CODE_FUNCTION_IS_UNAVAILABLE); + } // 设置appId - dto.setWechatAppId(request.getHeader("appId")); + dto.setWechatAppId(appId); // 获取openId MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMemberId(memberId); if (memberBasicInfo == null) { diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java index fb119a112..2ac80d3dd 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java @@ -104,6 +104,8 @@ public enum ReturnCodeEnum { CODE_MEMBER_RECHARGE_BALANCE_ERROR("00100046", "会员充值余额失败"), + CODE_FUNCTION_IS_UNAVAILABLE("00100044", "功能暂不可用"), + CODE_ORDER_COMPLETE_ERROR("00100047", "该订单已经结算完成!"), CODE_ADAPAY_CALLBACK_IS_NULL_ERROR("00100048", "未查询到订单支付记录回调"),