修改抖音回传率

business/jxstore/misc/misc.go

@@ -219,7 +219,7 @@ func Init() {
 		// 每五分钟轮询一次推送骑手信息坐标给美团/抖音 (真的订单)[抖音建议小于六十秒]
 		ScheduleTimerFuncByInterval(func() {
 			delivery.GetOrderRiderInfoToPlatform("", 0)
-		}, 10*time.Second, 2*time.Minute)
+		}, 10*time.Second, 4*time.Minute)
 
 		// (自动发单拣货,设置骑手) 刷单用
 		//ScheduleTimerFuncByInterval(func() {

business/partner/delivery/rider.go

@@ -97,11 +97,6 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
 	//3.当同一个订单已经上传了一次配送信息，如再次同步会更新配送信息，以最新的一次为准。
 	//4.如订单已完成、已取消等状态发货将失败。
 	for _, v := range orders {
-		// 非三方配送订单不同步消息
-		//if v.WaybillVendorID < 100 {
-		//	continue
-		//}
-
 		if orderId == "" { // 订单id为空是,是定时轮询操作,不做此状态
 			waybillList, _ := dao.GetWaybills(db, v.VendorOrderID, nil)
 			if len(waybillList) > 0 && waybillList[0].Status > model.WaybillStatusEndBegin {
@@ -125,22 +120,22 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
 						continue
 					}
 				}
-			} else {
-				fakeWayBill, err := dao.GetWaybills(db, v.VendorOrderID, []int64{model.VendorJXFakeWL, model.VendorIDUnknown})
-				if err != nil || len(fakeWayBill) != model.YES {
-					continue
-				}
-
-				riderInfo = &utils.RiderInfo{
-					OrderId:               fakeWayBill[0].VendorOrderID,
-					ThirdCarrierOrderId:   fakeWayBill[0].VendorWaybillID,
-					CourierName:           fakeWayBill[0].CourierName,
-					CourierPhone:          fakeWayBill[0].CourierMobile,
-					LogisticsProviderCode: "10002",
-					LogisticsStatus:       fakeWayBill[0].Status,
-				}
-				makeRiderInfo(fakeWayBill[0], riderInfo)
 			}
+		} else {
+			fakeWayBill, err := dao.GetWaybills(db, v.VendorOrderID, []int64{model.VendorJXFakeWL, model.VendorIDUnknown})
+			if err != nil || len(fakeWayBill) != model.YES {
+				continue
+			}
+
+			riderInfo = &utils.RiderInfo{
+				OrderId:               fakeWayBill[0].VendorOrderID,
+				ThirdCarrierOrderId:   fakeWayBill[0].VendorWaybillID,
+				CourierName:           fakeWayBill[0].CourierName,
+				CourierPhone:          fakeWayBill[0].CourierMobile,
+				LogisticsProviderCode: "10002",
+				LogisticsStatus:       fakeWayBill[0].Status,
+			}
+			makeRiderInfo(fakeWayBill[0], riderInfo)
 		}
 
 		if wayBillStatus == model.OrderStatusNew || wayBillStatus == model.OrderStatusCanceled || (v.WaybillVendorID == -1 && v.DeliveryType == "store") { // 真商家自送

business/partner/purchase/ebai/order_afs.go

@@ -275,7 +275,6 @@ func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *mod
 			}
 			refundProductList = append(refundProductList, refundProduct)
 		}
