1

business/partner/purchase/tao_vegetable/order.go

@@ -104,6 +104,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
 		for _, extra := range *orderDetail.SubOrderResponseList {
 			sku := &model.OrderSku{
 				VendorOrderID:    order.VendorOrderID,
+				VendorSubOrderID: *extra.OutSubOrderId,
 				VendorID:         model.VendorIDTaoVegetable,
 				StoreSubID:       0,
 				StoreSubName:     "",
@@ -122,7 +123,6 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
 				OrderCreatedAt:   order.OrderCreatedAt,
 				IsVendorAct:      0,
 				Upc:              *extra.Barcode,
-				VendorSubOrderID: utils.Int64ToStr(*extra.BizSubOrderId),
 			}
 
 			activityId := make([]int64, 0)
@@ -436,6 +436,9 @@ func (c *PurchaseHandler) callbackOrderMsg2Status(msg *tao_vegetable.CallbackOrd
 	case tao_vegetable.OrderStatusOnSaleCancel:
 		orderStatus.Status = model.OrderStatusCanceled
 		orderStatus.Remark = "用户售中取消"
+	case tao_vegetable.OrderStatusSuccess: // 送达
+		orderStatus.Status = model.OrderStatusFinished
+		orderStatus.Remark = "订单送达"
 	}
 	return orderStatus
 }