优化代码

java110-core/src/main/java/com/java110/core/factory/ChinaUmsFactory.java

@@ -2,6 +2,7 @@ package com.java110.core.factory;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Synchronized;
+import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.utils.cache.JWTCache;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.WechatConstant;
@@ -50,9 +51,9 @@ public class ChinaUmsFactory {
      * @return
      */
     @Java110Synchronized(value = "appId")
-    public static String getAccessToken() {
-        String appId = MappingCache.getValue(ChinaUmsFactory.CHINA_UMS_DOMAIN, "appId");
-        String appSecure = MappingCache.getValue(ChinaUmsFactory.CHINA_UMS_DOMAIN, "appKey");
+    public static String getAccessToken(SmallWeChatDto smallWeChatDto) {
+        String appId = smallWeChatDto.getRemarks().split("::")[0];
+        String appSecure = smallWeChatDto.getRemarks().split("::")[1];
         String accessToken = JWTCache.getValue(CHINA_UMS + appId);
         if (StringUtil.isEmpty(accessToken)) {
             return refreshAccessToken(appId, appSecure);

service-front/src/main/java/com/java110/front/smo/payment/adapt/chinaums/ChinaUmsPayAdapt.java

@@ -150,9 +150,9 @@ public class ChinaUmsPayAdapt implements IPayAdapt {
         JSONObject paramMap = new JSONObject();
         paramMap.put("requestTimestamp", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         paramMap.put("mid", smallWeChatDto.getMchId()); // 富友分配给二级商户的商户号
-        paramMap.put("tid", "88880001"); //终端号
+        paramMap.put("tid", "CV5EW7IM"); //终端号
         paramMap.put("instMid", "YUEDANDEFAULT");
-        paramMap.put("merOrderId", "1017"+orderNum);
+        paramMap.put("merOrderId", "11WP"+orderNum);
         paramMap.put("totalAmount", PayUtil.moneyToIntegerStr(payAmount));
         paramMap.put("notifyUrl", notifyUrl + "?wId=" + WechatFactory.getWId(smallWeChatDto.getAppId()));
         paramMap.put("tradeType", tradeType);
@@ -162,7 +162,7 @@ public class ChinaUmsPayAdapt implements IPayAdapt {
         logger.debug("调用支付统一下单接口" + paramMap.toJSONString());
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-        headers.add("Authorization", ChinaUmsFactory.getAccessToken());
+        headers.add("Authorization", ChinaUmsFactory.getAccessToken(smallWeChatDto));
         HttpEntity httpEntity = new HttpEntity(paramMap.toJSONString(), headers);
         ResponseEntity<String> responseEntity = outRestTemplate.exchange(
                 wechatAuthProperties.getWxPayUnifiedOrder(), HttpMethod.POST, httpEntity, String.class);