BJ_ZTEITS-Developers / parking-cloud-yudao

Commit e6770399e6643b5818c949c53d4bcc84fe799c8b

Authored by YunaiV
2 parents cf1b4174 e7f77922

Merge remote-tracking branch 'origin/master-jdk17' into master-jdk17

Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractSliderDesensitizationHandler.java
  View file @e677039
@@ -17,7 +17,7 @@ public abstract class AbstractSliderDesensitizationHandler<T extends Annotation> @@ -17,7 +17,7 @@ public abstract class AbstractSliderDesensitizationHandler<T extends Annotation>
17 public String desensitize(String origin, T annotation) { 17 public String desensitize(String origin, T annotation) {
18 // 1. 判断是否禁用脱敏 18 // 1. 判断是否禁用脱敏
19 Object disable = SpringExpressionUtils.parseExpression(getDisable(annotation)); 19 Object disable = SpringExpressionUtils.parseExpression(getDisable(annotation));
20 - if (Boolean.FALSE.equals(disable)) { 20 + if (Boolean.TRUE.equals(disable)) {
21 return origin; 21 return origin;
22 } 22 }
23 23
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImpl.java
  View file @e677039
@@ -122,7 +122,7 @@ public class TradePriceServiceImpl implements TradePriceService { @@ -122,7 +122,7 @@ public class TradePriceServiceImpl implements TradePriceService {
122 List<ProductSkuRespDTO> skuList = spuIdAndSkuListMap.get(spuId); 122 List<ProductSkuRespDTO> skuList = spuIdAndSkuListMap.get(spuId);
123 List<AppTradeProductSettlementRespVO.Sku> skuVOList = convertList(skuList, sku -> { 123 List<AppTradeProductSettlementRespVO.Sku> skuVOList = convertList(skuList, sku -> {
124 AppTradeProductSettlementRespVO.Sku skuVO = new AppTradeProductSettlementRespVO.Sku() 124 AppTradeProductSettlementRespVO.Sku skuVO = new AppTradeProductSettlementRespVO.Sku()
125 - .setId(sku.getId()).setPromotionPrice(sku.getPrice()); 125 + .setId(sku.getId());
126 TradePriceCalculateRespBO.OrderItem orderItem = new TradePriceCalculateRespBO.OrderItem() 126 TradePriceCalculateRespBO.OrderItem orderItem = new TradePriceCalculateRespBO.OrderItem()
127 .setPayPrice(sku.getPrice()).setCount(1); 127 .setPayPrice(sku.getPrice()).setCount(1);
128 // 计算限时折扣的优惠价格 128 // 计算限时折扣的优惠价格