diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java index 27dc8262..bc63bf90 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java @@ -250,18 +250,27 @@ public class ShopOrderInfoServiceImpl extends BaseServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("order_id", orderId); if (orderStatus > 0) { updateWrapper.set("order_state_id", orderStatus); + paramsCnt++; } if (orderIsOutStatus > 0 && !shopOrderInfo.getOrder_is_out().equals(orderIsOutStatus)) { updateWrapper.set("order_is_out", orderStatus); + paramsCnt++; } if (orderStatus > 0 && !shopOrderInfo.getOrder_is_shipped().equals(orderIsShippedStatus)) { updateWrapper.set("order_is_shipped", orderIsShippedStatus); + paramsCnt++; + } + + if(paramsCnt<=0){ + // 无修改的状态 + return false; } if (!update(updateWrapper)) { 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 068b1976..72a38dc3 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 @@ -543,8 +543,7 @@ public class SFExpressApiServiceImpl implements SFExpressApiService { Integer orderStatus = 0; Integer orderIsOutStatus = 0; Integer orderIsShippedStatus = 0; - if (shopStoreSfOrder.getOrder_status().equals(StateCode.SF_ORDER_STATUS_RECEIVING) - || shopStoreSfOrder.getOrder_status().equals(StateCode.SF_ORDER_STATUS_ARRIVED)) { + if (shopStoreSfOrder.getOrder_status().equals(StateCode.SF_ORDER_STATUS_RECEIVING)) { // 顺丰同城状态:10-配送员接单/配送员改派; // 商城订单状态:从 2016-已经付款 到 2020-待配货; orderStatus = StateCode.ORDER_STATE_PICKING;