fix: 修改判断用户是否被禁用

yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/config/ApiConfigApi.java

@@ -24,4 +24,5 @@ public interface ApiConfigApi {
   * </pre>
   */
   CommonResult<String> getConfigKey( String key);
+  String getConfigKeyValue( String key);
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/config/ApiConfigImpl.java

@@ -50,4 +50,16 @@ public class ApiConfigImpl implements ApiConfigApi{
     }
     return success(config.getValue());
   }
+
+  @Override
+  public String getConfigKeyValue(String key) {
+    ConfigDO config = configService.getConfigByKey(key);
+    if (config == null) {
+      return null;
+    }
+    if (!config.getVisible()) {
+      throw exception(ErrorCodeConstants.CONFIG_GET_VALUE_ERROR_IF_VISIBLE);
+    }
+    return config.getValue();
+  }
 }

yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/request/order/CreateOrderRequest.java

@@ -40,10 +40,10 @@ public class CreateOrderRequest implements Serializable {
     private Integer shippingType;
 
     @Schema(description = "收货地址id")
-    private Integer addressId;
+    private Long addressId;
 
     @Schema(description = "优惠券编号")
-    private Integer couponId;
+    private Long couponId;
 
     @Schema(description = "支付类型:weixin-微信支付，yue-余额支付,alipay-支付宝支付")
     @NotBlank(message = "支付类型不能为空")

yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/request/order/OrderComputedPriceRequest.java

@@ -32,10 +32,10 @@ public class OrderComputedPriceRequest {
     private String preOrderNo;
 
     @Schema(description = "地址id")
-    private Integer addressId;
+    private Long addressId;
 
     @Schema(description = "优惠券id")
-    private Integer couponId;
+    private Long couponId;
 
     @Schema(description = "快递类型: 1-快递配送，2-到店自提")
     @NotNull(message = "快递类型不能为空")

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/order/StoreOrder.java

@@ -74,7 +74,7 @@ public class StoreOrder implements Serializable {
     private BigDecimal deductionPrice;
 
     @Schema(description = "优惠券id")
-    private Integer couponId;
+    private Long couponId;
 
     @Schema(description = "优惠券金额")
     private BigDecimal couponPrice;

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderServiceImpl.java

@@ -1249,7 +1249,7 @@ public class OrderServiceImpl implements OrderService {
             storeOrder.setStoreId(orderRequest.getStoreId());
         }
         storeOrder.setTotalNum(orderInfoVo.getOrderProNum());
-        storeOrder.setCouponId(Optional.ofNullable(orderRequest.getCouponId()).orElse(0));
+        storeOrder.setCouponId(Optional.ofNullable(orderRequest.getCouponId()).orElse(0L));
 
         // 订单总价
         BigDecimal totalPrice = computedOrderPriceResponse.getProTotalFee().add(computedOrderPriceResponse.getFreightFee());

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/utils/OrderUtil.java

@@ -106,13 +106,13 @@ public class OrderUtil {
         payType = payType.toLowerCase();
         switch (payType){
             case PayConstants.PAY_TYPE_WE_CHAT:
-                result = apiConfigApi.getConfigKey(SysConfigConstants.CONFIG_PAY_WEIXIN_OPEN).equals("1");
+                result = apiConfigApi.getConfigKeyValue(SysConfigConstants.CONFIG_PAY_WEIXIN_OPEN).equals("1");
                 break;
             case PayConstants.PAY_TYPE_YUE:
-                result = (apiConfigApi.getConfigKey(SysConfigConstants.CONFIG_YUE_PAY_STATUS).equals("1"));
+                result = (apiConfigApi.getConfigKeyValue(SysConfigConstants.CONFIG_YUE_PAY_STATUS).equals("1"));
                 break;
             case PayConstants.PAY_TYPE_ALI_PAY:
-                result = (apiConfigApi.getConfigKey(SysConfigConstants.CONFIG_ALI_PAY_STATUS).equals("1"));
+                result = (apiConfigApi.getConfigKeyValue(SysConfigConstants.CONFIG_ALI_PAY_STATUS).equals("1"));
                 break;
         }
         return result;

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/address/AddressApi.java

@@ -19,7 +19,7 @@ public interface AddressApi {
     AddressRespDTO getAddress(Long id, Long userId);
 
 
-    AddressRespDTO getById(Integer addressId);
+    AddressRespDTO getById(Long addressId);
 
     /**
      * 获取默认地址

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/address/AddressApiImpl.java

@@ -36,7 +36,7 @@ public class AddressApiImpl implements AddressApi {
     }
 
     @Override
-    public AddressRespDTO getById(Integer addressId) {
+    public AddressRespDTO getById(Long addressId) {
         LambdaQueryWrapper<AddressDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(AddressDO::getId, addressId);
         return AddressConvert.INSTANCE.convert02(addressMapper.selectOne(lambdaQueryWrapper));