From 8c38c034ff9e608598309e1005abebcda882c613 Mon Sep 17 00:00:00 2001
From: 吴学文 <wuxuewen@wuxuewendeMacBook-Pro.local>
Date: 星期六, 11 一月 2020 22:22:30 +0800
Subject: [PATCH] 优化 微信回调参数处理

---
 AppFrontService/src/main/java/com/java110/app/smo/payment/impl/ToPaySMOImpl.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/AppFrontService/src/main/java/com/java110/app/smo/payment/impl/ToPaySMOImpl.java b/AppFrontService/src/main/java/com/java110/app/smo/payment/impl/ToPaySMOImpl.java
index a428fc7..4ac2347 100644
--- a/AppFrontService/src/main/java/com/java110/app/smo/payment/impl/ToPaySMOImpl.java
+++ b/AppFrontService/src/main/java/com/java110/app/smo/payment/impl/ToPaySMOImpl.java
@@ -16,6 +16,7 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 import java.io.IOException;
@@ -24,6 +25,7 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 
+@Service("toPaySMOImpl")
 public class ToPaySMOImpl extends AppAbstractComponentSMO implements IToPaySMO {
     private static final Logger logger = LoggerFactory.getLogger(AppAbstractComponentSMO.class);
 
@@ -74,7 +76,7 @@
 
         JSONObject userResult = JSONObject.parseObject(responseEntity.getBody().toString());
         int total = userResult.getIntValue("total");
-        if(total < 1){
+        if (total < 1) {
             //鏈煡璇㈠埌鐢ㄦ埛淇℃伅
             throw new IllegalArgumentException("鏈煡璇㈠井淇$敤鎴�");
         }
@@ -116,12 +118,12 @@
             resultMap.put("package", "prepay_id=" + resMap.get("prepay_id"));
             resultMap.put("signType", "MD5");
             resultMap.put("sign", PayUtil.createSign(resultMap, wechatAuthProperties.getKey()));
-            resultMap.put("returnCode", "SUCCESS");
-            resultMap.put("returnMsg", "OK");
+            resultMap.put("code", "0");
+            resultMap.put("msg", "涓嬪崟鎴愬姛");
             logger.info("銆愬皬绋嬪簭鏀粯銆戠粺涓�涓嬪崟鎴愬姛锛岃繑鍥炲弬鏁�:" + resultMap);
         } else {
-            resultMap.put("returnCode", resMap.get("return_code"));
-            resultMap.put("returnMsg", resMap.get("return_msg"));
+            resultMap.put("code", resMap.get("return_code"));
+            resultMap.put("msg", resMap.get("return_msg"));
             logger.info("銆愬皬绋嬪簭鏀粯銆戠粺涓�涓嬪崟澶辫触锛屽け璐ュ師鍥�:" + resMap.get("return_msg"));
         }
         return resultMap;
@@ -136,7 +138,7 @@
         paramMap.put("appid", wechatAuthProperties.getAppId());
         paramMap.put("mch_id", wechatAuthProperties.getMchId());
         paramMap.put("nonce_str", PayUtil.makeUUID(32));
-        paramMap.put("body", "");
+        paramMap.put("body", "HC鏅烘収瀹跺洯-鍋滆溅璐�");
         paramMap.put("out_trade_no", orderNum);
         paramMap.put("total_fee", PayUtil.moneyToIntegerStr(payAmount));
         paramMap.put("spbill_create_ip", PayUtil.getLocalIp());
@@ -147,8 +149,12 @@
 //杞崲涓簒ml
         String xmlData = PayUtil.mapToXml(paramMap);
 
+        logger.debug("璋冪敤鏀粯缁熶竴涓嬪崟鎺ュ彛" + xmlData);
+
         ResponseEntity<String> responseEntity = restTemplate.postForEntity(
                 wechatAuthProperties.getWxPayUnifiedOrder(), xmlData, String.class);
+
+        logger.debug("缁熶竴涓嬪崟杩斿洖"+responseEntity);
 //璇锋眰寰俊鍚庡彴锛岃幏鍙栭鏀粯ID
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
             throw new IllegalArgumentException("鏀粯澶辫触" + responseEntity.getBody());

--
Gitblit v1.8.0