From a65fb441cb95ad5b7207d2766300cf2fb8d8d230 Mon Sep 17 00:00:00 2001 From: liyj <1617420630@qq.com> Date: Tue, 21 Oct 2025 18:01:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=9D=E8=BF=85=E5=90=8C=E6=AD=A5=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=87=BA=E5=BA=93=E6=97=B6=E6=89=8D=E6=89=A3?= =?UTF-8?q?=E5=87=8F=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ShopOrderBaseServiceImpl.java | 20 +++++++------- .../impl/ShopOrderReturnServiceImpl.java | 2 +- .../service/impl/SFExpressApiServiceImpl.java | 27 ++++++++++++++++++- 3 files changed, 37 insertions(+), 12 deletions(-) diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java index 91ef27f9..8daa6b21 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java @@ -3311,9 +3311,9 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl stockDeltaMap = new HashMap<>(); - stockDeltaMap.put(item_src_id + "-" + order_item_row.getOrder_id(), -order_item_quantity); - syncThirdDataService.incrProductStockToRedis(stockDeltaMap); +// Map stockDeltaMap = new HashMap<>(); +// stockDeltaMap.put(item_src_id + "-" + order_item_row.getOrder_id(), -order_item_quantity); +// syncThirdDataService.incrProductStockToRedis(stockDeltaMap); } } @@ -4234,9 +4234,9 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl stockDeltaMap = new HashMap<>(); - stockDeltaMap.put(shopProductItem.getItem_src_id() + "-" + order_item_row.getOrder_id(), order_item_quantity); - syncThirdDataService.incrProductStockToRedis(stockDeltaMap); +// Map stockDeltaMap = new HashMap<>(); +// stockDeltaMap.put(shopProductItem.getItem_src_id() + "-" + order_item_row.getOrder_id(), order_item_quantity); +// syncThirdDataService.incrProductStockToRedis(stockDeltaMap); } } @@ -7264,10 +7264,10 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl stockDeltaMap = new HashMap<>(); - stockDeltaMap.put(item_src_id + "-" + order_id, -cart_quantity); - syncThirdDataService.incrProductStockToRedis(stockDeltaMap); +// log.debug("减库存Item_src_id:{},数量：{}", item_src_id, cart_quantity); +// Map stockDeltaMap = new HashMap<>(); +// stockDeltaMap.put(item_src_id + "-" + order_id, -cart_quantity); +// syncThirdDataService.incrProductStockToRedis(stockDeltaMap); } // end diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java index 6a23db36..39ff4f9f 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java @@ -1515,7 +1515,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl stockDeltaMap = new HashMap<>(); String item_src_id= productItem.getItem_src_id(); stockDeltaMap.put(item_src_id + "-" + shopOrderItem.getOrder_id(), returnNum); diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java index 5f579562..072b6e86 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java @@ -15,10 +15,12 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.suisung.mall.common.api.StateCode; import com.suisung.mall.common.constant.CommonConstant; import com.suisung.mall.common.constant.SFExpressConstant; import com.suisung.mall.common.exception.ApiException; +import com.suisung.mall.common.modules.order.ShopOrderItem; import com.suisung.mall.common.modules.store.ShopMchEntry; import com.suisung.mall.common.modules.store.ShopStoreSameCityTransportBase; import com.suisung.mall.common.modules.store.ShopStoreSfOrder; @@ -29,11 +31,13 @@ import com.suisung.mall.common.utils.*; import com.suisung.mall.shop.message.service.PushMessageService; import com.suisung.mall.shop.order.service.ShopOrderBaseService; import com.suisung.mall.shop.order.service.ShopOrderInfoService; +import com.suisung.mall.shop.order.service.ShopOrderItemService; import com.suisung.mall.shop.order.service.ShopOrderReturnService; import com.suisung.mall.shop.sfexpress.service.SFExpressApiService; import com.suisung.mall.shop.store.service.ShopMchEntryService; import com.suisung.mall.shop.store.service.ShopStoreSameCityTransportBaseService; import com.suisung.mall.shop.store.service.ShopStoreSfOrderService; +import com.suisung.mall.shop.sync.service.SyncThirdDataService; import com.suisung.mall.shop.wechat.service.WxOrderShippingService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -98,6 +102,12 @@ public class SFExpressApiServiceImpl implements SFExpressApiService { @Autowired private PushMessageService pushMessageService; + @Autowired + private SyncThirdDataService syncThirdDataService; + + @Lazy + @Autowired + private ShopOrderItemService shopOrderItemService; /** * 创建顺丰同店铺-连锁店铺 @@ -1002,9 +1012,24 @@ public class SFExpressApiServiceImpl implements SFExpressApiService { orderIsOutStatus = StateCode.ORDER_PICKING_STATE_YES; // 已出库 orderIsShippedStatus = 0; pushRemark = "配送员已到店。"; - // 上传发货信息到微信 wxOrderShippingService.uploadShippingInfoToWx(2, shopOrderId); + //出库扣减思迅库存star + // RMK 第三方数据同步相关：redis 给这个商品减去对应的库存 + QueryWrapper itemQueryWrapper = new QueryWrapper<>(); + String order_id=shopStoreSfOrder.getShop_order_id(); + itemQueryWrapper.eq("order_id", order_id); + List order_item_rows = shopOrderItemService.find(itemQueryWrapper); + if(!order_item_rows.isEmpty()){ + for (ShopOrderItem shopOrderItem : order_item_rows) { + Map stockDeltaMap = new HashMap<>(); + String item_src_id= shopOrderItem.getItem_src_id(); + Integer order_item_quantity=shopOrderItem.getOrder_item_quantity(); + stockDeltaMap.put(item_src_id + "-" + shopStoreSfOrder.getShop_order_id(), -order_item_quantity); + syncThirdDataService.incrProductStockToRedis(stockDeltaMap); + } + } + //出库扣减思迅库存end } else if (shopStoreSfOrder.getOrder_status().equals(StateCode.SF_ORDER_STATUS_RECEIVED)) { // 顺丰同城状态：15-配送员配送中（已取货） // 商城订单状态：从 2030-待发货 到 2040-已发货/待收货确认