1

business/model/dao/dao_order.go

@@ -1397,6 +1397,17 @@ func GetWaybills(db *DaoDB, vendorOrderID string) (waybills []*model.Waybill, er
 	return waybills, err
 }
 
+// GetWayBillsByWayBillId 根据运单id获取运单id
+func GetWayBillsByWayBillId(db *DaoDB, vendorWayBillId string) (waybills []*model.Waybill, err error) {
+	sql := `SELECT * 
+			FROM waybill 
+			WHERE vendor_waybill_id = ?
+	`
+	sqlParams := []interface{}{vendorWayBillId}
+	err = GetRows(db, &waybills, sql, sqlParams)
+	return waybills, err
+}
+
 func GetMatterChildOrders(db *DaoDB, vendorOrderID string) (goods []*model.GoodsOrder, err error) {
 	sql := `SELECT * 
 			FROM goods_order

business/partner/delivery/rider.go

@@ -83,12 +83,16 @@ func GetOrderRiderInfoToPlatform(orderId string) {
 		switch riderInfo.LogisticsStatus {
 		case 20: //配送中
 			riderInfo.LogisticsStatus = 20
+			riderInfo.LogisticsContext = `正在配送中`
 		case 110: // 完成
 			riderInfo.LogisticsStatus = 40
+			riderInfo.LogisticsContext = `配送完成`
 		case 105: // 完成
 			riderInfo.LogisticsStatus = 40
+			riderInfo.LogisticsContext = `被取消`
 		case 115: // 取消
 			riderInfo.LogisticsStatus = 100
+			riderInfo.LogisticsContext = `被取消`
 		default:
 			continue
 		}

business/partner/purchase/tiktok_store/order.go

@@ -3,6 +3,7 @@ package tiktok_store
 import (
 	"errors"
 	"fmt"
+	order_logisticsAdd_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/order_logisticsAdd/request"
 	order_orderDetail_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/order_orderDetail/response"
 	tiktokShop "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api"
 	"regexp"
@@ -213,7 +214,9 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
 
 // GetOrderRider 商家自配送同步配送信息
 func (p *PurchaseHandler) GetOrderRider(vendorOrgCode, vendorStoreID string, param map[string]interface{}) (err error) {
-	return getAPI(vendorOrgCode, 0, vendorStoreID).OrderStatusAndPsInfo(param)
+	appKey := `7152420904331429407`                     // 暂时定死
+	appSecret := `cc7ba367-2394-4cbb-81c6-26f0e929d1c6` //暂时定死
+	return tiktokShop.NewExpress(appKey, appSecret, "").OrderStatusAndPsInfo(param)
 }
 
 func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID, vendorStoreID string) (order *model.GoodsOrder, err error) {
@@ -588,12 +591,19 @@ func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName
 	return err
 }
 
-// SelfDeliverDelivering 暂无自配送中
+// SelfDeliverDelivering 订单在自配送中,表示三方品牌接单,通知抖音已经发货了
 func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) {
-	//if globals.EnableMtwmStoreWrite {
-	//	err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderDelivering(utils.Str2Int64(order.VendorOrderID))
-	//}
-	return err
+	return getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderDelivering(&order_logisticsAdd_request.OrderLogisticsAddParam{
+		OrderId:          order.VendorOrderID,
+		Company:          "",
+		CompanyCode:      "chengdouruoxi",
+		LogisticsCode:    order.VendorWaybillID,
+		IsRefundReject:   false,
+		IsRejectRefund:   false,
+		SerialNumberList: nil,
+		AddressId:        0,
+		StoreId:          utils.Str2Int64(order.VendorStoreID),
+	})
 }
 
 // SelfDeliverDelivered 自配搜完成(暂无)

business/partner/purchase/tiktok_store/store_sku2.go

@@ -282,6 +282,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 				StartSaleType:    0,
 				PickupMethod:     "0",
 				OuterProductId:   utils.Int2Str(storeSku.SkuID), // 本地skuId为外部商品id
+				//AfterSaleService: map[string]string{"supply_day_return_selector": "7"},
 			}
 			globals.SugarLogger.Debugf("====OuterProductId====%d", storeSku.SkuID)
 			globals.SugarLogger.Debugf("====OuterProductId====%d", storeSku.ID)