qw = new LambdaQueryWrapper<>();
+ qw.eq(MallDeliveryOrder::getOrderId, mallRefundRecord.getOrderId());
+ MallDeliveryOrder deliveryOrder = mallDeliveryOrderMapper.selectOne(qw);
+ workerOrderCacheUtil.remove(deliveryOrder.getWorkerId(),deliveryOrder.getId());
}
wechatPayUtil.refund(mallRefundRecord.getOrderId(), mallRefundRecord.getRefundAmount().multiply(new BigDecimal(100)).longValue(), mallRefundRecord.getRefundAmount().multiply(new BigDecimal(100)).longValue());
if(mallRefundRecord.getLinkId().toUpperCase().startsWith("W")){
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/ShopGroupOrderCacheUtil.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/ShopGroupOrderCacheUtil.java
index 4ffc6295..79238407 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/ShopGroupOrderCacheUtil.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/ShopGroupOrderCacheUtil.java
@@ -2,7 +2,6 @@ package cc.hiver.mall.utils;
import cc.hiver.core.common.redis.RedisTemplateHelper;
import cc.hiver.mall.entity.MallOrderGroup;
-import cc.hiver.mall.pojo.vo.MallOrderVO;
import cn.hutool.json.JSONUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -221,7 +220,7 @@ public class ShopGroupOrderCacheUtil {
* @param orderId 璁㈠崟ID
* @return 缂撳瓨鐨勮鍗昖O锛屼笉瀛樺湪鏃惰繑鍥 null
*/
- public MallOrderVO get(String shopId, String orderId) {
+ public MallOrderGroup get(String shopId, String orderId) {
if (StringUtils.isBlank(shopId) || StringUtils.isBlank(orderId)) {
return null;
}
@@ -231,7 +230,7 @@ public class ShopGroupOrderCacheUtil {
if (value == null) {
return null;
}
- return JSONUtil.toBean(value.toString(), MallOrderVO.class);
+ return JSONUtil.toBean(value.toString(), MallOrderGroup.class);
} catch (Exception e) {
log.info("鑾峰彇搴楅摵鍗曚釜寰呮垚鍥㈣鍗曠紦瀛樺け璐: shopId={}, orderId={}", shopId, orderId, e);
return null;
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/WaitOrderCacheUtil.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/WaitOrderCacheUtil.java
new file mode 100644
index 00000000..609dde17
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/WaitOrderCacheUtil.java
@@ -0,0 +1,535 @@
+package cc.hiver.mall.utils;
+
+import cc.hiver.core.common.redis.RedisTemplateHelper;
+import cc.hiver.mall.entity.MallDeliveryOrder;
+import cc.hiver.mall.pojo.dto.AreaRuleDTO;
+import cc.hiver.mall.pojo.query.MallDeliveryOrderPageQuery;
+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.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 鎶㈠崟澶у巺寰呭畬鎴愯鍗曠紦瀛樺伐鍏风被
+ *
+ * 搴曞眰浣跨敤 Redis Hash 缁撴瀯锛屼繚璇佹寜 regionId + orderId 缁村害鐨 O(1) 璇诲啓鏁堢巼銆
+ *
+ * Key = WAIT_ORDERS:{regionId}
+ * Field = orderId
+ * Value = MallDeliveryOrder 鐨 JSON 搴忓垪鍖
+ *
+ *
+ * 浣跨敤鍦烘櫙锛氳鍗曠姸鎬佸彂鐢熷彉鍖栨椂锛堝垱寤恒佹洿鏂般佸彇娑堛佸畬鎴愮瓑锛夛紝
+ * 鐢变笟鍔℃柟涓诲姩璋冪敤鏈伐鍏风被鐨勬柟娉曠淮鎶ょ紦瀛橈紝浠ュ噺灏 pagebyworker 鎺ュ彛瀵规暟鎹簱鐨勬煡璇㈠帇鍔涖
+ *
+ * @author system
+ */
+@Slf4j
+@Component
+public class WaitOrderCacheUtil {
+
+ /** Redis Key 鍓嶇紑 */
+ private static final String KEY_PREFIX = "WAIT_ORDERS:";
+
+ @Autowired
+ private RedisTemplateHelper redisTemplateHelper;
+
+ // ================================================================
+ // Key 鏋勫缓
+ // ================================================================
+
+ private String buildKey(String regionId) {
+ return KEY_PREFIX + regionId;
+ }
+
+ // ================================================================
+ // 瀛樻斁锛坧ut锛
+ // ================================================================
+
+ /**
+ * 瀛樻斁鍗曚釜璁㈠崟鍒扮紦瀛
+ *
+ * @param regionId 鍖哄煙ID
+ * @param orderVO 璁㈠崟VO锛堝繀椤诲寘鍚湁鏁堢殑 id锛
+ */
+ public void put(String regionId, MallDeliveryOrder orderVO) {
+ if (StringUtils.isBlank(regionId) || orderVO == null || StringUtils.isBlank(orderVO.getId())) {
+ log.info("UserPendingOrderCacheUtil.put 鍙傛暟鏃犳晥, userId={}, orderVO={}", regionId, orderVO);
+ return;
+ }
+ try {
+ String key = buildKey(regionId);
+ String json = JSONUtil.toJsonStr(orderVO);
+ redisTemplateHelper.hPut(key, orderVO.getId(), json);
+ log.info("缂撳瓨鎶㈠崟澶у巺璁㈠崟: regionId={}, orderId={}", regionId, orderVO.getId());
+ } catch (Exception e) {
+ log.info("缂撳瓨鎶㈠崟澶у巺璁㈠崟澶辫触: regionId={}, orderId={}", regionId, orderVO.getId(), e);
+ }
+ }
+
+ /**
+ * 鎵归噺瀛樻斁璁㈠崟鍒扮紦瀛橈紙閫氬父鐢ㄤ簬缂撳瓨棰勭儹 / 棣栨鍔犺浇锛
+ *
+ * @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 (MallDeliveryOrder order : orders) {
+ if (order != null && StringUtils.isNotBlank(order.getId())) {
+ map.put(order.getId(), 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 鍜 orderId 浠庣紦瀛樹腑鍒犻櫎鎸囧畾璁㈠崟
+ *
+ * 鍏稿瀷鍦烘櫙锛氳鍗曟垚鍥€佸彇娑堛侀娆炬垚鍔熷悗璋冪敤銆
+ *
+ * @param regionId 鍖哄煙ID
+ * @param orderId 璁㈠崟ID
+ */
+ public void remove(String regionId, String orderId) {
+ if (StringUtils.isBlank(regionId) || StringUtils.isBlank(orderId)) {
+ log.info("UserPendingOrderCacheUtil.remove 鍙傛暟鏃犳晥, regionId={}, orderId={}", regionId, orderId);
+ return;
+ }
+ try {
+ String key = buildKey(regionId);
+ redisTemplateHelper.hDelete(key, orderId);
+ log.info("鍒犻櫎璁㈠崟缂撳瓨: regionId={}, orderId={}", regionId, orderId);
+ } catch (Exception e) {
+ log.info("鍒犻櫎璁㈠崟缂撳瓨澶辫触: regionId={}, orderId={}", regionId, orderId, 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 鍜 orderId 鏇存柊缂撳瓨涓殑璁㈠崟淇℃伅
+ *
+ * 濡傛灉鏇存柊鍚庣殑璁㈠崟鐘舵佸凡缁忎笉灞炰簬"寰呭畬鎴"锛坰tatus 鈭 {10}锛夛紝
+ * 鍒欒嚜鍔ㄤ粠缂撳瓨涓Щ闄よ璁㈠崟锛屾棤闇璋冪敤鏂归澶栧垽鏂
+ *
+ * @param regionId 鍖哄煙ID
+ * @param orderVO 鏇存柊鍚庣殑璁㈠崟VO
+ */
+ public void update(String regionId, MallDeliveryOrder orderVO) {
+ if (StringUtils.isBlank(regionId) || orderVO == null || StringUtils.isBlank(orderVO.getId())) {
+ log.warn("UserPendingOrderCacheUtil.update 鍙傛暟鏃犳晥, regionId={}, orderVO={}", regionId, orderVO);
+ return;
+ }
+ try {
+ // 濡傛灉璁㈠崟鐘舵佸凡涓嶅睘浜庯紝鐩存帴鍒犻櫎
+ /*if (!isTerminalStatus(orderVO.getStatus())) {
+ remove(regionId, orderVO.getId());
+ log.debug("璁㈠崟宸茬粓鎬侊紝浠庣紦瀛樼Щ闄: regionId={}, orderId={}, status={}",
+ regionId, orderVO.getId(), orderVO.getStatus());
+ return;
+ }*/
+ // 瑕嗙洊鏇存柊
+ put(regionId, orderVO);
+ log.info("鏇存柊鎶㈠崟澶у巺缂撳瓨: regionId={}, orderId={}, status={}",
+ regionId, orderVO.getId(), orderVO.getStatus());
+ } catch (Exception e) {
+ log.info("鏇存柊鐢ㄦ埛寰呭畬鎴愯鍗曠紦瀛樺け璐: regionId={}, orderId={}", regionId, orderVO.getId(), e);
+ }
+ }
+
+ // ================================================================
+ // 鏌ヨ锛坓et锛
+ // ================================================================
+
+ /**
+ * 鑾峰彇鎶㈠崟澶у巺璁㈠崟缂撳瓨锛堝惈鍒嗛〉銆佽繃婊ゃ佹帓搴忓拰鍚勭被鍨嬭鍗曟暟缁熻锛
+ *
+ * 涓ょ鍦烘櫙锛
+ * 1. deliveryType==4 涓 workerId 闈炵┖ 鈫 鏌ョ湅鎸囨淳鍗曞垪琛 + 鍏朵粬绫诲瀷璁㈠崟鏁
+ * 2. 鍏朵粬鎯呭喌锛坔allOnly=true锛夆啋 鏌ョ湅鎶㈠崟澶у巺鏌愮被鍨嬭鍗曞垪琛(鍒嗛〉) + 鎸囨淳鍗曟暟 + 鍚勭被鍨嬭鍗曟暟
+ *
+ * @param q 鏌ヨ鍙傛暟
+ * @return 鍖呭惈鍒嗛〉鏁版嵁鍜岀粺璁℃暟鎹殑 Map锛岀紦瀛樹笉瀛樺湪鏃惰繑鍥 null锛堣皟鐢ㄦ柟鎹鍥炴簮鏌ュ簱锛
+ */
+ public Map getAll(MallDeliveryOrderPageQuery q) {
+ // 1. 鍩虹鏍￠獙
+ if (StringUtils.isBlank(q.getRegionId())) {
+ return null;
+ }
+
+ try {
+ String key = buildKey(q.getRegionId());
+ // 2. 鑾峰彇 Hash 涓殑鎵鏈夎鍗曟暟鎹
+ Map entries = redisTemplateHelper.hGetAll(key);
+
+ // 濡傛灉缂撳瓨涓病鏈夋暟鎹紝杩斿洖 null 璁╄皟鐢ㄦ柟鍘绘煡搴
+ if (entries == null || entries.isEmpty()) {
+ return null;
+ }
+
+ // 3. 鍙嶅簭鍒楀寲鎵鏈夌紦瀛樿鍗
+ List allCachedOrders = new ArrayList<>(entries.size());
+ for (Object value : entries.values()) {
+ if (value != null) {
+ allCachedOrders.add(JSONUtil.toBean(value.toString(), MallDeliveryOrder.class));
+ }
+ }
+
+ Map result = new HashMap<>();
+
+ if (q.getDeliveryType() != null && q.getDeliveryType() == 4
+ && StringUtils.isNotBlank(q.getWorkerId())) {
+ // ====== 鍦烘櫙A: 鏌ョ湅鎸囨淳鍗曡鍗曞垪琛 ======
+ // 绛涢夛細workerId 鍖归厤銆乻tatus=0锛屼笉鍖哄垎 deliveryType
+ List zhipaiList = allCachedOrders.stream()
+ .filter(o -> q.getWorkerId().equals(o.getWorkerId()))
+ .filter(o -> o.getStatus() != null && o.getStatus() == 0)
+ .collect(Collectors.toList());
+
+ // 鎺掑簭锛堝鍒 selectPageVO 鐨 ORDER BY锛
+ zhipaiList.sort(buildComparator(q));
+
+ long total = zhipaiList.size();
+ int limit = (int) Math.min(total, 100);
+ List records = new ArrayList<>(zhipaiList.subList(0, limit));
+
+ result.put("records", records);
+ result.put("total", total);
+ result.put("size", 100);
+ result.put("current", 1);
+ result.put("pages", 1);
+ result.put("zhipaiCount", total);
+ // 澶栧崠銆佸揩閫掋佽窇鑵垮緟鎺ュ崟鏁
+ result.put("orderCount", countOrdersByTypeInMemory(allCachedOrders));
+
+ } else {
+ // ====== 鍦烘櫙B: 鏌ョ湅鎶㈠崟澶у巺璁㈠崟鍒楄〃锛堝鍗/蹇/璺戣吙锛======
+
+ // 鍏堣绠楁寚娲惧崟鏁伴噺锛坵orkerId 鍖归厤銆乻tatus=0锛
+ if (StringUtils.isNotBlank(q.getWorkerId())) {
+ long zhipaiCount = allCachedOrders.stream()
+ .filter(o -> q.getWorkerId().equals(o.getWorkerId()))
+ .filter(o -> o.getStatus() != null && o.getStatus() == 0)
+ .count();
+ result.put("zhipaiCount", zhipaiCount);
+ }
+
+ // 杩囨护鎶㈠崟澶у巺璁㈠崟锛歸orkerId 涓虹┖ 涓 status=0
+ List filteredList = allCachedOrders.stream()
+ .filter(o -> StringUtils.isBlank(o.getWorkerId()))
+ .filter(o -> o.getStatus() != null && o.getStatus() == 0)
+ .collect(Collectors.toList());
+
+ // 鎸 deliveryType 杩囨护
+ if (q.getDeliveryType() != null) {
+ final Integer deliveryType = q.getDeliveryType();
+ filteredList = filteredList.stream()
+ .filter(o -> deliveryType.equals(o.getDeliveryType()))
+ .collect(Collectors.toList());
+ }
+
+ // 鎸 getAreaId 杩囨护
+ if (StringUtils.isNotBlank(q.getGetAreaId())) {
+ filteredList = filteredList.stream()
+ .filter(o -> q.getGetAreaId().equals(o.getGetAreaId()))
+ .collect(Collectors.toList());
+ }
+
+ // 鎸 putAreaId 杩囨护
+ if (StringUtils.isNotBlank(q.getPutAreaId())) {
+ filteredList = filteredList.stream()
+ .filter(o -> q.getPutAreaId().equals(o.getPutAreaId()))
+ .collect(Collectors.toList());
+ }
+
+ // 鎸 shopId 杩囨护
+ if (StringUtils.isNotBlank(q.getShopId())) {
+ filteredList = filteredList.stream()
+ .filter(o -> q.getShopId().equals(o.getShopId()))
+ .collect(Collectors.toList());
+ }
+
+ // 鎸 shopName 妯＄硦杩囨护
+ if (StringUtils.isNotBlank(q.getShopName())) {
+ final String shopNameKeyword = q.getShopName();
+ filteredList = filteredList.stream()
+ .filter(o -> o.getShopName() != null && o.getShopName().contains(shopNameKeyword))
+ .collect(Collectors.toList());
+ }
+
+ // 鎸夋棩鏈熻寖鍥磋繃婊
+ if (StringUtils.isNotBlank(q.getStartDate())) {
+ filteredList = filteredList.stream()
+ .filter(o -> o.getCreateTime() != null
+ && formatDate(o.getCreateTime()).compareTo(q.getStartDate()) >= 0)
+ .collect(Collectors.toList());
+ }
+ if (StringUtils.isNotBlank(q.getEndDate())) {
+ filteredList = filteredList.stream()
+ .filter(o -> o.getCreateTime() != null
+ && formatDate(o.getCreateTime()).compareTo(q.getEndDate()) <= 0)
+ .collect(Collectors.toList());
+ }
+
+ // 鎺掑簭锛堝鍒 selectPageVO 鐨 ORDER BY锛
+ filteredList.sort(buildComparator(q));
+
+ // 鍒嗛〉锛堟姠鍗曞ぇ鍘呮瘡椤20鏉★級
+ int pageSize = 20;
+ int pageNum = q.getPageNum();
+ long total = filteredList.size();
+ long pages = total > 0 ? (total + pageSize - 1) / pageSize : 0;
+
+ // 寰幆鍒嗛〉锛堝悓 pageDelivery 閫昏緫锛氶〉鐮佽秺鐣屾椂寰幆鍥炲埌鍓嶉潰锛
+ if (pages > 0 && pageNum > pages) {
+ pageNum = (int) (((pageNum - 1) % pages) + 1);
+ }
+
+ List records;
+ if (total > 0) {
+ int offset = (pageNum - 1) * pageSize;
+ if (offset >= total) {
+ records = Collections.emptyList();
+ } else {
+ int end = (int) Math.min(offset + pageSize, total);
+ records = new ArrayList<>(filteredList.subList(offset, end));
+ }
+ } else {
+ records = Collections.emptyList();
+ }
+
+ result.put("records", records);
+ result.put("total", total);
+ result.put("size", pageSize);
+ result.put("current", pageNum);
+ result.put("pages", pages);
+ // 澶栧崠銆佸揩閫掋佽窇鑵垮緟鎺ュ崟鏁
+ result.put("orderCount", countOrdersByTypeInMemory(allCachedOrders));
+ }
+
+ return result;
+
+ } catch (Exception e) {
+ log.error("鑾峰彇鎶㈠崟澶у巺璁㈠崟缂撳瓨澶辫触: regionId={}", q.getRegionId(), e);
+ // 鍙戠敓寮傚父杩斿洖 null锛屽己鍒跺洖婧愭煡搴擄紝淇濊瘉绯荤粺鍙敤鎬
+ return null;
+ }
+ }
+
+ /**
+ * 鑾峰彇鎶㈠崟澶у巺缂撳瓨鍗曚釜璁㈠崟
+ *
+ * @param regionId 鍖哄煙ID
+ * @param orderId 璁㈠崟ID
+ * @return 缂撳瓨鐨勮鍗昖O锛屼笉瀛樺湪鏃惰繑鍥 null
+ */
+ public MallDeliveryOrder get(String regionId, String orderId) {
+ if (StringUtils.isBlank(regionId) || StringUtils.isBlank(orderId)) {
+ return null;
+ }
+ try {
+ String key = buildKey(regionId);
+ Object value = redisTemplateHelper.hGet(key, orderId);
+ if (value == null) {
+ return null;
+ }
+ return JSONUtil.toBean(value.toString(), MallDeliveryOrder.class);
+ } catch (Exception e) {
+ log.info("鑾峰彇鎶㈠崟澶у巺鍗曚釜璁㈠崟缂撳瓨澶辫触: regionId={}, orderId={}", regionId, orderId, 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;
+ }
+
+ // ================================================================
+ // 鍐呴儴宸ュ叿
+ // ================================================================
+
+ /**
+ * 鏋勫缓鎺掑簭姣旇緝鍣紙澶嶅埢 selectPageVO 鐨 ORDER BY 閫昏緫锛
+ *
+ * ORDER BY:
+ * 1. 濡傛灉 order='deliveryFee' 鈫 delivery_fee DESC
+ * 2. 濡傛灉鏈 waimaiData/kuaidiData 鈫 鍖哄煙鍖归厤浼樺厛 DESC
+ * 3. must_finish_time IS NULL 鎺掓渶鍚庯紙ASC: NOT NULL=0, NULL=1锛
+ * 4. must_finish_time ASC
+ * 5. delivery_fee DESC
+ *
+ */
+ private Comparator buildComparator(MallDeliveryOrderPageQuery q) {
+ List> comparators = new ArrayList<>();
+
+ // 1. 鎸変剑閲戦檷搴忥紙濡傛灉 order=deliveryFee锛
+ if ("deliveryFee".equals(q.getOrder())) {
+ comparators.add((a, b) -> {
+ BigDecimal feeA = a.getDeliveryFee() != null ? a.getDeliveryFee() : BigDecimal.ZERO;
+ BigDecimal feeB = b.getDeliveryFee() != null ? b.getDeliveryFee() : BigDecimal.ZERO;
+ return feeB.compareTo(feeA);
+ });
+ }
+
+ // 2. 鍖哄煙鍖归厤瑙勫垯鎺掑簭锛堝尮閰=1 涓嶅尮閰=0锛孌ESC锛
+ boolean hasWaimai = q.getWaimaiData() != null && !q.getWaimaiData().isEmpty();
+ boolean hasKuaidi = q.getKuaidiData() != null && !q.getKuaidiData().isEmpty();
+ if (hasWaimai || hasKuaidi) {
+ comparators.add((a, b) -> {
+ int scoreA = calcAreaMatchScore(a, q);
+ int scoreB = calcAreaMatchScore(b, q);
+ return Integer.compare(scoreB, scoreA);
+ });
+ }
+
+ // 3. must_finish_time IS NULL 鎺掓渶鍚 (NULL鈫1, NOT NULL鈫0, ASC)
+ comparators.add((a, b) -> {
+ int nullA = a.getMustFinishTime() == null ? 1 : 0;
+ int nullB = b.getMustFinishTime() == null ? 1 : 0;
+ return Integer.compare(nullA, nullB);
+ });
+
+ // 4. must_finish_time ASC
+ comparators.add((a, b) -> {
+ if (a.getMustFinishTime() == null && b.getMustFinishTime() == null) return 0;
+ if (a.getMustFinishTime() == null) return 1;
+ if (b.getMustFinishTime() == null) return -1;
+ return a.getMustFinishTime().compareTo(b.getMustFinishTime());
+ });
+
+ // 5. delivery_fee DESC
+ comparators.add((a, b) -> {
+ BigDecimal feeA = a.getDeliveryFee() != null ? a.getDeliveryFee() : BigDecimal.ZERO;
+ BigDecimal feeB = b.getDeliveryFee() != null ? b.getDeliveryFee() : BigDecimal.ZERO;
+ return feeB.compareTo(feeA);
+ });
+
+ // 缁勫悎鎵鏈夋瘮杈冨櫒
+ return (a, b) -> {
+ for (Comparator c : comparators) {
+ int cmp = c.compare(a, b);
+ if (cmp != 0) return cmp;
+ }
+ return 0;
+ };
+ }
+
+ /**
+ * 璁＄畻鍖哄煙鍖归厤寰楀垎锛堝鍒 selectPageVO 涓 CASE WHEN 閫昏緫锛
+ * 澶栧崠(deliveryType=1)鍖归厤 waimaiData锛屽揩閫(deliveryType=2)鍖归厤 kuaidiData
+ */
+ private int calcAreaMatchScore(MallDeliveryOrder order, MallDeliveryOrderPageQuery q) {
+ if (order.getDeliveryType() == null) return 0;
+ // 澶栧崠鍖归厤瑙勫垯
+ if (order.getDeliveryType() == 1 && q.getWaimaiData() != null) {
+ for (AreaRuleDTO rule : q.getWaimaiData()) {
+ if (Objects.equals(order.getGetAreaId(), rule.getGetAreaId())
+ && Objects.equals(order.getPutAreaId(), rule.getPutAreaId())) {
+ return 1;
+ }
+ }
+ }
+ // 蹇掑尮閰嶈鍒
+ if (order.getDeliveryType() == 2 && q.getKuaidiData() != null) {
+ for (AreaRuleDTO rule : q.getKuaidiData()) {
+ if (Objects.equals(order.getGetAreaId(), rule.getGetAreaId())
+ && Objects.equals(order.getPutAreaId(), rule.getPutAreaId())) {
+ return 1;
+ }
+ }
+ }
+ return 0;
+ }
+
+ /**
+ * 鍦ㄥ唴瀛樹腑缁熻鍚勭被鍨嬪緟鎺ュ崟鏁帮紙澶嶅埢 countOrdersByType SQL 閫昏緫锛
+ * 鏉′欢锛歸orker_id IS NULL锛宻tatus=0锛屾寜 delivery_type 鍒嗙粍璁℃暟
+ */
+ private List> countOrdersByTypeInMemory(List allOrders) {
+ Map countMap = allOrders.stream()
+ .filter(o -> StringUtils.isBlank(o.getWorkerId()))
+ .filter(o -> o.getStatus() != null && o.getStatus() == 0)
+ .filter(o -> o.getDeliveryType() != null)
+ .collect(Collectors.groupingBy(MallDeliveryOrder::getDeliveryType, Collectors.counting()));
+
+ List> result = new ArrayList<>();
+ for (Map.Entry entry : countMap.entrySet()) {
+ Map m = new HashMap<>();
+ m.put("deliveryType", entry.getKey());
+ m.put("orderCount", entry.getValue());
+ result.add(m);
+ }
+ return result;
+ }
+
+ /**
+ * 鏃ユ湡鏍煎紡鍖栦负 yyyy-MM-dd锛堢敤浜庢棩鏈熻寖鍥磋繃婊ゆ瘮杈冿級
+ */
+ private String formatDate(Date date) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ return sdf.format(date);
+ }
+
+ /**
+ * 鍒ゆ柇璁㈠崟鐘舵佹槸鍚︿负缁堟侊紙涓嶅啀灞炰簬""锛
+ */
+ /* private boolean isTerminalStatus(Integer status) {
+ if (status == null) {
+ return false;
+ }
+ return status == STATUS_DONE;
+ }*/
+}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/WorkerOrderCacheUtil.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/WorkerOrderCacheUtil.java
new file mode 100644
index 00000000..62affe5b
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/WorkerOrderCacheUtil.java
@@ -0,0 +1,324 @@
+package cc.hiver.mall.utils;
+
+import cc.hiver.core.common.redis.RedisTemplateHelper;
+import cc.hiver.mall.entity.MallDeliveryOrder;
+import cc.hiver.mall.pojo.query.MallDeliveryOrderPageQuery;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.*;
+import java.util.stream.Collectors;
+
+/**
+ * 閰嶉佸憳寰呭畬鎴愯鍗曠紦瀛樺伐鍏风被
+ *
+ * 搴曞眰浣跨敤 Redis Hash 缁撴瀯锛屼繚璇佹寜 workerId + orderId 缁村害鐨 O(1) 璇诲啓鏁堢巼銆
+ *
+ * Key = WORKER_ORDERS:{workerId}
+ * Field = orderId
+ * Value = MallDeliveryOrder 鐨 JSON 搴忓垪鍖
+ *
+ *
+ * 浣跨敤鍦烘櫙锛氳鍗曠姸鎬佸彂鐢熷彉鍖栨椂锛堝垱寤恒佹洿鏂般佸彇娑堛佸畬鎴愮瓑锛夛紝
+ * 鐢变笟鍔℃柟涓诲姩璋冪敤鏈伐鍏风被鐨勬柟娉曠淮鎶ょ紦瀛橈紝浠ュ噺灏 pagebyworker 鎺ュ彛瀵规暟鎹簱鐨勬煡璇㈠帇鍔涖
+ *
+ * @author system
+ */
+@Slf4j
+@Component
+public class WorkerOrderCacheUtil {
+
+ /** Redis Key 鍓嶇紑 */
+ private static final String KEY_PREFIX = "WORKER_ORDERS:";
+
+ @Autowired
+ private RedisTemplateHelper redisTemplateHelper;
+
+ // ================================================================
+ // Key 鏋勫缓
+ // ================================================================
+
+ private String buildKey(String workerId) {
+ return KEY_PREFIX + workerId;
+ }
+
+ // ================================================================
+ // 瀛樻斁锛坧ut锛
+ // ================================================================
+
+ /**
+ * 瀛樻斁鍗曚釜璁㈠崟鍒扮紦瀛
+ *
+ * @param workerId 閰嶉佸憳ID
+ * @param orderVO 璁㈠崟VO锛堝繀椤诲寘鍚湁鏁堢殑 id锛
+ */
+ public void put(String workerId, MallDeliveryOrder orderVO) {
+ if (StringUtils.isBlank(workerId) || orderVO == null || StringUtils.isBlank(orderVO.getId())) {
+ log.info("UserPendingOrderCacheUtil.put 鍙傛暟鏃犳晥, userId={}, orderVO={}", workerId, orderVO);
+ return;
+ }
+ try {
+ String key = buildKey(workerId);
+ String json = JSONUtil.toJsonStr(orderVO);
+ redisTemplateHelper.hPut(key, orderVO.getId(), json);
+ log.info("缂撳瓨閰嶉佸憳璁㈠崟: workerId={}, orderId={}", workerId, orderVO.getId());
+ } catch (Exception e) {
+ log.info("缂撳瓨閰嶉佸憳璁㈠崟澶辫触: workerId={}, orderId={}", workerId, orderVO.getId(), e);
+ }
+ }
+
+ /**
+ * 鎵归噺瀛樻斁璁㈠崟鍒扮紦瀛橈紙閫氬父鐢ㄤ簬缂撳瓨棰勭儹 / 棣栨鍔犺浇锛
+ *
+ * @param workerId 閰嶉佸憳ID
+ * @param orders 璁㈠崟鍒楄〃
+ */
+ public void putAll(String workerId, List orders) {
+ if (StringUtils.isBlank(workerId) || orders == null || orders.isEmpty()) {
+ return;
+ }
+ try {
+ String key = buildKey(workerId);
+ Map map = new java.util.LinkedHashMap<>(orders.size());
+ for (MallDeliveryOrder order : orders) {
+ if (order != null && StringUtils.isNotBlank(order.getId())) {
+ map.put(order.getId(), JSONUtil.toJsonStr(order));
+ }
+ }
+ if (!map.isEmpty()) {
+ redisTemplateHelper.hPutAll(key, map);
+ log.info("鎵归噺缂撳瓨閰嶉佸憳璁㈠崟: workerId={}, count={}", workerId, map.size());
+ }
+ } catch (Exception e) {
+ log.info("鎵归噺缂撳瓨閰嶉佸憳璁㈠崟澶辫触: workerId={}", workerId, e);
+ }
+ }
+
+ // ================================================================
+ // 鍒犻櫎锛坮emove锛
+ // ================================================================
+
+ /**
+ * 鏍规嵁 workerId 鍜 orderId 浠庣紦瀛樹腑鍒犻櫎鎸囧畾璁㈠崟
+ *
+ * 鍏稿瀷鍦烘櫙锛氳鍗曟垚鍥€佸彇娑堛侀娆炬垚鍔熷悗璋冪敤銆
+ *
+ * @param workerId 閰嶉佸憳ID
+ * @param orderId 璁㈠崟ID
+ */
+ public void remove(String workerId, String orderId) {
+ if (StringUtils.isBlank(workerId) || StringUtils.isBlank(orderId)) {
+ log.info("UserPendingOrderCacheUtil.remove 鍙傛暟鏃犳晥, workerId={}, orderId={}", workerId, orderId);
+ return;
+ }
+ try {
+ String key = buildKey(workerId);
+ redisTemplateHelper.hDelete(key, orderId);
+ log.info("鍒犻櫎璁㈠崟缂撳瓨: workerId={}, orderId={}", workerId, orderId);
+ } catch (Exception e) {
+ log.info("鍒犻櫎璁㈠崟缂撳瓨澶辫触: workerId={}, orderId={}", workerId, orderId, e);
+ }
+ }
+
+ /**
+ * 娓呴櫎鎸囧畾閰嶉佸憳鎵鏈夎鍗曠紦瀛
+ *
+ * 鍏稿瀷鍦烘櫙锛氶渶瑕佸己鍒跺埛鏂拌閰嶉佸憳缂撳瓨鏃惰皟鐢ㄣ
+ *
+ * @param workerId 閰嶉佸憳ID
+ */
+ public void removeAll(String workerId) {
+ if (StringUtils.isBlank(workerId)) {
+ return;
+ }
+ try {
+ redisTemplateHelper.delete(buildKey(workerId));
+ log.info("娓呴櫎閰嶉佸憳璁㈠崟缂撳瓨: workerId={}", workerId);
+ } catch (Exception e) {
+ log.info("娓呴櫎閰嶉佸憳璁㈠崟缂撳瓨澶辫触: workerId={}", workerId, e);
+ }
+ }
+
+ // ================================================================
+ // 鏇存柊锛坲pdate锛
+ // ================================================================
+
+ /**
+ * 鏍规嵁 workerId 鍜 orderId 鏇存柊缂撳瓨涓殑璁㈠崟淇℃伅
+ *
+ * 濡傛灉鏇存柊鍚庣殑璁㈠崟鐘舵佸凡缁忎笉灞炰簬"寰呭畬鎴"锛坰tatus 鈭 {10}锛夛紝
+ * 鍒欒嚜鍔ㄤ粠缂撳瓨涓Щ闄よ璁㈠崟锛屾棤闇璋冪敤鏂归澶栧垽鏂
+ *
+ * @param workerId 閰嶉佸憳ID
+ * @param orderVO 鏇存柊鍚庣殑璁㈠崟VO
+ */
+ public void update(String workerId, MallDeliveryOrder orderVO) {
+ if (StringUtils.isBlank(workerId) || orderVO == null || StringUtils.isBlank(orderVO.getId())) {
+ log.warn("UserPendingOrderCacheUtil.update 鍙傛暟鏃犳晥, workerId={}, orderVO={}", workerId, orderVO);
+ return;
+ }
+ try {
+ // 濡傛灉璁㈠崟鐘舵佸凡涓嶅睘浜庯紝鐩存帴鍒犻櫎
+ /*if (!isTerminalStatus(orderVO.getStatus())) {
+ remove(workerId, orderVO.getId());
+ log.debug("璁㈠崟宸茬粓鎬侊紝浠庣紦瀛樼Щ闄: workerId={}, orderId={}, status={}",
+ workerId, orderVO.getId(), orderVO.getStatus());
+ return;
+ }*/
+ // 瑕嗙洊鏇存柊
+ put(workerId, orderVO);
+ log.info("鏇存柊閰嶉佸憳缂撳瓨: workerId={}, orderId={}, status={}",
+ workerId, orderVO.getId(), orderVO.getStatus());
+ } catch (Exception e) {
+ log.info("鏇存柊鐢ㄦ埛寰呭畬鎴愯鍗曠紦瀛樺け璐: workerId={}, orderId={}", workerId, orderVO.getId(), e);
+ }
+ }
+
+ // ================================================================
+ // 鏌ヨ锛坓et锛
+ // ================================================================
+
+ /**
+ * 鑾峰彇閰嶉佸憳璁㈠崟缂撳瓨
+ *
+ * @param q 閰嶉佸憳褰撳墠璁㈠崟鏌ヨ瀹炰綋 deliveryType/pageNum/pageSize/regionId/status/workerId
+ * @return 缂撳瓨鐨勮鍗曞垪琛紝缂撳瓨涓嶅瓨鍦ㄦ椂杩斿洖 null锛堣皟鐢ㄦ柟鍙嵁姝ゅ垽鏂槸鍚﹂渶瑕佸洖婧愭煡搴擄級
+ */
+ public IPage getAll(MallDeliveryOrderPageQuery q) {
+ // 1. 鍩虹鏍￠獙
+ if (StringUtils.isBlank(q.getWorkerId())) {
+ return null;
+ }
+
+ try {
+ String key = buildKey(q.getWorkerId());
+ // 2. 鑾峰彇 Hash 涓殑鎵鏈夎鍗曟暟鎹
+ Map entries = redisTemplateHelper.hGetAll(key);
+
+ // 濡傛灉缂撳瓨涓病鏈夋暟鎹紝杩斿洖 null 璁╄皟鐢ㄦ柟鍘绘煡搴
+ if (entries == null || entries.isEmpty()) {
+ return null;
+ }
+
+ // 3. 鍙嶅簭鍒楀寲骞惰浆鎹负 List
+ List allCachedOrders = new ArrayList<>(entries.size());
+ for (Object value : entries.values()) {
+ if (value != null) {
+ // 鍋囪 JSONUtil 鏄 Hutool 鎴栫被浼煎伐鍏风被
+ allCachedOrders.add(JSONUtil.toBean(value.toString(), MallDeliveryOrder.class));
+ }
+ }
+
+ // 4. 鍐呭瓨杩囨护 (鏍规嵁 deliveryType, regionId, status)
+ List filteredList = allCachedOrders.stream()
+ .filter(order -> {
+ // 鐘舵佽繃婊
+ if (q.getStatus() != null && !Objects.equals(order.getStatus(), q.getStatus())) {
+ return false;
+ }
+ // 閰嶉佺被鍨嬭繃婊
+ if (q.getDeliveryType() != null && !Objects.equals(order.getDeliveryType(), q.getDeliveryType())) {
+ return false;
+ }
+ // 鍖哄煙ID杩囨护
+ if (StringUtils.isNotBlank(q.getRegionId()) && !Objects.equals(order.getRegionId(), q.getRegionId())) {
+ return false;
+ }
+ return true;
+ })
+ .collect(Collectors.toList());
+ filteredList.sort(Comparator.comparing(MallDeliveryOrder::getMustFinishTime,
+ Comparator.nullsLast(Comparator.naturalOrder())));
+
+ // 5. 鍐呭瓨鍒嗛〉
+ // 鍒濆鍖栧垎椤靛璞
+ Integer pageNum = q.getPageNum();
+ Integer pageSize = q.getPageSize();
+
+ IPage page = new Page<>(pageNum, pageSize);
+
+ // 璁＄畻鎬昏褰曟暟
+ long total = filteredList.size();
+ page.setTotal(total);
+
+ // 璁＄畻褰撳墠椤电殑鏁版嵁
+ if (total > 0) {
+ long offset = (pageNum - 1) * pageSize;
+ // 闃叉瓒婄晫
+ if (offset >= total) {
+ page.setRecords(Collections.emptyList());
+ } else {
+ int start = (int) Math.min(offset, total);
+ int end = (int) Math.min(offset + pageSize, total);
+ page.setRecords(filteredList.subList(start, end));
+ }
+ } else {
+ page.setRecords(Collections.emptyList());
+ }
+
+ return page;
+
+ } catch (Exception e) {
+ log.error("鑾峰彇閰嶉佸憳璁㈠崟缂撳瓨澶辫触: workerId={}", q.getWorkerId(), e);
+ // 鍙戠敓寮傚父杩斿洖 null锛屽己鍒跺洖婧愭煡搴擄紝淇濊瘉绯荤粺鍙敤鎬
+ return null;
+ }
+ }
+
+ /**
+ * 鑾峰彇閰嶉佸憳缂撳瓨鍗曚釜璁㈠崟
+ *
+ * @param workerId 閰嶉佸憳ID
+ * @param orderId 璁㈠崟ID
+ * @return 缂撳瓨鐨勮鍗昖O锛屼笉瀛樺湪鏃惰繑鍥 null
+ */
+ public MallDeliveryOrder get(String workerId, String orderId) {
+ if (StringUtils.isBlank(workerId) || StringUtils.isBlank(orderId)) {
+ return null;
+ }
+ try {
+ String key = buildKey(workerId);
+ Object value = redisTemplateHelper.hGet(key, orderId);
+ if (value == null) {
+ return null;
+ }
+ return JSONUtil.toBean(value.toString(), MallDeliveryOrder.class);
+ } catch (Exception e) {
+ log.info("鑾峰彇閰嶉佸憳鍗曚釜璁㈠崟缂撳瓨澶辫触: workerId={}, orderId={}", workerId, orderId, e);
+ return null;
+ }
+ }
+
+ /**
+ * 鍒ゆ柇璇ラ厤閫佸憳鐨勭紦瀛樻槸鍚﹀凡瀛樺湪
+ *
+ * @param workerId 閰嶉佸憳ID
+ * @return true 琛ㄧず缂撳瓨瀛樺湪
+ */
+ public boolean exists(String workerId) {
+ if (StringUtils.isBlank(workerId)) {
+ return false;
+ }
+ Boolean hasKey = redisTemplateHelper.hasKey(buildKey(workerId));
+ return hasKey != null && hasKey;
+ }
+
+ // ================================================================
+ // 鍐呴儴宸ュ叿
+ // ================================================================
+
+ /**
+ * 鍒ゆ柇璁㈠崟鐘舵佹槸鍚︿负缁堟侊紙涓嶅啀灞炰簬""锛
+ */
+ /* private boolean isTerminalStatus(Integer status) {
+ if (status == null) {
+ return false;
+ }
+ return status == STATUS_DONE;
+ }*/
+}
diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/MallOrderGoodsMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/MallOrderGoodsMapper.xml
index 0062f1f9..10d985a4 100644
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/MallOrderGoodsMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/MallOrderGoodsMapper.xml
@@ -24,9 +24,19 @@
+
+
+