From 7c6e90dcb144f4c2dee4053ef6aa9531c23e5254 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 03 九月 2021 03:43:29 +0800
Subject: [PATCH] 优化代码
---
service-front/src/main/java/com/java110/front/smo/payment/adapt/fuiouPay/FuiouPayAdapt.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/payment/adapt/fuiouPay/FuiouPayAdapt.java b/service-front/src/main/java/com/java110/front/smo/payment/adapt/fuiouPay/FuiouPayAdapt.java
old mode 100644
new mode 100755
index 654ddd7..f3c5f25
--- a/service-front/src/main/java/com/java110/front/smo/payment/adapt/fuiouPay/FuiouPayAdapt.java
+++ b/service-front/src/main/java/com/java110/front/smo/payment/adapt/fuiouPay/FuiouPayAdapt.java
@@ -28,8 +28,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
@@ -121,12 +120,8 @@
if ("000000".equals(resMap.getString("result_code"))) {
if (WechatAuthProperties.TRADE_TYPE_JSAPI.equals(tradeType)) {
- resultMap.put("appId", smallWeChatDto.getAppId());
- resultMap.put("timeStamp", PayUtil.getCurrentTimeStamp());
- resultMap.put("nonceStr", PayUtil.makeUUID(32));
- resultMap.put("package", "prepay_id=" + resMap.get("session_id"));
- resultMap.put("signType", "MD5");
- resultMap.put("sign", PayUtil.createSign(resultMap, smallWeChatDto.getPayPassword()));
+ resultMap.putAll(JSONObject.toJavaObject(JSONObject.parseObject(resMap.getString("reserved_pay_info")), Map.class));
+ resultMap.put("sign",resultMap.get("paySign"));
} else if (WechatAuthProperties.TRADE_TYPE_APP.equals(tradeType)) {
resultMap.put("appId", smallWeChatDto.getAppId());
resultMap.put("timeStamp", PayUtil.getCurrentTimeStamp());
@@ -173,7 +168,7 @@
paramMap.put("mchnt_cd", smallWeChatDto.getMchId()); // 瀵屽弸鍒嗛厤缁欎簩绾у晢鎴风殑鍟嗘埛鍙�
paramMap.put("random_str", PayUtil.makeUUID(32));
paramMap.put("order_amt", PayUtil.moneyToIntegerStr(payAmount));
- paramMap.put("mchnt_order_no", orderNum);
+ paramMap.put("mchnt_order_no", "9457" + orderNum);
paramMap.put("txn_begin_ts", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_DEFAULT));
paramMap.put("goods_des", systemName + feeName);
paramMap.put("term_id", "abcdefgh");
@@ -186,9 +181,11 @@
paramMap.put("sign", createSign(paramMap, smallWeChatDto.getPayPassword()));
logger.debug("璋冪敤鏀粯缁熶竴涓嬪崟鎺ュ彛" + paramMap.toJSONString());
-
- ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(
- PAY_UNIFIED_ORDER_URL, paramMap.toJSONString(), String.class);
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json");
+ HttpEntity httpEntity = new HttpEntity(paramMap.toJSONString(), headers);
+ ResponseEntity<String> responseEntity = outRestTemplate.exchange(
+ PAY_UNIFIED_ORDER_URL, HttpMethod.POST, httpEntity, String.class);
logger.debug("缁熶竴涓嬪崟杩斿洖" + responseEntity);
--
Gitblit v1.8.0