diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/appplus/pay/wechat/ThirdMiniJsapiPayVo.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/appplus/pay/wechat/ThirdMiniJsapiPayVo.java deleted file mode 100644 index c8aa57c1e..000000000 --- a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/appplus/pay/wechat/ThirdMiniJsapiPayVo.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.bsd.pjcloud.thirdparty.vo.appplus.pay.wechat; - -import cn.hutool.core.util.ObjectUtil; -import lombok.Data; - -import java.util.HashMap; - -/** - * JSAPI/小程序下单 - */ -@Data -public class ThirdMiniJsapiPayVo { - - public static final String SUCCESS = "SUCCESS"; - - private String return_code; - - private String return_msg; - - private String appid; - - private String mch_id; - - private String device_info; - - private String nonce_str; - - private String sign; - - private String result_code; - - private String err_code; - - private String err_code_des; - - private String trade_type; - - private String prepay_id; - - private String code_url; - - private HashMap appPayParams; - - public boolean isHttpSucess() { - return ObjectUtil.equals(ThirdMiniWechatQueryVo.SUCCESS, return_code); - } - - public boolean isPaySucess() { - return ObjectUtil.equals(ThirdMiniWechatQueryVo.SUCCESS, result_code); - } - -} diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/mch/MchPaySettingController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/mch/MchPaySettingController.java index fb8c8db09..93ca8adc1 100755 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/mch/MchPaySettingController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/mch/MchPaySettingController.java @@ -47,6 +47,7 @@ public class MchPaySettingController { @Operation(summary = "用户可以支付的方式(目前微信、支付宝)", description = "用户可以支付的方式(目前微信、支付宝)") @GetMapping("/app/pay-type-list") public R> getUserPaySettingList() { + System.out.println("getUserPaySettingList"); PjcloudUser user = SecurityUtils.getUser(); return R.ok(mchPaySettingService.getUserPaySettingList(user)); } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchPaySettingServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchPaySettingServiceImpl.java index 6df3898b5..babfe9ac9 100755 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchPaySettingServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchPaySettingServiceImpl.java @@ -76,6 +76,7 @@ public class MchPaySettingServiceImpl extends ServiceImpl getUserPaySettingList(PjcloudUser user) { log.error("getUserPaySettingList.user:{}", JSONUtil.toJsonStr(user)); + log.warn("getUserPaySettingList.user:{}", JSONUtil.toJsonStr(user)); // 查询当前的登录用户 UserInfo userInfo = remoteUserService.getByUserId(user.getId()).getData(); if (ObjectUtil.isEmpty(userInfo)) {