diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/ShopPayApiController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/ShopPayApiController.java index 93f7e2dc..ce36138e 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/ShopPayApiController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/ShopPayApiController.java @@ -3,8 +3,6 @@ package cn.ysk.cashier.controller.shop; import cn.hutool.core.map.MapProxy; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; -import cn.hutool.json.JSONObject; -import cn.hutool.json.JSONUtil; import cn.ysk.cashier.exception.BadRequestException; import cn.ysk.cashier.system.enums.ParamsEnum; import cn.ysk.cashier.system.service.ParamsService; @@ -14,7 +12,6 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -39,9 +36,6 @@ public class ShopPayApiController { private final ParamsService paramsService; - @Value("${spring.profiles.active}") - private String env; - @GetMapping("getOrderPayUrl") @ApiOperation("获取店铺订单支付URL") @ApiImplicitParams({ @@ -59,9 +53,7 @@ public class ShopPayApiController { if(StrUtil.isBlank(orderId)){ throw new BadRequestException("订单id不能为空"); } - String text = paramsService.getValue(ParamsEnum.SHOP_ORDER_PAY_BASE_URL.name()); - JSONObject config = JSONUtil.parseObj(text); - String baseUrl = config.getStr(env); + String baseUrl = paramsService.getValue(ParamsEnum.SHOP_ORDER_PAY_BASE_URL.name()); String buildUrl = URLUtil.buildQuery(params, Charset.defaultCharset()); String fullUrl = baseUrl.concat("?").concat(buildUrl); return ResponseEntity.ok().body(fullUrl);