From 9f8b3700ffbcc616a97e7ee2ea283ef4df3d666a Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 04 六月 2026 08:43:55 +0800
Subject: [PATCH] 代码生成
---
server/services/src/main/java/com/doumee/service/business/impl/ShopInfoServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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..4fe7cda 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
@@ -1358,7 +1358,7 @@
List<String> tagNames = new ArrayList<>();
for (String tagId : locationTagIds.split(",")) {
Category tag = categoryMapper.selectById(Integer.valueOf(tagId.trim()));
- if (tag != null) {
+ if (tag != null && tag.getDeleted() == Constants.ZERO && tag.getStatus() == Constants.ZERO ) {
tagNames.add(tag.getName());
}
}
@@ -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