| Pass |
- 11:55:05 |
+ 18:08:32 |
Test passed
|
@@ -128,13 +128,13 @@
Started
-
九月 22, 2026 11:55:05
+
九月 29, 2026 18:08:31
Ended
-
九月 22, 2026 11:55:05
+
九月 29, 2026 18:08:32
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/AdminMallOrderGroupController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/AdminMallOrderGroupController.java
index fb9a3d10..30322adb 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/AdminMallOrderGroupController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/AdminMallOrderGroupController.java
@@ -97,6 +97,7 @@ public class AdminMallOrderGroupController {
private String productName;
private String productPicture;
private String productId;
+ private java.math.BigDecimal storeOriginalPrice;
private Shop shopItem;
}
@@ -400,6 +401,7 @@ public class AdminMallOrderGroupController {
vo.setProductName(buildDisplayProductName(group, product));
vo.setProductPicture(group.getProductPicture());
vo.setProductId(group.getProductId());
+ vo.setStoreOriginalPrice(getStoreOriginalPrice(product == null ? null : product.getAttributeListPrice()));
vo.setShopItem(shop);
return vo;
}
@@ -409,14 +411,10 @@ public class AdminMallOrderGroupController {
if (StringUtils.isBlank(productName) && product != null) {
productName = product.getProductName();
}
- String specPrice = getFirstSpecPrice(product == null ? null : product.getAttributeListPrice());
- if (StringUtils.isBlank(productName) || StringUtils.isBlank(specPrice)) {
- return productName;
- }
- return productName + "-搴楀唴鍘熶环" + specPrice + "鍏";
+ return productName;
}
- private String getFirstSpecPrice(String attributeListPrice) {
+ private java.math.BigDecimal getStoreOriginalPrice(String attributeListPrice) {
if (StringUtils.isBlank(attributeListPrice)) {
return null;
}
@@ -426,7 +424,7 @@ public class AdminMallOrderGroupController {
return null;
}
JSONObject firstSpec = specs.getJSONObject(0);
- return firstSpec == null ? null : firstSpec.getStr("specPrice");
+ return firstSpec == null ? null : firstSpec.getBigDecimal("specPrice");
} catch (Exception e) {
log.warn("瑙ｆ瀽鍟嗗搧瑙勬牸鍘熶环澶辫触 attributeListPrice={}: {}", attributeListPrice, e.getMessage());
return null;
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopAreaController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopAreaController.java
index f8ee15e8..f0258e4e 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopAreaController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopAreaController.java
@@ -311,6 +311,7 @@ public class ShopAreaController {
shopArea.setRadiusMeters(null);
shopArea.setGeoPolygon(null);
shopArea.setAreaKind(1);
+ shopArea.setExpressErrandEnabled(1);
return null;
}
Integer areaKind = shopArea.getAreaKind();
@@ -319,6 +320,16 @@ public class ShopAreaController {
} else if (areaKind != 1 && areaKind != 2) {
return ResultUtil.error("鍖哄煙绫诲瀷浠呮敮鎸侊細1鏍″洯鍖哄煙锛2绀句細鍖哄煙");
}
+ if (shopArea.getAreaKind() != 2) {
+ shopArea.setExpressErrandEnabled(1);
+ } else {
+ Integer expressErrandEnabled = shopArea.getExpressErrandEnabled();
+ if (expressErrandEnabled == null) {
+ shopArea.setExpressErrandEnabled(1);
+ } else if (expressErrandEnabled != 0 && expressErrandEnabled != 1) {
+ return ResultUtil.error("蹇/璺戣吙寮鍏充粎鏀寔锛1寮鍚紝0鍏抽棴");
+ }
+ }
Integer commissionRatio = shopArea.getCommissionRatio();
if (commissionRatio == null) {
shopArea.setCommissionRatio(0);
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopController.java
index 7c39e4b3..168ca74b 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ShopController.java
@@ -145,6 +145,9 @@ public class ShopController {
shop.setRegion("");
shop.setRegionId(null);
}
+ if (shop.getStoreConsumeOnly() == null) {
+ shop.setStoreConsumeOnly(0);
+ }
shopService.save(shop);
@@ -196,6 +199,9 @@ public class ShopController {
oldShop.setRegion("");
oldShop.setRegionId(null);
}
+ if (shop.getStoreConsumeOnly() != null) {
+ oldShop.setStoreConsumeOnly(shop.getStoreConsumeOnly());
+ }
UpdateUtils.copyNonNullProperties(shop, oldShop);
// 4. 鏇存柊鏁版嵁搴擄紙姝ゆ椂鏇存柊鐨勬槸甯︽湁瀹屾暣鏁版嵁鐨 oldShop锛屼笉浼氳娓呯┖鍏朵粬瀛楁锛
shopService.update(oldShop);
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Shop.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Shop.java
index 4de41eea..83769faa 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Shop.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Shop.java
@@ -187,6 +187,9 @@ public class Shop extends HiverBaseEntity {
@ApiModelProperty(value = "鏄惁鏀寔鍫傞 0鍚 1鏄")
private Integer supportDineIn;
+ @ApiModelProperty(value = "鏄惁鍙仛鍒板簵娑堣垂 0鍚 1鏄")
+ private Integer storeConsumeOnly;
+
@ApiModelProperty(value = "鏄惁鏀寔鍟嗗鑷厤閫 0鍚 1鏄")
private Integer supportShopDelivery;
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ShopArea.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ShopArea.java
index 0d060e39..f520c472 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ShopArea.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ShopArea.java
@@ -83,6 +83,10 @@ public class ShopArea extends HiverBaseEntity {
@Column(nullable = false, columnDefinition = "int default 1")
private Integer areaKind = 1;
+ @ApiModelProperty(value = "绀句細鍖哄煙鏄惁寮鍚揩閫/璺戣吙锛1寮鍚紝0鍏抽棴")
+ @Column(nullable = false, columnDefinition = "int default 1")
+ private Integer expressErrandEnabled = 1;
+
@Transient
@TableField(exist = false)
@ApiModelProperty(value = "鐖惰妭鐐瑰悕绉")
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/quartz/GroupBuyExpireTask.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/quartz/GroupBuyExpireTask.java
index eed60ede..f217dbe8 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/quartz/GroupBuyExpireTask.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/quartz/GroupBuyExpireTask.java
@@ -35,6 +35,8 @@ public class GroupBuyExpireTask {
private static final String SHOP_CACHE_PREFIX = "SHOP_CACHE:";
private static final String SHOP_PRODUCTS_PREFIX = "SHOP_PRODUCTS:";
private static final String SHOP_GROUP_ORDERS_PREFIX = "SHOP_GROUP_ORDERS:";
+ private static final String MOCK_SHOP_SALE_MAX_PREFIX = "MOCK_SHOP_SALE_MAX:";
+ private static final String MOCK_PRODUCT_SALE_MAX_PREFIX = "MOCK_PRODUCT_SALE_MAX:";
private static final int MOCK_GROUP_SHOP_COUNT = 20;
private static final int MOCK_GROUP_TARGET_MEMBERS = 2;
private static final int SALE_SHOP_COUNT = 40;
@@ -202,18 +204,21 @@ public class GroupBuyExpireTask {
private boolean increaseShopSaleCache(Map.Entry shopEntry, int increment) {
String shopId = getShopId(shopEntry);
- ShopCacheDTO cacheDTO = parseShopCacheDTO(shopEntry.getValue());
+ Object latestShopCache = StringUtils.isBlank(shopId) ? null : redisTemplateHelper.hGet(buildShopCacheKey(MOCK_REGION_ID), shopId);
+ ShopCacheDTO cacheDTO = parseShopCacheDTO(latestShopCache != null ? latestShopCache : shopEntry.getValue());
if (StringUtils.isBlank(shopId) || cacheDTO == null || cacheDTO.getShop() == null || increment <= 0) {
return false;
}
Shop shop = cacheDTO.getShop();
- int oldSaleCount = shop.getSaleCount() == null ? 0 : shop.getSaleCount();
if (!increaseProductTailWarnCache(shopId, increment)) {
return false;
}
- shop.setSaleCount(oldSaleCount + increment);
+ int oldSaleCount = maxSaleValue(shop.getSaleCount(), redisTemplateHelper.hGet(buildMockShopSaleMaxKey(MOCK_REGION_ID), shopId));
+ int newSaleCount = oldSaleCount + increment;
+ shop.setSaleCount(newSaleCount);
redisTemplateHelper.hPut(buildShopCacheKey(MOCK_REGION_ID), shopId, JSONUtil.toJsonStr(cacheDTO));
+ redisTemplateHelper.hPut(buildMockShopSaleMaxKey(MOCK_REGION_ID), shopId, String.valueOf(newSaleCount));
return true;
}
@@ -233,7 +238,9 @@ public class GroupBuyExpireTask {
List productIndexes = new ArrayList<>();
for (int i = 0; i < productArray.size(); i++) {
JSONObject productObj = productArray.getJSONObject(i);
- if (productObj != null && Integer.valueOf(1).equals(productObj.getInt("delFlag", 1))) {
+ if (productObj != null
+ && StringUtils.isNotBlank(productObj.getStr("id"))
+ && Integer.valueOf(1).equals(productObj.getInt("delFlag", 1))) {
productIndexes.add(i);
}
}
@@ -244,10 +251,14 @@ public class GroupBuyExpireTask {
Collections.shuffle(productIndexes);
int productCount = Math.min(productIndexes.size(), totalIncrement);
List productIncrements = randomPositiveParts(totalIncrement, productCount);
+ String productSaleMaxKey = buildMockProductSaleMaxKey(shopId);
for (int i = 0; i < productCount; i++) {
JSONObject productObj = productArray.getJSONObject(productIndexes.get(i));
- int oldTailWarn = productObj.getInt("tailWarn", 0);
- productObj.set("tailWarn", oldTailWarn + productIncrements.get(i));
+ String productId = productObj.getStr("id");
+ int oldTailWarn = maxSaleValue(productObj.getInt("tailWarn", 0), redisTemplateHelper.hGet(productSaleMaxKey, productId));
+ int newTailWarn = oldTailWarn + productIncrements.get(i);
+ productObj.set("tailWarn", newTailWarn);
+ redisTemplateHelper.hPut(productSaleMaxKey, productId, String.valueOf(newTailWarn));
}
redisTemplateHelper.set(productsKey, productArray.toString());
return true;
@@ -381,4 +392,28 @@ public class GroupBuyExpireTask {
private String buildShopGroupOrdersKey(String shopId) {
return SHOP_GROUP_ORDERS_PREFIX + shopId;
}
+
+ private String buildMockShopSaleMaxKey(String regionId) {
+ return MOCK_SHOP_SALE_MAX_PREFIX + regionId;
+ }
+
+ private String buildMockProductSaleMaxKey(String shopId) {
+ return MOCK_PRODUCT_SALE_MAX_PREFIX + shopId;
+ }
+
+ private int maxSaleValue(Integer currentValue, Object cachedMaxValue) {
+ int current = currentValue == null ? 0 : Math.max(0, currentValue);
+ return Math.max(current, parseSaleValue(cachedMaxValue));
+ }
+
+ private int parseSaleValue(Object value) {
+ if (value == null) {
+ return 0;
+ }
+ try {
+ return Math.max(0, Integer.parseInt(value.toString()));
+ } catch (Exception e) {
+ return 0;
+ }
+ }
}
diff --git a/hiver-modules/hiver-mall/src/main/resources/db/shop_area_express_errand_enabled.sql b/hiver-modules/hiver-mall/src/main/resources/db/shop_area_express_errand_enabled.sql
new file mode 100644
index 00000000..ab604bba
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/resources/db/shop_area_express_errand_enabled.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `t_shop_area`
+ ADD COLUMN `express_errand_enabled` int(11) NOT NULL DEFAULT 1 COMMENT '绀句細鍖哄煙鏄惁寮鍚揩閫/璺戣吙锛1寮鍚紝0鍏抽棴';
diff --git a/hiver-modules/hiver-mall/src/main/resources/db/shop_store_consume_only.sql b/hiver-modules/hiver-mall/src/main/resources/db/shop_store_consume_only.sql
new file mode 100644
index 00000000..61d8ebf4
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/resources/db/shop_store_consume_only.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `t_shop`
+ ADD COLUMN `store_consume_only` TINYINT NOT NULL DEFAULT 0 COMMENT '鏄惁鍙仛鍒板簵娑堣垂 0鍚 1鏄' AFTER `support_dine_in`;
diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/ShopAreaMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/ShopAreaMapper.xml
index 496add9f..6e96f805 100644
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/ShopAreaMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/ShopAreaMapper.xml
@@ -23,11 +23,12 @@
+
id, create_by, create_time, del_flag, update_by, update_time, is_parent, parent_id,
sort_order, status, title, is_canteen, delivery_enabled, parent_agent_id, parent_agent_name,
- commission_ratio, center_lng, center_lat, radius_meters, geo_polygon, area_kind
+ commission_ratio, center_lng, center_lat, radius_meters, geo_polygon, area_kind, express_errand_enabled