diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java index 49acd90f5..f66ed7e36 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java @@ -51,6 +51,7 @@ public class PayController extends BaseController { * 充值余额支付/微信余额充值 * 提供给小程序使用 * http://localhost:8080/uniapp/pay/weixinPay + * @deprecated 使用汇付支付,充值余额 */ @PostMapping("/weixinPay") public RestApiResponse weixinPay(HttpServletRequest request, @RequestBody WeixinPayDTO dto) { @@ -262,8 +263,12 @@ public class PayController extends BaseController { // 充值余额 附加参数 Map weixinMap = memberService.rechargeBalanceWithAdapay(dto); response = new RestApiResponse<>(ImmutableMap.of("weixinMap", weixinMap)); + } catch (BusinessException e) { + logger.error("汇付余额充值接口 error", e); + response = new RestApiResponse<>(e.getCode(), e.getMessage()); } catch (Exception e) { - response = new RestApiResponse<>(); + logger.error("汇付余额充值接口 error", e); + response = new RestApiResponse<>(ReturnCodeEnum.CODE_MEMBER_RECHARGE_BALANCE_ERROR); } return response; } diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index 053aa4c8b..9afdb6337 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -11,6 +11,8 @@ import com.google.common.collect.Maps; import com.huifu.adapay.core.exception.BaseAdaPayException; import com.huifu.adapay.model.Payment; import com.jsowell.adapay.common.CreateAdaPaymentParam; +import com.jsowell.adapay.config.AbstractAdapayConfig; +import com.jsowell.adapay.factory.AdapayConfigFactory; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.constant.Constants; import com.jsowell.common.core.page.PageResponse; @@ -598,11 +600,19 @@ public class MemberService { * @throws Exception */ public Map rechargeBalanceWithAdapay(WeixinPayDTO dto) throws Exception { + // 获取支付信息 + AbstractAdapayConfig config = AdapayConfigFactory.getConfig(dto.getAppId()); + if (config == null) { + throw new BusinessException(ReturnCodeEnum.CODE_ADAPAY_CONFIG_IS_NULL_ERROR); + } + log.info("使用汇付支付充值余额 支付配置参数:{}", JSON.toJSONString(config)); + // 封装对象 CreateAdaPaymentParam createAdaPaymentParam = new CreateAdaPaymentParam(); createAdaPaymentParam.setOrder_no(SnowflakeIdWorker.getSnowflakeId()); createAdaPaymentParam.setPay_amt(AdapayUtil.formatAmount(dto.getAmount())); - createAdaPaymentParam.setApp_id(ADAPAY_APP_ID); // 移动到配置文件中 + // createAdaPaymentParam.setApp_id(ADAPAY_APP_ID); // 移动到配置文件中 + createAdaPaymentParam.setApp_id(config.getAdapayAppId()); // 移动到配置文件中 createAdaPaymentParam.setPay_channel("wx_lite"); // todo 如果以后有支付宝等别的渠道,这里需要做修改,判断是什么渠道的请求 createAdaPaymentParam.setGoods_title("充值余额"); createAdaPaymentParam.setGoods_desc("会员充值余额"); 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 4a59f3c96..47154ef70 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,12 +104,15 @@ public enum ReturnCodeEnum { CODE_ADAPAY_CALLBACK_IS_NULL_ERROR("00100048", "未查询到订单支付记录回调"), - CODE_INSUFFICIENT_BALANCE_ERROR("00100049", "余额不足"), + CODE_INSUFFICIENT_BALANCE_ERROR("00100049", "结算账户余额不足"), CODE_OPEN_ID_IS_NULL_ERROR("00100050", "获取openId失败"), CODE_THIS_NAME_HAS_BEEN_USED("00100051", "此站点已有该别名,请重新设置"), + CODE_ADAPAY_CONFIG_IS_NULL_ERROR("00100052", "获取支付配置信息异常"), + + /* 个人桩 start */ CODE_PILE_HAS_BEEN_BINDING_ERROR("00400001", "此桩已被绑定,请联系管理员!"), diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/WeixinPayDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/WeixinPayDTO.java index cd3e177b4..f5d240aea 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/WeixinPayDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/WeixinPayDTO.java @@ -22,6 +22,8 @@ public class WeixinPayDTO extends BaseMemberDTO{ */ private String attach; + private String appId; + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)