From a87f114e5b1eb5cb9a3edc01c67cbc59410659bb Mon Sep 17 00:00:00 2001 From: zhujunshuai <602228920@qq.com> Date: Fri, 14 Apr 2023 11:29:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=B0=E5=85=85=E5=80=BC=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/pluss/platform/constants/Constant.java | 4 ++-- .../java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/Constant.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/Constant.java index ebed667..cad1ef1 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/Constant.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/Constant.java @@ -151,7 +151,7 @@ public class Constant { /** * 默认收款商户号 */ - public static final String DEFUALT_CASHIER_MERCHANT = "M80020220111357490"; + public static final String DEFUALT_CASHIER_MERCHANT = "M800202207078584958"; /** * 默认收款商户属性key @@ -166,7 +166,7 @@ public class Constant { /** * 支付宝H5支付前缀 */ - public static final String ALIPAY_H5_PAY_URL_PRIFIX = "alipays://platformapi/startapp?appId=20000067&url="; + public static final String ALIPAY_H5_PAY_URL_PRIFIX = "alipays://platformapi/startapp?appId=2021003175619219&url="; /** * 收款通道类型 diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java index d720058..762e7a9 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java @@ -673,7 +673,7 @@ public class ApiPayServiceImpl implements ApiPayService { } Long cTime = order.getCreateDt().getTime(); Long nowTime = System.currentTimeMillis(); - if(nowTime - cTime >= 1000 * 60 * 10){ + if(nowTime - cTime >= 1000 * 60 * 1000){ return ResultGenerator.genFailResult("订单已超时，请重新下单！"); } if(StringUtil.isNotEmpty(order.getPayData())){ From 59fd9ee9f525783e032bd87822d8a062220f846b Mon Sep 17 00:00:00 2001 From: zhujunshuai <602228920@qq.com> Date: Fri, 14 Apr 2023 11:31:04 +0800 Subject: [PATCH 2/3] update --- .../platform/userInfo/UserInfoService.java | 1 + .../userInfo/impl/BaseUserInfoService.java | 40 ++++++++++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/UserInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/UserInfoService.java index 8b631fc..acf4791 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/UserInfoService.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/UserInfoService.java @@ -1,5 +1,6 @@ package cn.pluss.platform.userInfo; +import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java index 17cafd5..0b27114 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java @@ -32,17 +32,27 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.*; /** @@ -445,9 +455,37 @@ public abstract class BaseUserInfoService extends ServiceImpl multiValueMap = new LinkedMultiValueMap<>(); + multiValueMap.add("mobile", loginName); + + HttpEntity> httpEntity = new HttpEntity<>(multiValueMap); + + RestTemplate restTemplate = new RestTemplate(); + // 设置为UTF8编码 + restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8)); + + String tokenInfo = restTemplate.postForObject( + "https://cz-2133569-1313226949.ap-shanghai.run.tcloudbase.com/login/kyMobilelogin", multiValueMap, + String.class); + + ObjectMapper mapper = new ObjectMapper(); + JsonNode jsonNode = mapper.readTree(tokenInfo); + JsonNode code = jsonNode.get("code"); + + if (code.asText().equals("0")) { + JsonNode token = jsonNode.get("data").get("token"); + resultMap.put("rechargeToken", token.asText()); + } + } catch (Exception e) { + + } + + clearJpushAlias(queryUserApp.getUserId() + ""); OperationRecord opRecord = new OperationRecord(); From c14ab932622e96394e0a995d72da7e9b94a38f52 Mon Sep 17 00:00:00 2001 From: zhujunshuai <602228920@qq.com> Date: Fri, 14 Apr 2023 13:55:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=85=85=E5=80=BC=E6=9C=8D=E5=8A=A1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/pluss/platform/userInfo/impl/BaseUserInfoService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java index 0b27114..6187b08 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java @@ -457,14 +457,13 @@ public abstract class BaseUserInfoService extends ServiceImpl multiValueMap = new LinkedMultiValueMap<>(); multiValueMap.add("mobile", loginName); - HttpEntity> httpEntity = new HttpEntity<>(multiValueMap); - RestTemplate restTemplate = new RestTemplate(); // 设置为UTF8编码 restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));