补漏订单修改

business/partner/purchase/ebai/order.go

@@ -233,6 +233,12 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 
 		VendorOrgCode: utils.Interface2String(result["source"]),
 	}
+	finishTime := getTimeFromInterface(orderMap["finished_time"])
+	if finishTime == utils.ZeroTimeValue {
+		order.OrderFinishedAt = utils.DefaultTimeValue
+	} else {
+		order.OrderFinishedAt = finishTime
+	}
 	if utils.IsTimeZero(order.PickDeadline) && !utils.IsTimeZero(order.StatusTime) {
 		order.PickDeadline = order.StatusTime.Add(pickupOrderDelay) // 饿百要求在5分钟内拣货，不然订单会被取消
 	}

business/partner/purchase/ebai/store.go

@@ -159,7 +159,6 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	`
 	if err = dao.GetRows(db, &stores, sql, model.VendorIDEBAI, utils.DefaultTimeValue, storeID); err == nil {
 		for _, store := range stores {
-			globals.SugarLogger.Debugf("testUpdateStoreStatus1 storeID", storeID, utils.Format4Output(store, false))
 			if globals.EnableEbaiStoreWrite {
 				shopID := 0
 				if store.SyncStatus&model.SyncFlagDeletedMask == 0 {
@@ -182,7 +181,6 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 				if err == nil {
 					if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {
 						mergeStatus := jxutils.MergeStoreStatus(store.Status, store.EbaiStoreStatus)
-						globals.SugarLogger.Debugf("testUpdateStoreStatus storeID:%d, mergeStatus:%s, store.Status:%s, store.EbaiStoreStatus:%s", storeID, mergeStatus, store.Status, store.EbaiStoreStatus)
 						if err = p.UpdateStoreStatus(jxcontext.AdminCtx, store.VendorOrgCode, storeID, store.VendorStoreID, mergeStatus); err != nil {
 							return err
 						}

business/partner/purchase/mtwm/order.go

@@ -144,6 +144,9 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 
 		VendorOrgCode: utils.Interface2String(result[keyVendorOrgCode]),
 	}
+	if result["order_completed_time"] != nil {
+		order.OrderFinishedAt = getTimeFromTimestamp(utils.MustInterface2Int64(result["order_completed_time"]))
+	}
 	pickType := int(utils.Interface2Int64WithDefault(result["pick_type"], 0))
 	if pickType == mtwmapi.OrderPickTypeSelf {
 		order.DeliveryType = model.OrderDeliveryTypeSelfTake