Merge branch 'master' of https://gitee.com/super-shopkeeper/chaozhanggui

pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java

@@ -677,7 +677,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())){

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;
 

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,36 @@ public abstract class BaseUserInfoService extends ServiceImpl<UserInfoMapper, Us
                 queryUserApp.setAlias(merchantBaseInfo.getAlias());
             }
         }
-
         resultMap.put("userApp", queryUserApp);
 
+
+        //登录同步到充值服务
+        resultMap.put("rechargeToken", "");
+        try {
+            MultiValueMap<String, String> multiValueMap = new LinkedMultiValueMap<>();
+            multiValueMap.add("mobile", loginName);
+
+            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();