From 73929aaac59443af2e2dd178321ae558914a3364 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 30 Jan 2026 09:49:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AE=E6=92=AD=E5=9B=BE=E5=BC=80=E5=85=B3?=
 =?UTF-8?q?=20=E8=8E=B7=E5=8F=96=E5=9C=B0=E5=9D=80=20=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/controller/user/UCarouselController.java     | 1 +
 .../main/java/com/czg/controller/pay/OrderPayController.java  | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UCarouselController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UCarouselController.java
index ccfe5c164..97a7adf7a 100644
--- a/cash-api/market-server/src/main/java/com/czg/controller/user/UCarouselController.java
+++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UCarouselController.java
@@ -35,6 +35,7 @@ public class UCarouselController {
     @GetMapping("/carousel")
     public CzgResult<List<MkCarousel>> getCarousels(MkCarouselDTO carouselDTO) {
         carouselDTO.setShopId(StpKit.USER.getShopId());
+        carouselDTO.setIsEnabled(1);
         return CzgResult.success(mkCarouselService.getCarousels(carouselDTO));
     }
 
diff --git a/cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java b/cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java
index b63cb7d49..90915c136 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java
@@ -20,6 +20,7 @@ import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -44,6 +45,8 @@ public class OrderPayController {
     private OrderInfoService orderInfoService;
     @DubboReference
     private SysParamsService paramsService;
+    @Value("${spring.profiles.active}")
+    private String env;
 
     @PostMapping("/creditPay")
     @Debounce(value = "#payParam.checkOrderPay.orderId")
@@ -154,6 +157,7 @@ public class OrderPayController {
         AssertUtil.isNull(shopId, "店铺id不能为空");
         AssertUtil.isNull(checkOrderPay, "订单信息不能为空");
         Map<String, Object> map = new HashMap<>();
+        map.put("env", env);
         map.put("shopId", shopId);
         map.put("orderId", checkOrderPay.getOrderId());
         map.put("payAmount", checkOrderPay.getOrderAmount());