修改订单bug
This commit is contained in:
parent
2daca09103
commit
075926e497
@ -250,18 +250,27 @@ public class ShopOrderInfoServiceImpl extends BaseServiceImpl<ShopOrderInfoMappe
|
||||
|
||||
Integer preOrderStatus = shopOrderInfo.getOrder_state_id();
|
||||
|
||||
int paramsCnt =0;
|
||||
UpdateWrapper<ShopOrderInfo> 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)) {
|
||||
|
||||
@ -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;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user