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> 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 map = new HashMap<>(); + map.put("env", env); map.put("shopId", shopId); map.put("orderId", checkOrderPay.getOrderId()); map.put("payAmount", checkOrderPay.getOrderAmount());