|
|
@@ -81,6 +81,7 @@ import java.io.IOException;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.util.*;
|
|
|
+import java.util.concurrent.TimeUnit;
|
|
|
import java.util.concurrent.atomic.AtomicBoolean;
|
|
|
|
|
|
import static com.fs.hisStore.constants.StoreConstants.DELIVERY;
|
|
|
@@ -910,7 +911,7 @@ public class DfOrderServiceImpl implements IErpOrderService {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- boolean sendGoods = redisCache.sIsMember(sendGoodsKey, orderId.toString());
|
|
|
+ boolean sendGoods = redisCache.getCacheObject(sendGoodsKey + orderId);
|
|
|
if (("0".equals(stateEx) || "1".equals(stateEx) || "2".equals(stateEx)) && sendGoods) {
|
|
|
log.info("发货消息已发送过,跳过 - orderId: {}", orderId);
|
|
|
return;
|
|
|
@@ -948,8 +949,9 @@ public class DfOrderServiceImpl implements IErpOrderService {
|
|
|
redisCache.sAdd(signedKey, orderId.toString());
|
|
|
}
|
|
|
|
|
|
+ // 设置已发货的发送标识
|
|
|
if ("0".equals(stateEx) || "1".equals(stateEx) || "2".equals(stateEx)) {
|
|
|
- redisCache.sAdd(sendGoodsKey, orderId.toString());
|
|
|
+ redisCache.setCacheObject(sendGoodsKey + orderId, "1",15, TimeUnit.DAYS);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
log.error("AI物流消息发送失败 - orderId: {}, sendId: {}, 错误信息: {}", orderId, sendId, e.getMessage(), e);
|
ct