From 048d4d9e3fd83e80bc4c76066e76487672884178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 28 Jun 2023 18:46:50 +0800
Subject: [PATCH] 1

---
 platformapi/tao_vegetable/api_model.go   | 7 +++++++
 platformapi/tao_vegetable/order_model.go | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/platformapi/tao_vegetable/api_model.go b/platformapi/tao_vegetable/api_model.go
index fcbab991..e83ccfac 100644
--- a/platformapi/tao_vegetable/api_model.go
+++ b/platformapi/tao_vegetable/api_model.go
@@ -48,6 +48,13 @@ func CallBackResultInfo(err error) *CallBackResult {
 
 // CallBackResultSign 签名错误
 func CallBackResultSign(err error) *CallBackResult {
+	if err == nil {
+		return &CallBackResult{
+			Success: false,
+			ErrCode: "sign-check-failure",
+			ErrMsg:  "",
+		}
+	}
 	return &CallBackResult{
 		Success: false,
 		ErrCode: "sign-check-failure",
diff --git a/platformapi/tao_vegetable/order_model.go b/platformapi/tao_vegetable/order_model.go
index 47da4bb8..57e622ba 100644
--- a/platformapi/tao_vegetable/order_model.go
+++ b/platformapi/tao_vegetable/order_model.go
@@ -71,12 +71,12 @@ type SubRefundOrdersList struct {
 // UserCancelRefundApply 用户取消售后申请
 type UserCancelRefundApply struct {
 	//PublicModel
-	RefundId     string `json:"refundId"`     // 渠道退款单ID, 幂等键
+	MerchantCode int64  `json:"merchantCode"` // 商家编码
 	BizRefundId  string `json:"bizRefundId"`  // 翱象退款单ID
 	OutOrderId   string `json:"outOrderId"`   // 渠道订单ID
 	OrderFrom    int64  `json:"orderFrom"`    // 渠道来源
-	MerchantCode int64  `json:"merchantCode"` // 商家编码
 	StoreId      int64  `json:"storeId"`      // 商家经营店ID
+	RefundId     string `json:"refundId"`     // 渠道退款单ID, 幂等键
 }
 
 // RefundOrderFinish 逆向订单完成回调(售后完成)