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

2022-10-14 17:03:19 +08:00
parent 3d1b0e7447 068cf655c4
commit 7d0ed365ce
9 changed files with 256 additions and 17 deletions
--- a/business/partner/delivery/rider.go
+++ b/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
 		}
--- a/business/partner/purchase/tiktok_store/order.go
+++ b/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 := `7153997323561879075`                     // 暂时定死
+	appSecret := `3517d3ea-b96b-4379-a7a4-2d9389e8ffeb` //暂时定死
+	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 自配搜完成(暂无)
--- a/business/partner/purchase/tiktok_store/order_afs_utils.go
+++ b/business/partner/purchase/tiktok_store/order_afs_utils.go
@@ -129,7 +129,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(msgId string, msg interface{}) (retVal *
 func (c *PurchaseHandler) callbackAfsMsg2Status(msgId string, msg interface{}) (orderStatus *model.OrderStatus, vendorOrgCode int) {
 	switch msgId {
 	case tiktokShop.CallbackRefundOrderMsgTagId: // 买家发起售后申请消息
-		refundOrder := msg.(*tiktokShop.BuyerRefundCreatedData)
+		refundOrder := msg.(tiktokShop.BuyerRefundCreatedData)
 		orderMsg := &model.OrderStatus{
 			VendorID:         model.VendorIDDD,
 			OrderType:        model.OrderTypeAfsOrder,
@@ -153,7 +153,7 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(msgId string, msg interface{}) (
 		vendorOrgCode = refundOrder.ShopId
 		orderStatus = orderMsg
 	case tiktokShop.CallbackUpdateRefundOrderMsgTagId: // 买家修改售后申请消息
-		refundOrder := msg.(*tiktokShop.BuyerRefundModifiedData)
+		refundOrder := msg.(tiktokShop.BuyerRefundModifiedData)
 		orderMsg := &model.OrderStatus{
 			VendorID:         model.VendorIDDD,
 			OrderType:        model.OrderTypeAfsOrder,
@@ -177,7 +177,7 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(msgId string, msg interface{}) (
 		vendorOrgCode = refundOrder.ShopId
 		orderStatus = orderMsg
 	case tiktokShop.CallbackRefundOrderSuccessMsgTagId: // 退款成功消息
-		refundOrder := msg.(*tiktokShop.BusinessRefundSuccessData)
+		refundOrder := msg.(tiktokShop.BusinessRefundSuccessData)
 		orderMsg := &model.OrderStatus{
 			VendorID:         model.VendorIDDD,
 			OrderType:        model.OrderTypeAfsOrder,
@@ -200,7 +200,7 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(msgId string, msg interface{}) (
 		vendorOrgCode = refundOrder.ShopId
 		orderStatus = orderMsg
 	case tiktokShop.CallbackRefundOrderRefuseMsgTagId: // 拒绝退款消息
-		refundOrder := msg.(*tiktokShop.BusinessNotRefundRefusedData)
+		refundOrder := msg.(tiktokShop.BusinessNotRefundRefusedData)
 		orderMsg := &model.OrderStatus{
 			VendorID:         model.VendorIDDD,
 			OrderType:        model.OrderTypeAfsOrder,
@@ -223,7 +223,7 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(msgId string, msg interface{}) (
 		vendorOrgCode = refundOrder.ShopId
 		orderStatus = orderMsg
 	case tiktokShop.CallbackRefundShopMsgTagId: // 拒绝退货申请消息
-		refundOrder := msg.(*tiktokShop.BusinessNotReturnApplyRefusedData)
+		refundOrder := msg.(tiktokShop.BusinessNotReturnApplyRefusedData)
 		orderMsg := &model.OrderStatus{
 			VendorID:         model.VendorIDDD,
 			OrderType:        model.OrderTypeAfsOrder,
@@ -246,7 +246,7 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(msgId string, msg interface{}) (
 		vendorOrgCode = refundOrder.ShopId
 		orderStatus = orderMsg
 	case tiktokShop.CallbackReturnApplyAgreedMsgTagId: // 同意退货申请消息
-		refundOrder := msg.(*tiktokShop.BusinessReturnApplyAgreedData)
+		refundOrder := msg.(tiktokShop.BusinessReturnApplyAgreedData)
 		orderMsg := &model.OrderStatus{
 			VendorID:         model.VendorIDDD,
 			OrderType:        model.OrderTypeAfsOrder,
@@ -269,7 +269,7 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(msgId string, msg interface{}) (
 		vendorOrgCode = refundOrder.ShopId
 		orderStatus = orderMsg
 	case tiktokShop.CallbackReturnRefundAgreedMsgTagId: // 同意退款消息
-		refundOrder := msg.(*tiktokShop.BusinessRefundAgreedData)
+		refundOrder := msg.(tiktokShop.BusinessRefundAgreedData)
 		orderMsg := &model.OrderStatus{
 			VendorID:         model.VendorIDDD,
 			OrderType:        model.OrderTypeAfsOrder,
--- a/business/partner/purchase/tiktok_store/store_sku2.go
+++ b/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)
--- a/business/partner/purchase/tiktok_store/store_sku2_utils.go
+++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go
@@ -61,14 +61,24 @@ func GetProductFormatNew(categoryLeftId int64, vendorOrgCode string) (string, er
 	}
 	format := make(map[string][]*tiktokShop.ProductFormatNewList, 0)
 	for _, v := range category.Data.Data {
-		for _, d := range v.Options {
+		if len(v.Options) == 0 {
 			formateNew := &tiktokShop.ProductFormatNewList{
-				Value:   utils.Str2Int64(d.Value),
-				Name:    d.Name,
-				DiyType: v.DiyType,
+				Value:   0,
+				Name:    "暂不支持",
+				DiyType: 1,
 			}
 			format[utils.Int64ToStr(v.PropertyId)] = append(format[utils.Int64ToStr(v.CategoryId)], formateNew)
+		} else {
+			for _, d := range v.Options {
+				formateNew := &tiktokShop.ProductFormatNewList{
+					Value:   utils.Str2Int64(d.Value),
+					Name:    d.Name,
+					DiyType: v.DiyType,
+				}
+				format[utils.Int64ToStr(v.PropertyId)] = append(format[utils.Int64ToStr(v.CategoryId)], formateNew)
+			}
 		}
+
 	}
 	productFormatNew, err := json.Marshal(format)
 	if err != nil {