diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go index b75c198be..4e458a63f 100644 --- a/business/jxstore/cms/sync2.go +++ b/business/jxstore/cms/sync2.go @@ -725,7 +725,7 @@ func FullSyncVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, store case 0: _, err = amendAndPruneVendorStuff(ctx, task, storeID, vendorID, vendorOrgCode, false, isContinueWhenError, AmendPruneAll, false) case 1: - //_, err = SyncCategories(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, false) + _, err = SyncCategories(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, false) case 2: _, err = SyncSkus(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, nil, false) } diff --git a/business/partner/purchase/mtwm/order_afs.go b/business/partner/purchase/mtwm/order_afs.go index b04594e16..0b371376d 100644 --- a/business/partner/purchase/mtwm/order_afs.go +++ b/business/partner/purchase/mtwm/order_afs.go @@ -316,6 +316,14 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(msg *mtwmapi.CallbackMsg) (order if refundData.NotifyType == "" && refundData.ResType == model.NO { orderStatus.VendorStatus = "用户申请退货且退款" } + // 0-等待处理中;1-商家驳回退款请求;2-商家同意退款;3-客服驳回退款请求;4-客服帮商家同意退款;5-超时未处理系统自动同意;6-系统自动确认;7-用户取消退款申请;8-用户取消退款申诉 + if refundData.ResType == 2 || refundData.ResType == 4 || refundData.ResType == 5 || refundData.ResType == 6 { + orderStatus.Status = model.AfsOrderStatusFinished + orderStatus.VendorStatus += "," + refundData.Status + } else if refundData.ResType == 1 || refundData.ResType == 3 || refundData.ResType == 7 || refundData.ResType == 8 { + orderStatus.Status = model.AfsOrderStatusFailed + orderStatus.VendorStatus += "," + refundData.Status + } // 1-已申请 10-初审已同意 11-初审已驳回 16-初审已申诉 17-初审申诉已同意 18-初审申诉已驳回 20-终审已发起(用户已发货) 21-终审已同意 22-终审已驳回 26-终审已申诉 27-终审申诉已同意 28-终审申诉已驳回 30-已取消 if refundData.Status == "21" { orderStatus.Status = model.AfsOrderStatusFinished