From eb7a808aaf7dd0a6dd2ff70f9ef3f8ce0b1e31d1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 22 五月 2026 18:27:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/service/business/impl/ShopInfoServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/ShopInfoServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/ShopInfoServiceImpl.java
index 1c7807f..089b6fd 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/ShopInfoServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/ShopInfoServiceImpl.java
@@ -1801,15 +1801,15 @@
private List<String> validateCityPricingRules(Integer cityId) {
List<String> errors = new ArrayList<>();
- // type=0 灏卞湴瀛樺彇瑙勫垯锛氳嚦灏�1鏉★紝fieldB涓嶄负绌�
+ // type=0 灏卞湴瀵勫瓨瑙勫垯锛氳嚦灏�1鏉★紝fieldB涓嶄负绌�
List<PricingRule> type0 = pricingRuleMapper.selectList(new QueryWrapper<PricingRule>().lambda()
.eq(PricingRule::getDeleted, Constants.ZERO)
.eq(PricingRule::getType, Constants.ZERO)
.eq(PricingRule::getCityId, cityId));
if (type0.isEmpty()) {
- errors.add("缂哄皯灏卞湴瀛樺彇瑙勫垯");
+ errors.add("缂哄皯灏卞湴瀵勫瓨瑙勫垯");
} else if (type0.stream().allMatch(r -> StringUtils.isBlank(r.getFieldB()))) {
- errors.add("灏卞湴瀛樺彇瑙勫垯鏈厤缃敹璐瑰崟浠�");
+ errors.add("灏卞湴瀵勫瓨瑙勫垯鏈厤缃敹璐瑰崟浠�");
}
// type=1 寮傚湴瀵勯�佽鍒欙細鑷冲皯1鏉★紝fieldB/C/D/E涓嶄负绌�
--
Gitblit v1.9.3