From f97b6c3dcd4dd4427823ffdbdf9ff3efe9f9c148 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 25 Feb 2025 15:40:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=8E=B7=E5=8F=96shopID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/controller/OrderPayController.java    | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java b/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java
index 544b0b95..97ea9feb 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java
@@ -1,7 +1,6 @@
 package com.czg.controller;
 
 import com.czg.resp.CzgResult;
-import com.czg.sa.StpKit;
 import com.czg.service.order.dto.OrderPayParamDTO;
 import com.czg.service.order.service.PayService;
 import com.czg.utils.AssertUtil;
@@ -9,10 +8,7 @@ import com.czg.utils.ServletUtil;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
@@ -29,14 +25,14 @@ public class OrderPayController {
     private PayService payService;
 
     @PostMapping("/creditPay")
-    public CzgResult<Object> creditPayOrder(@Validated @RequestBody OrderPayParamDTO payParam) {
-        payParam.setShopId(StpKit.USER.getShopId());
+    public CzgResult<Object> creditPayOrder(@RequestHeader Long shopId, @Validated @RequestBody OrderPayParamDTO payParam) {
+        payParam.setShopId(shopId);
         return payService.creditPayOrder(payParam);
     }
 
     @PostMapping("/cashPay")
-    public CzgResult<Object> cashPayOrder(@Validated @RequestBody OrderPayParamDTO payParam) {
-        payParam.setShopId(StpKit.USER.getShopId());
+    public CzgResult<Object> cashPayOrder(@RequestHeader Long shopId, @Validated @RequestBody OrderPayParamDTO payParam) {
+        payParam.setShopId(shopId);
         return payService.cashPayOrder(payParam);
     }
 
@@ -50,8 +46,8 @@ public class OrderPayController {
      * accountPay(小程序使用) 密码支付 用户密码pwd 必填
      */
     @PostMapping("/vipPay")
-    public CzgResult<Object> vipPayOrder(@Validated @RequestBody OrderPayParamDTO payParam) {
-        payParam.setShopId(StpKit.USER.getShopId());
+    public CzgResult<Object> vipPayOrder(@RequestHeader Long shopId, @Validated @RequestBody OrderPayParamDTO payParam) {
+        payParam.setShopId(shopId);
         AssertUtil.isBlank(payParam.getPayType(), "支付类型不可为空");
         return payService.vipPayOrder(payParam);
     }
@@ -60,8 +56,8 @@ public class OrderPayController {
      * h5支付
      */
     @PostMapping("/h5Pay")
-    public CzgResult<Map<String, Object>> h5PayOrder(HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) {
-        payParam.setShopId(StpKit.USER.getShopId());
+    public CzgResult<Map<String, Object>> h5PayOrder(@RequestHeader Long shopId, HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) {
+        payParam.setShopId(shopId);
         return payService.h5PayOrder(ServletUtil.getClientIPByHeader(request), payParam);
     }
 
@@ -72,8 +68,8 @@ public class OrderPayController {
      * openId  必填
      */
     @PostMapping("/jsPay")
-    public CzgResult<Map<String, Object>> jsPayOrder(HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) {
-        payParam.setShopId(StpKit.USER.getShopId());
+    public CzgResult<Map<String, Object>> jsPayOrder(@RequestHeader Long shopId, HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) {
+        payParam.setShopId(shopId);
         return payService.jsPayOrder(ServletUtil.getClientIPByHeader(request), payParam);
     }
 
@@ -83,8 +79,8 @@ public class OrderPayController {
      * openId  必填
      */
     @PostMapping("/ltPayOrder")
-    public CzgResult<Map<String, Object>> ltPayOrder(HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) {
-        payParam.setShopId(StpKit.USER.getShopId());
+    public CzgResult<Map<String, Object>> ltPayOrder(@RequestHeader Long shopId, HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) {
+        payParam.setShopId(shopId);
         return payService.ltPayOrder(ServletUtil.getClientIPByHeader(request), payParam);
     }
 
@@ -92,8 +88,8 @@ public class OrderPayController {
      * 正扫
      */
     @PostMapping("/scanPay")
-    public CzgResult<Map<String, Object>> scanPayOrder(HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) {
-        payParam.setShopId(StpKit.USER.getShopId());
+    public CzgResult<Map<String, Object>> scanPayOrder(@RequestHeader Long shopId, HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) {
+        payParam.setShopId(shopId);
         return payService.scanPayOrder(ServletUtil.getClientIPByHeader(request), payParam);
     }
 
@@ -102,8 +98,8 @@ public class OrderPayController {
      * authCode 必填 扫描码
      */
     @PostMapping("/microPay")
-    public CzgResult<Map<String, Object>> microPayOrder(@Validated @RequestBody OrderPayParamDTO payParam) {
-        payParam.setShopId(StpKit.USER.getShopId());
+    public CzgResult<Map<String, Object>> microPayOrder(@RequestHeader Long shopId, @Validated @RequestBody OrderPayParamDTO payParam) {
+        payParam.setShopId(shopId);
         return payService.microPayOrder(payParam);
     }
 }