-		globals.SugarLogger.Debugf("========parna :;= %s", utils.Format4Output(param, false))
 
 		if approveType == partner.AfsApproveTypeRefused {
 			if reason == "" {

business/partner/purchase/tiktok_store/order_afs.go

@@ -7,7 +7,6 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/partner"
-	"git.rosy.net.cn/jx-callback/globals"
 	"strings"
 )
 
@@ -113,57 +112,63 @@ var (
 
 // AgreeOrRefuseRefund todo 审核售后单申请 退货退款(同意退货,确认收货之后会自动退款) 审核售后有点问题
 func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *model.AfsOrder, approveType int, reason string) (err error) {
-	if globals.EnableDdStoreWrite {
+	tiktokApi := getAPI(order.VendorOrgCode, order.JxStoreID, "")
-		if approveType == partner.AfsApproveTypeRefused { // 拒绝退货
+	//afsOrderDetail, err := tiktokApi.QueryAfsOrderDetail(order.AfsOrderID, false)
-			errList := make([]string, 0, 0)
+	//if err != nil {
-			// 拒绝退款
+	//	return err
-			if err = getAPI(order.VendorOrgCode, order.JxStoreID, "").AfterSaleOperate(tiktokShop.AfterSaleEmuRefuseToReturnOneApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil {
+	//}
-				errList = append(errList, err.Error())
-			} else {
-				return nil
-			}
-			if err = getAPI(order.VendorOrgCode, order.JxStoreID, "").AfterSaleOperate(tiktokShop.AfterSaleEmuRefuseOnlyRefundApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil {
-				errList = append(errList, err.Error())
-			} else {
-				return nil
-			}
 
-			if err = getAPI(order.VendorOrgCode, order.JxStoreID, "").AfterSaleOperate(tiktokShop.AfterSaleEmuRefuseToReturnTwoApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil {
+	if approveType == partner.AfsApproveTypeRefused { // 拒绝退货
-				errList = append(errList, err.Error())
+		//switch afsOrderDetail.Data.ProcessInfo.AfterSaleInfo.AfterSaleType {
-			} else {
+		//case :
-				return nil
+		//
-			}
+		//}
-			if len(errList) < 3 {
-				return nil
-			}
-			return fmt.Errorf("%s", strings.Join(errList, "--"))
-		} else if approveType == partner.AfsApproveTypeRefund { // 同意
-			errList := make([]string, 0, 0)
-			if err = getAPI(order.VendorOrgCode, order.JxStoreID, "").AfterSaleOperate(tiktokShop.AfterSaleEmuAgreeToReturnOneApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil {
-				errList = append(errList, err.Error())
-			} else {
-				return nil
-			}
-			// 同意仅退款
-			if err = getAPI(order.VendorOrgCode, order.JxStoreID, "").AfterSaleOperate(tiktokShop.AfterSaleEmuAgreeOnlyRefundApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil {
-				errList = append(errList, err.Error())
-			} else {
-				return nil
-			}
 
-			if err = getAPI(order.VendorOrgCode, order.JxStoreID, "").AfterSaleOperate(tiktokShop.AfterSaleEmuAgreeToReturnTwoApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil {
+		errList := make([]string, 0, 0)
-				errList = append(errList, err.Error())
+		// 拒绝退款
-			} else {
+		if err = tiktokApi.AfterSaleOperate(tiktokShop.AfterSaleEmuRefuseToReturnOneApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil {
-				return nil
+			errList = append(errList, err.Error())
-			}
+		} else {
-
+			return nil
-			return fmt.Errorf("%s", strings.Join(errList, "--"))
-			if len(errList) < 3 {
-				return nil
-			}
-		} else if approveType == partner.AfsApproveTypeRefusedToRefundMoney { // 退货转退款
-			err = getAPI(order.VendorOrgCode, order.JxStoreID, "").AfterSaleOperate(tiktokShop.AfterSaleEmuReturnGoodsToRefundApply, order.AfsOrderID, "退货转退款", utils.Str2Int64(order.VendorStoreID))
 		}
+		if err = tiktokApi.AfterSaleOperate(tiktokShop.AfterSaleEmuRefuseOnlyRefundApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil {
+			errList = append(errList, err.Error())
+		} else {
+			return nil
+		}
+
+		if err = tiktokApi.AfterSaleOperate(tiktokShop.AfterSaleEmuRefuseToReturnTwoApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil {
+			errList = append(errList, err.Error())
+		} else {
+			return nil
+		}
+		if len(errList) < 3 {
+			return nil
+		}
+		return fmt.Errorf("%s", strings.Join(errList, "--"))
+	} else if approveType == partner.AfsApproveTypeRefund { // 同意
+		errList := make([]string, 0, 0)
+		if err = tiktokApi.AfterSaleOperate(tiktokShop.AfterSaleEmuAgreeToReturnOneApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil {
+			errList = append(errList, err.Error())
+		} else {
+			return nil
+		}
+		// 同意仅退款
+		if err = tiktokApi.AfterSaleOperate(tiktokShop.AfterSaleEmuAgreeOnlyRefundApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil {
+			errList = append(errList, err.Error())
+		} else {
+			return nil
+		}
+
+		if err = tiktokApi.AfterSaleOperate(tiktokShop.AfterSaleEmuAgreeToReturnTwoApply, order.AfsOrderID, reason, utils.Str2Int64(order.VendorStoreID)); err != nil {
+			errList = append(errList, err.Error())
+		} else {
+			return nil
+		}
+
+		return fmt.Errorf("%s", strings.Join(errList, "--"))
+	} else if approveType == partner.AfsApproveTypeRefusedToRefundMoney { // 退货转退款
+		err = tiktokApi.AfterSaleOperate(tiktokShop.AfterSaleEmuReturnGoodsToRefundApply, order.AfsOrderID, "退货转退款", utils.Str2Int64(order.VendorStoreID))
 	}
 	return err
 }