From d9e6b0a653f65325611be29232f7f4f50780f255 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Wed, 8 Mar 2023 11:13:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E3=80=81?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/zscat/mallplus/oms/entity/OmsOrder.java   | 2 +-
 .../zscat/mallplus/pay/controller/alipay/AliPayController.java  | 1 +
 .../zscat/mallplus/pay/controller/wxpay/WxPayController.java    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrder.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrder.java
index f88261b..55ed6f1 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrder.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrder.java
@@ -120,7 +120,7 @@ public class OmsOrder extends BaseEntity implements Serializable {
     private BigDecimal discountAmount;
 
     /**
-     * 支付方式：0->未支付；2->支付宝；1->微信 3余额支付
+     * 支付方式：0->未支付；1->支付宝；2->微信 3余额支付
      */
     @TableField("pay_type")
     private Integer payType;
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/alipay/AliPayController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/alipay/AliPayController.java
index b4b6465..6895b8f 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/alipay/AliPayController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/alipay/AliPayController.java
@@ -834,6 +834,7 @@ public class AliPayController extends AbstractAliPayApiController {
             OmsOrder orderInfo = list.get(0);
             orderInfo.setStatus(OrderStatus.TO_DELIVER.getValue());
             orderInfo.setPaymentTime(new Date());
+            orderInfo.setPayType(1);
             boolean verifyResult = AlipaySignature.rsaCertCheckV1(params, ALIPAY_PUBLIC_KEY, "UTF-8", "RSA2");
 
             if (verifyResult) {
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/wxpay/WxPayController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/wxpay/WxPayController.java
index 0afd2e9..0de5df4 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/wxpay/WxPayController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/wxpay/WxPayController.java
@@ -994,6 +994,7 @@ public class WxPayController extends AbstractWxPayApiController {
         OmsOrder orderInfo = list.get(0);
         orderInfo.setStatus(OrderStatus.TO_DELIVER.getValue());
         orderInfo.setPaymentTime(new Date());
+        orderInfo.setPayType(2);
         // 注意重复通知的情况，同一订单号可能收到多次通知，请注意一定先判断订单状态
         // 注意此处签名方式需与统一下单的签名类型一致
         if (WxPayKit.verifyNotify(params, this.getApiConfig().getPartnerKey(), SignType.HMACSHA256)) {