京西商城订单测试

business/jxcallback/orderman/order.go

@@ -1160,7 +1160,7 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
 	if err != nil || order == nil {
 		return "", fmt.Errorf("未查询到该订单！订单号：[%v]", vendorOrderID)
 	}
-	if order.Status >= model.OrderStatusDelivering {
+	if order.Status >= model.OrderStatusDelivering && order.Status != model.OrderStatusCanceled {
 		return "", fmt.Errorf("暂不支持此状态的订单进行转移！")
 	}
 	if order.VendorID != model.VendorIDJDShop {
@@ -1290,6 +1290,8 @@ func SendJdwlForJdsOrder(ctx *jxcontext.Context, vendorOrderID string) (err erro
 		if err != nil {
 			return err
 		}
+		order.EclpOutID = eclpSoNo
+		dao.UpdateEntity(db, order, "EclpOutID")
 		vendorWaybillID = eclpSoNo
 	} else {
 		handler := partner.DeliveryPlatformHandlers[model.VendorIDJDWL]