From 17451b235b38072fd4bf25c80daf04bec3d4893d Mon Sep 17 00:00:00 2001
From: kino <378907426@qq.com>
Date: Tue, 19 Jan 2021 15:16:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E8=B0=83=E6=9B=B4=E6=96=B0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/winery/controller/AppOrderController.java     | 6 ++++++
 .../src/main/java/com/ruoyi/winery/domain/AppOrder.java     | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderController.java b/hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderController.java
index e56cd44c0..904ee2aa7 100644
--- a/hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderController.java
+++ b/hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderController.java
@@ -12,6 +12,7 @@ import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
 import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
+import com.itextpdf.io.util.DateTimeUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -225,6 +226,11 @@ public class AppOrderController extends BaseController {
     @PostMapping("/pay/payNotify")
     String payNotify(@RequestBody String xmlData) throws WxPayException {
         WxPayOrderNotifyResult notifyResult = wxPayService.parseOrderNotifyResult(xmlData);
+        AppOrder order = iAppOrderService.getById(notifyResult.getOutTradeNo());
+        order.setTransitionId(notifyResult.getTransactionId());
+        order.setStatus(2);
+        order.setPayTime(DateUtils.getNowDate());
+        iAppOrderService.updateById(order);
         // TODO 根据自己业务场景需要构造返回对象
         return WxPayNotifyResponse.success("成功");
     }
diff --git a/hope-winery/src/main/java/com/ruoyi/winery/domain/AppOrder.java b/hope-winery/src/main/java/com/ruoyi/winery/domain/AppOrder.java
index 7de131c8c..5db7126d7 100644
--- a/hope-winery/src/main/java/com/ruoyi/winery/domain/AppOrder.java
+++ b/hope-winery/src/main/java/com/ruoyi/winery/domain/AppOrder.java
@@ -63,6 +63,10 @@ private static final long serialVersionUID=1L;
     @Excel(name = "运单号")
     private String transportNo;
 
+    /** 流水号 */
+    @Excel(name = "流水号")
+    private String transitionId;
+
     /** 订单状态（0待支付1已取消2已支付3待收货4交易完成） */
     @Excel(name = "订单状态" , readConverterExp = "0=待支付,1=已取消,2=已支付,3=待收货,4=交易完成")
     private Integer status;