Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

business/partner/purchase/tiktok_store/order.go

@@ -178,7 +178,8 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
 
 	// 预订单还是快速达
 	localStore, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreIdRelly, model.VendorIDDD, vendorOrgCode)
-	if err != nil {
+	if err != nil || localStore == nil || localStore.ID == 0 {
+		globals.SugarLogger.Debugf("平台门店未绑定到京西系统  %s", err.Error())
 		return nil, nil, err
 	}
 	// 订单不在门店营业时间来的订单,
@@ -593,9 +594,6 @@ func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName s
 		AddressId:        0,
 		StoreId:          utils.Str2Int64(order.VendorStoreID),
 	})
-	if err != nil {
-		return err
-	}
 
 	return err
 }
@@ -646,10 +644,19 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam
 
 // SelfDeliverDelivered 自配搜完成(暂无)
 func (c *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) {
-	//if globals.EnableMtwmStoreWrite {
-	//	err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderArrived(utils.Str2Int64(order.VendorOrderID))
-	//}
-	return err
+	riderInfo := &mtpsapi.RiderInfo{
+		OrderId:               order.VendorOrderID,
+		ThirdCarrierOrderId:   order.VendorOrderID,
+		CourierName:           "",
+		CourierPhone:          "",
+		LogisticsProviderCode: "10002",
+		LogisticsStatus:       0,
+		LogisticsContext:      "商家自配送,已送达",
+		Latitude:              "",
+		Longitude:             "",
+		OpCode:                tiktokShop.TiktokLogisticsDELIVERED,
+	}
+	return c.GetOrderRider("", "", utils.Struct2MapByJson(riderInfo))
 }
 
 func getTimeFromTimestamp(timeStamp int64) time.Time {