| Pass |
- 14:35:17 |
+ 0:26:02 |
Test passed
|
@@ -128,13 +128,13 @@
Started
-
十一月 10, 2026 14:35:16
+
十一月 11, 2026 00:26:01
Ended
-
十一月 10, 2026 14:35:17
+
十一月 11, 2026 00:26:02
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/MallOrderController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/MallOrderController.java
index fe58f403..274c52d8 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/MallOrderController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/MallOrderController.java
@@ -23,6 +23,9 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -239,15 +242,32 @@ public class MallOrderController {
*/
@PostMapping("/userRequireMake")
@ApiOperation(value = "鐢ㄦ埛鐐瑰嚮鍑洪")
- public Result userRequireMake(@ApiParam("璁㈠崟ID") @RequestParam String orderId) {
+ public Result userRequireMake(@ApiParam("璁㈠崟ID") @RequestParam String orderId,
+ @ApiParam("棰勭害鐢ㄩ鏃堕棿") @RequestParam(required = false) String userRequireMakeTime) {
try {
- mallOrderService.userRequireMake(orderId);
+ mallOrderService.userRequireMake(orderId, parseUserRequireMakeTime(userRequireMakeTime));
return ResultUtil.success("閫氱煡鍟嗗鎴愬姛");
} catch (Exception e) {
log.error("鍑洪澶辫触: {}", e.getMessage(), e);
return ResultUtil.error(e.getMessage());
}
}
+
+ private Date parseUserRequireMakeTime(String value) {
+ if (value == null || value.trim().isEmpty()) {
+ return null;
+ }
+ String text = value.trim().replace(' ', 'T');
+ if (text.length() == 16) {
+ text = text + ":00";
+ }
+ try {
+ return Date.from(LocalDateTime.parse(text).atZone(ZoneId.systemDefault()).toInstant());
+ } catch (Exception e) {
+ throw new RuntimeException("鐢ㄩ鏃堕棿鏍煎紡涓嶆纭");
+ }
+ }
+
/**
* 鍟嗗鎷掑崟
*/
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/mq/OrderDelayConsumer.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/mq/OrderDelayConsumer.java
index 218a64ce..e04a540c 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/mq/OrderDelayConsumer.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/mq/OrderDelayConsumer.java
@@ -275,7 +275,6 @@ public class OrderDelayConsumer {
MallOrder order = mallOrderMapper.selectById(orderId);
if (order == null
|| !Integer.valueOf(2).equals(order.getDeliveryType())
- || Integer.valueOf(1).equals(order.getUserRequireMake())
|| order.getUserRequireMakeTime() == null
|| order.getShopMakeTime() != null
|| order.getStatus() == null
@@ -288,6 +287,7 @@ public class OrderDelayConsumer {
jPushService.sendPushNotification(shop.getClientId(), "鎮ㄦ湁涓绗旈绾﹀埌搴楄鍗曞彲浠ュ嚭椁愬暒锛", orderId);
}
orderAsyncProducer.sendCloudPrint(orderId, "SHOP_APPOINTMENT_MAKE");
+ mallOrderService.scheduleStorePickupCookTimeout(orderId);
}
private void handleTransferArriveTimeout(String orderId) {
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/MallOrderService.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/MallOrderService.java
index 3f3df6d0..08439f1b 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/MallOrderService.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/MallOrderService.java
@@ -85,7 +85,12 @@ public interface MallOrderService extends IService {
/**
* 鐢ㄦ埛瑕佹眰鍑洪
*/
- void userRequireMake(String orderId);
+ void userRequireMake(String orderId, java.util.Date userRequireMakeTime);
+
+ /**
+ * 鍒板簵璁㈠崟閫氱煡鍟嗗鍑洪鍚庯紝鎸夊彇椁愭椂闂村拰鍟嗗鍑洪鏃堕暱璁剧疆鍑洪瓒呮椂鎻愰啋銆
+ */
+ void scheduleStorePickupCookTimeout(String orderId);
void updateSaleCacheIncrementalViaMq(String shopId, String regionId, java.util.List items, Integer shopSaleCount);
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderGroupServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderGroupServiceImpl.java
index ddf5b78f..9fbc34c0 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderGroupServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderGroupServiceImpl.java
@@ -161,13 +161,19 @@ public class MallOrderGroupServiceImpl extends ServiceImpl orderIdList = Arrays.asList(group.getGroupOrderIds().split(","));
+ List orderIdList = parseGroupOrderIds(group);
List goodsList = new ArrayList<>();
LambdaQueryWrapper oqw = new LambdaQueryWrapper<>();
- oqw.eq(MallOrder::getShopId, group.getShopId())
- .eq(MallOrder::getStatus, ORDER_STATUS_WAIT_GROUP)
+ oqw.eq(MallOrder::getStatus, ORDER_STATUS_WAIT_GROUP)
.in(MallOrder::getId, orderIdList);
- List waitingOrders = mallOrderService.list(oqw);
+ List waitingOrders = orderIdList.isEmpty()
+ ? new ArrayList<>()
+ : mallOrderService.list(oqw);
+ if (waitingOrders.size() < orderIdList.size()) {
+ log.warn("鎴愬洟鏃舵湁璁㈠崟鏈浜庡緟鎴愬洟锛実roupId={}锛実roupOrderIds={}锛屽懡涓={}",
+ groupId, group.getGroupOrderIds(),
+ waitingOrders.stream().map(MallOrder::getId).collect(java.util.stream.Collectors.toList()));
+ }
boolean isFace2Face = group.getIsFace() != null && group.getIsFace() == 1;
List deliveryOrders = new ArrayList<>();
@@ -177,9 +183,10 @@ public class MallOrderGroupServiceImpl extends ServiceImpl ouw = new LambdaUpdateWrapper<>();
+ String latestSeq = null;
//浠ｈ〃璇ユ嫾鍥㈠瓙璁㈠崟璁㈠崟閫夋嫨鍒板簵
if(targetStatus == 3){
- String latestSeq = String.format("%s-%s",
+ latestSeq = String.format("%s-%s",
LocalDate.now().format(DateTimeFormatter.ofPattern("MMdd")),
merchantOrderSeqUtil.generateOrderSequence(order.getShopId(), 2));
ouw.eq(MallOrder::getId, order.getId())
@@ -192,12 +199,21 @@ public class MallOrderGroupServiceImpl extends ServiceImpl 0) {
- cookTimeMins = cachedCookTime;
- }
- } catch (Exception e) {
- log.error("鑾峰彇搴楅摵鍑洪鏃堕棿缂撳瓨寮傚父: {}", e.getMessage());
+ if (order == null || StringUtils.isBlank(order.getId())) {
+ return;
+ }
+ long delayMillis = resolveStorePickupCookTimeoutDelay(order);
+ log.info("鍒板簵鍑洪瓒呮椂鎻愰啋 orderId={} userRequireMakeTime={} delayMillis={}",
+ order.getId(), order.getUserRequireMakeTime(), delayMillis);
+ orderAsyncProducer.sendDelayMessage(order.getId(), "Shop_Cook_Timeout", delayMillis);
+ }
+
+ /**
+ * 瓒呮椂鎻愰啋鏃跺埢 = 鍙栭鏃堕棿 - 鍟嗗鍑洪鏃堕暱銆
+ * 杩欎釜鏃跺埢宸茬粡杩囦簡鏃讹紝浠庡綋鍓嶈捣鎸夊晢瀹跺嚭椁愭椂闀胯鏃讹紝閬垮厤绔嬪埢鍒よ秴鏃躲
+ * 鑻ュ晢瀹跺嚭椁愭椂闀块暱浜庨氱煡鍚庣殑鍓╀綑鏃堕棿锛屽垯绛夐氱煡鍚庡啀缁欒冻鍑洪鏃堕暱銆
+ */
+ private long resolveStorePickupCookTimeoutDelay(MallOrder order) {
+ long cookMillis = 15L * 60 * 1000L;
+ try {
+ int cachedCookTime = safeMinutes(getCookingTime(order.getRegionId(), order.getShopId()));
+ if (cachedCookTime > 0) {
+ cookMillis = cachedCookTime * 60L * 1000L;
}
- orderAsyncProducer.sendDelayMessage(order.getId(), "Shop_Cook_Timeout", cookTimeMins * 60 * 1000L);
+ } catch (Exception e) {
+ log.error("鑾峰彇搴楅摵鍑洪鏃堕棿缂撳瓨寮傚父: {}", e.getMessage());
+ }
+ long now = System.currentTimeMillis();
+ Date pickupTime = order.getUserRequireMakeTime();
+ if (pickupTime == null) {
+ return cookMillis;
+ }
+ long pickupAt = pickupTime.getTime();
+ long startAt = Math.max(now, pickupAt - STORE_PICKUP_NOTIFY_BEFORE_MILLIS);
+ long timeoutAt = pickupAt - cookMillis;
+ if (timeoutAt <= now) {
+ timeoutAt = now + cookMillis;
+ } else {
+ timeoutAt = Math.max(timeoutAt, startAt + cookMillis);
}
+ return Math.max(1000L, timeoutAt - now);
}
/**
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java
index 2f655974..649df517 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java
@@ -805,7 +805,7 @@ public class MallOrderServiceImpl extends ServiceImpl guw = new LambdaUpdateWrapper<>();
guw.eq(MallOrderGroup::getId, group.getId())
.set(MallOrderGroup::getCurrentMembers, newMembers);
- mallOrderGroupMapper.update(group,guw);
+ mallOrderGroupMapper.update(null, guw);
//缂撳瓨鏇存柊
group.setCurrentMembers(newMembers);
shopGroupOrderCacheUtil.update(group.getShopId(), group);
@@ -816,7 +816,7 @@ public class MallOrderServiceImpl extends ServiceImpl guw = new LambdaUpdateWrapper<>();
guw.eq(MallOrderGroup::getId, group.getId())
.set(MallOrderGroup::getStatus, GROUP_STATUS_FORMING).set(MallOrderGroup::getCurrentMembers, newMembers);
- mallOrderGroupMapper.update(group,guw);
+ mallOrderGroupMapper.update(null, guw);
//鏅氭嫾鍥㈠洟闀垮彂璧锋嫾鍥㈣繘缂撳瓨
if(order.getOrderType() == ORDER_TYPE_GROUP){
group.setCurrentMembers(newMembers);
@@ -831,7 +831,7 @@ public class MallOrderServiceImpl extends ServiceImpl guw = new LambdaUpdateWrapper<>();
guw.eq(MallOrderGroup::getId, group.getId())
.set(MallOrderGroup::getCurrentMembers, newMembers);
- mallOrderGroupMapper.update(group,guw);
+ mallOrderGroupMapper.update(null, guw);
}
}
if (group != null) {
@@ -918,20 +918,51 @@ public class MallOrderServiceImpl extends ServiceImpl 0) {
- cookTimeMins = cachedCookTime;
- }
- } catch (Exception e) {
- log.error("鑾峰彇搴楅摵鍑洪鏃堕棿缂撳瓨寮傚父: {}", e.getMessage());
+ if (order == null) {
+ return;
+ }
+ long delayMillis = resolveStorePickupCookTimeoutDelay(order);
+ log.info("鍒板簵鍑洪瓒呮椂鎻愰啋 orderId={} userRequireMakeTime={} delayMillis={}",
+ orderId, order.getUserRequireMakeTime(), delayMillis);
+ orderAsyncProducer.sendDelayMessage(orderId, "Shop_Cook_Timeout", delayMillis);
+ }
+
+ /**
+ * 瓒呮椂鎻愰啋鏃跺埢 = 鍙栭鏃堕棿 - 鍟嗗鍑洪鏃堕暱銆
+ * 杩欎釜鏃跺埢宸茬粡杩囦簡鏃讹紝浠庡綋鍓嶈捣鎸夊晢瀹跺嚭椁愭椂闀胯鏃讹紝閬垮厤绔嬪埢鍒よ秴鏃躲
+ * 鑻ュ晢瀹跺嚭椁愭椂闀块暱浜庨氱煡鍚庣殑鍓╀綑鏃堕棿锛屽垯绛夐氱煡鍚庡啀缁欒冻鍑洪鏃堕暱銆
+ */
+ private long resolveStorePickupCookTimeoutDelay(MallOrder order) {
+ long cookMillis = 15L * 60 * 1000L;
+ try {
+ int cachedCookTime = safeMinutes(getCookingTime(order.getRegionId(), order.getShopId()));
+ if (cachedCookTime > 0) {
+ cookMillis = cachedCookTime * 60L * 1000L;
}
- orderAsyncProducer.sendDelayMessage(orderId, "Shop_Cook_Timeout", cookTimeMins * 60 * 1000L);
+ } catch (Exception e) {
+ log.error("鑾峰彇搴楅摵鍑洪鏃堕棿缂撳瓨寮傚父: {}", e.getMessage());
+ }
+ long now = System.currentTimeMillis();
+ Date pickupTime = order.getUserRequireMakeTime();
+ if (pickupTime == null) {
+ return cookMillis;
+ }
+ long pickupAt = pickupTime.getTime();
+ long startAt = Math.max(now, pickupAt - STORE_PICKUP_NOTIFY_BEFORE_MILLIS);
+ long timeoutAt = pickupAt - cookMillis;
+ if (timeoutAt <= now) {
+ timeoutAt = now + cookMillis;
+ } else {
+ timeoutAt = Math.max(timeoutAt, startAt + cookMillis);
}
+ return Math.max(1000L, timeoutAt - now);
}
@Override
@@ -1586,19 +1617,26 @@ public class MallOrderServiceImpl extends ServiceImpl uw = new LambdaUpdateWrapper<>();
- uw.eq(MallOrder::getId, orderId).set(MallOrder::getUserRequireMake,1);
- this.update(uw);
- Shop shop = getShopFromCache(order.getRegionId(), order.getShopId());
- if (shop != null && StringUtils.isNotBlank(shop.getClientId())) {
- jPushService.sendPushNotification(shop.getClientId(), "鎮ㄦ湁涓绗旀柊鐨勫埌搴楄鍗",orderId);
+ uw.eq(MallOrder::getId, orderId).set(MallOrder::getUserRequireMake, 1);
+ order.setUserRequireMake(1);
+ if (userRequireMakeTime != null) {
+ uw.set(MallOrder::getUserRequireMakeTime, userRequireMakeTime);
+ order.setUserRequireMakeTime(userRequireMakeTime);
}
- orderAsyncProducer.sendCloudPrint(orderId, "SHOP_INSTANT_MAKE");
-
- // 瑙﹀彂鍟嗗鍑洪瓒呮椂鐩戝惉
- triggerShopCookTimeoutEvent(orderId);
+ this.update(uw);
+ notifyOrScheduleStorePickupMake(order);
}
@Override
@@ -2146,6 +2184,7 @@ public class MallOrderServiceImpl extends ServiceImpl