rayson 7 месяцев назад
Родитель
Сommit
2fcb8fb256

+ 2 - 2
citu-framework/citu-spring-boot-starter-web/src/main/java/com/citu/framework/apilog/config/CituApiLogAutoConfiguration.java

@@ -29,8 +29,8 @@ public class CituApiLogAutoConfiguration implements WebMvcConfigurer {
      * 创建 ApiAccessLogFilter Bean,记录 API 请求日志
      */
     @Bean
-    @ConditionalOnProperty(prefix = "yudao.access-log", value = "enable", matchIfMissing = true)
-    // 允许使用 yudao.access-log.enable=false 禁用访问日志
+    @ConditionalOnProperty(prefix = "citu.access-log", value = "enable", matchIfMissing = true)
+    // 允许使用 citu.access-log.enable=false 禁用访问日志
     @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
     public FilterRegistrationBean<ApiAccessLogFilter> apiAccessLogFilter(WebProperties webProperties,
                                                                          @Value("${spring.application.name}") String applicationName,

+ 1 - 1
citu-module-mall/citu-module-trade-biz/src/main/java/com/citu/module/trade/controller/admin/config/TradeConfigController.java

@@ -27,7 +27,7 @@ public class TradeConfigController {
     @Resource
     private TradeConfigService tradeConfigService;
 
-    @Value("${yudao.tencent-lbs-key}")
+    @Value("${citu.tencent-lbs-key}")
     private String tencentLbsKey;
 
     @PutMapping("/save")

+ 1 - 1
citu-module-mall/citu-module-trade-biz/src/main/java/com/citu/module/trade/controller/app/config/AppTradeConfigController.java

@@ -32,7 +32,7 @@ public class AppTradeConfigController {
     @Resource
     private TradeConfigService tradeConfigService;
 
-    @Value("${yudao.tencent-lbs-key}")
+    @Value("${citu.tencent-lbs-key}")
     private String tencentLbsKey;
 
     @GetMapping("/get")

+ 1 - 1
citu-module-mall/citu-module-trade-biz/src/main/java/com/citu/module/trade/framework/delivery/config/TradeExpressProperties.java

@@ -16,7 +16,7 @@ import javax.validation.constraints.NotEmpty;
  * @author jason
  */
 @Component
-@ConfigurationProperties(prefix = "yudao.trade.express")
+@ConfigurationProperties(prefix = "citu.trade.express")
 @Data
 @Validated
 public class TradeExpressProperties {

+ 1 - 1
citu-module-mall/citu-module-trade-biz/src/main/java/com/citu/module/trade/framework/order/config/TradeOrderProperties.java

@@ -14,7 +14,7 @@ import java.time.Duration;
  * @author LeeYan9
  * @since 2022-09-15
  */
-@ConfigurationProperties(prefix = "yudao.trade.order")
+@ConfigurationProperties(prefix = "citu.trade.order")
 @Data
 @Validated
 public class TradeOrderProperties {

+ 3 - 0
citu-module-mall/citu-module-trade-biz/src/main/java/com/citu/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculator.java

@@ -102,6 +102,9 @@ public class TradeDiscountActivityPriceCalculator implements TradePriceCalculato
      * @return 用户等级
      */
     public MemberLevelRespDTO getMemberLevel(Long userId) {
+        if(null == userId) {
+            return null;
+        }
         MemberUserRespDTO user = memberUserApi.getUser(userId).getCheckedData();
         if (user == null || user.getLevelId() == null || user.getLevelId() <= 0) {
             return null;