From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java | 66 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java
index 19d8662..ea8de16 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java
@@ -1,21 +1,24 @@
package com.panzhihua.applets.api;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.panzhihua.common.model.dtos.shop.WxPayNotifyOrderDTO;
-import com.panzhihua.common.service.community.CommunityService;
-import com.panzhihua.common.utlis.StringUtils;
-import lombok.extern.slf4j.Slf4j;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.json.XML;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.model.dtos.shop.WxPayNotifyOrderDTO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.StringUtils;
+
+import lombok.extern.slf4j.Slf4j;
/**
* @auther lyq
@@ -36,60 +39,61 @@
String inputLine = "";
String notityXml = "";
try {
- while((inputLine = request.getReader().readLine()) != null){
+ while ((inputLine = request.getReader().readLine()) != null) {
notityXml += inputLine;
}
- //关闭流
+ // 关闭流
request.getReader().close();
- log.info("微信回调内容信息："+notityXml);
- //解析成Json
+ log.info("微信回调内容信息：" + notityXml);
+ // 解析成Json
org.json.JSONObject xmlJson = XML.toJSONObject(notityXml);
- if(StringUtils.isNotEmpty(xmlJson.toString())){
+ if (StringUtils.isNotEmpty(xmlJson.toString())) {
JSONObject resultData = JSON.parseObject(xmlJson.get("xml").toString());
- //成功支付订单
- if(resultData.getString("result_code").equals("SUCCESS") && resultData.getString("return_code").equals("SUCCESS")){
+ // 成功支付订单
+ if (resultData.getString("result_code").equals("SUCCESS")
+ && resultData.getString("return_code").equals("SUCCESS")) {
WxPayNotifyOrderDTO notifyOrderDTO = new WxPayNotifyOrderDTO();
- //订单号
+ // 订单号
String orderTradeNo = resultData.getString("out_trade_no");
notifyOrderDTO.setOrderTradeNo(orderTradeNo);
- //微信支付订单号
+ // 微信支付订单号
String wxTradeNo = resultData.getString("transaction_id");
notifyOrderDTO.setWxTradeNo(wxTradeNo);
- //订单金额
+ // 订单金额
String totalFee = resultData.getString("total_fee");
notifyOrderDTO.setTotalFee(totalFee);
- //支付完成时间
+ // 支付完成时间
String payTime = resultData.getString("time_end");
notifyOrderDTO.setPayTime(payTime);
- //现金支付金额
+ // 现金支付金额
String cashFee = resultData.getString("cash_fee");
notifyOrderDTO.setCashFee(cashFee);
- //根据订单号修改订单信息
+ // 根据订单号修改订单信息
communityService.wxOrderPayNotify(notifyOrderDTO);
- //封装 返回值
+ // 封装 返回值
StringBuffer buffer = new StringBuffer();
buffer.append("<xml>");
buffer.append("<return_code>SUCCESS</return_code>");
buffer.append("<return_msg>OK</return_msg>");
buffer.append("</xml>");
- //给微信服务器返回 成功标示 否则会一直询问 咱们服务器 是否回调成功
+ // 给微信服务器返回 成功标示 否则会一直询问 咱们服务器 是否回调成功
PrintWriter writer = response.getWriter();
- //返回
+ // 返回
writer.print(buffer.toString());
- }else{//未成功支付订单
- //封装 返回值
+ } else {// 未成功支付订单
+ // 封装 返回值
StringBuffer buffer = new StringBuffer();
buffer.append("<xml>");
buffer.append("<return_code>FAIL</return_code>");
buffer.append("<return_msg>FAIL</return_msg>");
buffer.append("</xml>");
- //给微信服务器返回 成功标示 否则会一直询问 咱们服务器 是否回调成功
+ // 给微信服务器返回 成功标示 否则会一直询问 咱们服务器 是否回调成功
PrintWriter writer = response.getWriter();
- //返回
+ // 返回
writer.print(buffer.toString());
}
}
--
Gitblit v1.7.1