From a2bf7f038a746de69af78f04d918fbfee750ce07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Thu, 29 Jun 2023 11:02:08 +0800
Subject: [PATCH] 1

---
 controllers/taobao_vegetable.go | 40 +++++++++------------------------
 1 file changed, 10 insertions(+), 30 deletions(-)

diff --git a/controllers/taobao_vegetable.go b/controllers/taobao_vegetable.go
index fe925ecb4..0c8c2356b 100644
--- a/controllers/taobao_vegetable.go
+++ b/controllers/taobao_vegetable.go
@@ -76,10 +76,6 @@ func (c *TaoBaoVegetableController) GetCode() {
 
 // OrderStatus 订单状态变化 [post]
 func (c *TaoBaoVegetableController) OrderStatus() {
-	//c.Data["json"] = tao_vegetable.CallBackResultSign(nil)
-	//c.ServeJSON()
-	//return
-
 	urlParam := c.Ctx.Request.URL.RawQuery
 
 	// 获取url参数
@@ -104,11 +100,11 @@ func (c *TaoBaoVegetableController) OrderStatus() {
 		c.Data["json"] = tao_vegetable.CallBackResultSign(fmt.Errorf("非法签名"))
 		c.ServeJSON()
 		return
-	} else {
+	} /* else {
 		c.Data["json"] = tao_vegetable.CallBackResultSign(nil)
 		c.ServeJSON()
 		return
-	}
+	}*/
 
 	callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusChange, utils.Int64ToStr(order.BizOrderId), order)
 	c.Data["json"] = callbackResponse
@@ -118,10 +114,6 @@ func (c *TaoBaoVegetableController) OrderStatus() {
 
 // ApplyCancelOrder 用户发起售后申请
 func (c *TaoBaoVegetableController) ApplyCancelOrder() {
-	//c.Data["json"] = tao_vegetable.CallBackResultSign(nil)
-	//c.ServeJSON()
-	//return
-
 	urlParam := c.Ctx.Request.URL.RawQuery
 
 	// 获取url参数
@@ -147,11 +139,11 @@ func (c *TaoBaoVegetableController) ApplyCancelOrder() {
 		c.Data["json"] = tao_vegetable.CallBackResultSign(fmt.Errorf("非法签名"))
 		c.ServeJSON()
 		return
-	} else {
+	} /* else {
 		c.Data["json"] = tao_vegetable.CallBackResultSign(nil)
 		c.ServeJSON()
 		return
-	}
+	}*/
 
 	callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusApplyAfs, afsOrder.OutOrderId, afsOrder)
 	c.Data["json"] = callbackResponse
@@ -161,10 +153,6 @@ func (c *TaoBaoVegetableController) ApplyCancelOrder() {
 
 // UserCancelRefund 用户取消售后
 func (c *TaoBaoVegetableController) UserCancelRefund() {
-	//c.Data["json"] = tao_vegetable.CallBackResultSign(nil)
-	//c.ServeJSON()
-	//return
-
 	urlParam := c.Ctx.Request.URL.RawQuery
 
 	// 获取url参数
@@ -190,11 +178,11 @@ func (c *TaoBaoVegetableController) UserCancelRefund() {
 		c.Data["json"] = tao_vegetable.CallBackResultSign(fmt.Errorf("非法签名"))
 		c.ServeJSON()
 		return
-	} else {
+	} /*else {
 		c.Data["json"] = tao_vegetable.CallBackResultSign(nil)
 		c.ServeJSON()
 		return
-	}
+	}*/
 
 	callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusCancelAfs, afsOrder.OutOrderId, afsOrder)
 	c.Data["json"] = callbackResponse
@@ -204,10 +192,6 @@ func (c *TaoBaoVegetableController) UserCancelRefund() {
 
 // CancelOnSaleRefundOrder 用户售中取消(走订单取消流程)
 func (c *TaoBaoVegetableController) CancelOnSaleRefundOrder() {
-	//c.Data["json"] = tao_vegetable.CallBackResultSign(nil)
-	//c.ServeJSON()
-	//return
-
 	urlParam := c.Ctx.Request.URL.RawQuery
 
 	// 获取url参数
@@ -233,11 +217,11 @@ func (c *TaoBaoVegetableController) CancelOnSaleRefundOrder() {
 		c.Data["json"] = tao_vegetable.CallBackResultSign(fmt.Errorf("非法签名"))
 		c.ServeJSON()
 		return
-	} else {
+	} /* else {
 		c.Data["json"] = tao_vegetable.CallBackResultSign(nil)
 		c.ServeJSON()
 		return
-	}
+	}*/
 
 	callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusOnSaleCancel, utils.Int64ToStr(afsOrder.PartCancelRequest.BizOrderId), afsOrder)
 	c.Data["json"] = callbackResponse
@@ -247,10 +231,6 @@ func (c *TaoBaoVegetableController) CancelOnSaleRefundOrder() {
 
 // RefundOrderSuccess 用户售后成功通知,只有退款成功了才会通知(商户拒绝退款,不会通知)
 func (c *TaoBaoVegetableController) RefundOrderSuccess() {
-	//c.Data["json"] = tao_vegetable.CallBackResultSign(nil)
-	//c.ServeJSON()
-	//return
-
 	urlParam := c.Ctx.Request.URL.RawQuery
 
 	// 获取url参数
@@ -275,11 +255,11 @@ func (c *TaoBaoVegetableController) RefundOrderSuccess() {
 		c.Data["json"] = tao_vegetable.CallBackResultSign(fmt.Errorf("非法签名"))
 		c.ServeJSON()
 		return
-	} else {
+	} /*else {
 		c.Data["json"] = tao_vegetable.CallBackResultSign(nil)
 		c.ServeJSON()
 		return
-	}
+	}*/
 
 	callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusRefundSuccess, refundSuccess.OutSubOrderId, refundSuccess)
 	c.Data["json"] = callbackResponse