From 2c8800a0b513255ff3bbf309b4913472d48a543a Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 21 May 2024 11:02:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=A1=8C=E7=A0=81?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BA=97=E9=93=BAid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/chaozhanggui/system/cashierservice/auth/LoginFilter.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java b/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java
index 98c611d..9feb93c 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java
@@ -46,7 +46,6 @@ public class LoginFilter implements Filter {
             "cashierService/common/**",//通用接口
             "cashierService/distirict/**",//首页其它接口
             "cashierService/login/**",//登录部分接口不校验
-            "cashierService/product/queryShopIdByTableCode",
             "cashierService/product/queryProduct",
             "cashierService/product/productInfo",
             "cashierService/notify/**",//登录部分接口不校验

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 2/3] =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E5=8D=B7=E6=94=AF?=
 =?UTF-8?q?=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("支付通道不存在");

From cdde32af81f388b36beaa92a1f33ea0936edb577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Tue, 21 May 2024 12:00:15 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/controller/PayController.java       | 4 ----
 1 file changed, 4 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..81019c1 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
@@ -56,16 +56,12 @@ public class PayController {
     /**
      * 储值卡支付
      * @param token
-     * @param loginName
-     * @param clientType
      * @param orderId
      * @param memberId
      * @return
      */
     @GetMapping("accountPay")
     public Result accountPay(@RequestHeader("token") String token,
-                             @RequestHeader("loginName") String loginName,
-                             @RequestHeader("clientType") String clientType,
                              @RequestParam("orderId") String orderId,
                              @RequestParam("memberId") String memberId
     ){