From 83bffb6c84e203a3ee5b98279f478bc76f18f9eb Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 21 May 2024 11:59:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E5=8D=B7=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/controller/PayController.java       | 1 +
 .../system/cashierservice/service/PayService.java             | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
index 1c29eb1..088d704 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
@@ -86,6 +86,7 @@ public class PayController {
         }else {
             userId = TokenUtil.parseParamFromToken(token).getString("userId");
         }
+        //订单支付 orderId:62,payType=wechatPay,userId:or1l860rwM-rU_j9KrgMOwued
         log.info("订单支付 orderId:{},payType={},userId:{}",orderId,payType,userId);
         try {
 //            if(StringUtils.isNotBlank(orderType) && orderType.equals("group")){
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index fad9112..6117d86 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -376,11 +376,11 @@ public class PayService {
             throw new MsgException("生成订单错误");
         }
 
-        if (ObjectUtil.isNull(tbMerchantAccount.getMerchantId()) || ObjectUtil.isEmpty(tbMerchantAccount.getMerchantId())) {
+        if (ObjectUtil.isNull(tbMerchantAccount)) {
             return Result.fail("没有对应的商户");
         }
 
-        TbMerchantThirdApply thirdApply = tbMerchantThirdApplyMapper.selectByPrimaryKey(Integer.valueOf(tbMerchantAccount.getMerchantId()));
+        TbMerchantThirdApply thirdApply = tbMerchantThirdApplyMapper.selectByPrimaryKey(Integer.valueOf(tbMerchantAccount.getId()));
 
         if (ObjectUtil.isEmpty(thirdApply) || ObjectUtil.isNull(thirdApply)) {
             return Result.fail("支付通道不存在");