result = new ArrayList<>(entries.size());
+ for (Object value : entries.values()) {
+ if (value != null) {
+ result.add(JSONUtil.toBean(value.toString(), MallDeliveryOrder.class));
+ }
+ }
+ return result;
+ } catch (Exception e) {
+ log.error("鑾峰彇閰嶉佸憳鍏ㄩ儴璁㈠崟缂撳瓨澶辫触: workerId={}", workerId, e);
+ return Collections.emptyList();
+ }
+ }
+
// ================================================================
// 鍐呴儴宸ュ叿
// ================================================================
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/WorkerRedisCacheUtil.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/WorkerRedisCacheUtil.java
new file mode 100644
index 00000000..46715b0e
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/WorkerRedisCacheUtil.java
@@ -0,0 +1,244 @@
+package cc.hiver.mall.utils;
+
+import cc.hiver.core.common.redis.RedisTemplateHelper;
+import cc.hiver.mall.pojo.vo.WorkerRedisVo;
+import cn.hutool.json.JSONUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 閰嶉佸憳淇℃伅缂撳瓨宸ュ叿绫
+ *
+ * 搴曞眰浣跨敤 Redis Hash 缁撴瀯锛屼繚璇佹寜 regionId + workerId 缁村害鐨 O(1) 璇诲啓鏁堢巼銆
+ *
+ * Key = WORKER_REDIS:{regionId}
+ * Field = workerId
+ * Value = WorkerRedisVo 鐨 JSON 搴忓垪鍖
+ *
+ *
+ * 浣跨敤鍦烘櫙锛氱姸鎬佸彂鐢熷彉鍖栨椂锛堝垱寤恒佹洿鏂般佸彇娑堛佸畬鎴愮瓑锛夛紝
+ *
+ * @author system
+ */
+@Slf4j
+@Component
+public class WorkerRedisCacheUtil {
+
+ /** Redis Key 鍓嶇紑 */
+ private static final String KEY_PREFIX = "WORKER_REDIS:";
+
+ @Autowired
+ private RedisTemplateHelper redisTemplateHelper;
+
+ // ================================================================
+ // Key 鏋勫缓
+ // ================================================================
+
+ private String buildKey(String regionId) {
+ return KEY_PREFIX + regionId;
+ }
+
+ // ================================================================
+ // 瀛樻斁锛坧ut锛
+ // ================================================================
+
+ /**
+ * 瀛樻斁鍗曚釜鍒扮紦瀛
+ *
+ * @param regionId 鍖哄煙ID
+ * @param workerVO VO锛堝繀椤诲寘鍚湁鏁堢殑 id锛
+ */
+ public void put(String regionId, WorkerRedisVo workerVO) {
+ if (StringUtils.isBlank(regionId) || workerVO == null || StringUtils.isBlank(workerVO.getWorkerId())) {
+ log.info("WorkerRedisCacheUtil.put 鍙傛暟鏃犳晥, workerId={}, workerVO={}", regionId, workerVO);
+ return;
+ }
+ try {
+ String key = buildKey(regionId);
+ String json = JSONUtil.toJsonStr(workerVO);
+ redisTemplateHelper.hPut(key, workerVO.getWorkerId(), json);
+ log.info("缂撳瓨閰嶉佸憳: regionId={}, workerId={}", regionId, workerVO.getWorkerId());
+ } catch (Exception e) {
+ log.info("缂撳瓨閰嶉佸憳澶辫触: regionId={}, workerId={}", regionId, workerVO.getWorkerId(), e);
+ }
+ }
+
+ /**
+ * 鑾峰彇鍖哄煙鎵鏈夊湪绾块厤閫佸憳
+ *
+ * @param regionId
+ * @return
+ */
+ public List getAll(String regionId) {
+ if (StringUtils.isBlank(regionId)) {
+ return null;
+ }
+ try {
+ String key = buildKey(regionId);
+ Map entries = redisTemplateHelper.hGetAll(key);
+ if (entries == null || entries.isEmpty()) {
+ return null;
+ }
+ List result = new ArrayList<>(entries.size());
+ for (Object value : entries.values()) {
+ if (value != null) {
+ result.add(JSONUtil.toBean(value.toString(), WorkerRedisVo.class));
+ }
+ }
+ return result;
+ } catch (Exception e) {
+ log.info("鑾峰彇鍖哄煙鍦ㄧ嚎閰嶉佸憳缂撳瓨澶辫触: regionId={}", regionId, e);
+ return null;
+ }
+ }
+
+ /**
+ * 鎵归噺瀛樻斁鍒扮紦瀛橈紙閫氬父鐢ㄤ簬缂撳瓨棰勭儹 / 棣栨鍔犺浇锛
+ *
+ * @param regionId 鍖哄煙ID
+ * @param orders 鍒楄〃
+ */
+ public void putAll(String regionId, List orders) {
+ if (StringUtils.isBlank(regionId) || orders == null || orders.isEmpty()) {
+ return;
+ }
+ try {
+ String key = buildKey(regionId);
+ Map map = new LinkedHashMap<>(orders.size());
+ for (WorkerRedisVo order : orders) {
+ if (order != null && StringUtils.isNotBlank(order.getWorkerId())) {
+ map.put(order.getWorkerId(), JSONUtil.toJsonStr(order));
+ }
+ }
+ if (!map.isEmpty()) {
+ redisTemplateHelper.hPutAll(key, map);
+ log.info("鎵归噺缂撳瓨閰嶉佸憳: regionId={}, count={}", regionId, map.size());
+ }
+ } catch (Exception e) {
+ log.info("鎵归噺缂撳瓨閰嶉佸憳澶辫触: regionId={}", regionId, e);
+ }
+ }
+
+ // ================================================================
+ // 鍒犻櫎锛坮emove锛
+ // ================================================================
+
+ /**
+ * 鏍规嵁 regionId 鍜 workerId 浠庣紦瀛樹腑鍒犻櫎鎸囧畾
+ *
+ * @param regionId 鍖哄煙ID
+ * @param workerId ID
+ */
+ public void remove(String regionId, String workerId) {
+ if (StringUtils.isBlank(regionId) || StringUtils.isBlank(workerId)) {
+ log.info("UserPendingOrderCacheUtil.remove 鍙傛暟鏃犳晥, regionId={}, workerId={}", regionId, workerId);
+ return;
+ }
+ try {
+ String key = buildKey(regionId);
+ redisTemplateHelper.hDelete(key, workerId);
+ log.info("鍒犻櫎缂撳瓨: regionId={}, workerId={}", regionId, workerId);
+ } catch (Exception e) {
+ log.info("鍒犻櫎缂撳瓨澶辫触: regionId={}, workerId={}", regionId, workerId, e);
+ }
+ }
+
+ /**
+ * 娓呴櫎鎸囧畾閰嶉佸憳鎵鏈夌紦瀛
+ *
+ * 鍏稿瀷鍦烘櫙锛氶渶瑕佸己鍒跺埛鏂拌閰嶉佸憳缂撳瓨鏃惰皟鐢ㄣ
+ *
+ * @param regionId 鍖哄煙ID
+ */
+ public void removeAll(String regionId) {
+ if (StringUtils.isBlank(regionId)) {
+ return;
+ }
+ try {
+ redisTemplateHelper.delete(buildKey(regionId));
+ log.info("娓呴櫎閰嶉佸憳缂撳瓨: regionId={}", regionId);
+ } catch (Exception e) {
+ log.info("娓呴櫎閰嶉佸憳缂撳瓨澶辫触: regionId={}", regionId, e);
+ }
+ }
+
+ // ================================================================
+ // 鏇存柊锛坲pdate锛
+ // ================================================================
+
+ /**
+ * 鏍规嵁 regionId 鍜 workerId 鏇存柊缂撳瓨涓殑淇℃伅
+ *
+ *
+ * @param regionId 鍖哄煙ID
+ * @param workerVO 鏇存柊鍚庣殑VO
+ */
+ public void update(String regionId, WorkerRedisVo workerVO) {
+ if (StringUtils.isBlank(regionId) || workerVO == null || StringUtils.isBlank(workerVO.getWorkerId())) {
+ log.warn("UserPendingOrderCacheUtil.update 鍙傛暟鏃犳晥, regionId={}, workerVO={}", regionId, workerVO);
+ return;
+ }
+ try {
+ // 濡傛灉鐘舵佸凡涓嶅睘浜庯紝鐩存帴鍒犻櫎
+ /*if (!isTerminalStatus(workerVO.getStatus())) {
+ remove(regionId, workerVO.getWorkerId());
+ log.debug("宸茬粓鎬侊紝浠庣紦瀛樼Щ闄: regionId={}, workerId={}, status={}",
+ regionId, workerVO.getWorkerId(), workerVO.getStatus());
+ return;
+ }*/
+ // 瑕嗙洊鏇存柊
+ put(regionId, workerVO);
+ log.info("鏇存柊閰嶉佸憳缂撳瓨: regionId={}, workerId={}, status={}",
+ regionId, workerVO.getWorkerId());
+ } catch (Exception e) {
+ log.info("鏇存柊鐢ㄦ埛淇℃伅缂撳瓨澶辫触: regionId={}, workerId={}", regionId, workerVO.getWorkerId(), e);
+ }
+ }
+
+ /**
+ * 鑾峰彇閰嶉佸憳缂撳瓨鍗曚釜
+ *
+ * @param regionId 鍖哄煙ID
+ * @param workerId ID
+ * @return 缂撳瓨鐨刅O锛屼笉瀛樺湪鏃惰繑鍥 null
+ */
+ public WorkerRedisVo get(String regionId, String workerId) {
+ if (StringUtils.isBlank(regionId) || StringUtils.isBlank(workerId)) {
+ return null;
+ }
+ try {
+ String key = buildKey(regionId);
+ Object value = redisTemplateHelper.hGet(key, workerId);
+ if (value == null) {
+ return null;
+ }
+ return JSONUtil.toBean(value.toString(), WorkerRedisVo.class);
+ } catch (Exception e) {
+ log.info("鑾峰彇閰嶉佸憳鍗曚釜缂撳瓨澶辫触: regionId={}, workerId={}", regionId, workerId, e);
+ return null;
+ }
+ }
+
+ /**
+ * 鍒ゆ柇璇ラ厤閫佸憳鐨勭紦瀛樻槸鍚﹀凡瀛樺湪
+ *
+ * @param regionId 鍖哄煙ID
+ * @return true 琛ㄧず缂撳瓨瀛樺湪
+ */
+ public boolean exists(String regionId) {
+ if (StringUtils.isBlank(regionId)) {
+ return false;
+ }
+ Boolean hasKey = redisTemplateHelper.hasKey(buildKey(regionId));
+ return hasKey != null && hasKey;
+ }
+
+
+}
diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/ShopTakeawayMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/ShopTakeawayMapper.xml
index e57d6606..e402861b 100644
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/ShopTakeawayMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/ShopTakeawayMapper.xml
@@ -34,7 +34,7 @@
where shop_id = #{shopId,jdbcType=VARCHAR}
-