diff --git a/controllers/taobao_vegetable.go b/controllers/taobao_vegetable.go index 8f1be1ac5..a6f5f77f3 100644 --- a/controllers/taobao_vegetable.go +++ b/controllers/taobao_vegetable.go @@ -100,20 +100,23 @@ func (c *TaoBaoVegetableController) OrderStatus() { // 验签 sign := Sign(values, body, api.TaoVegetableApi.GetAppSecret()) - if sign != values.Get("sign") { - c.Data["json"] = tao_vegetable.CallBackResultSign(fmt.Errorf("非法签名")) - c.ServeJSON() - return - } else { - c.Data["json"] = tao_vegetable.CallBackResultSign(nil) + switch order.MerchantCode { + case "CSSJ": // 淘宝回调地址检测 + if sign != values.Get("sign") { + c.Data["json"] = tao_vegetable.CallBackResultSign(fmt.Errorf("非法签名")) + c.ServeJSON() + return + } else { + c.Data["json"] = tao_vegetable.CallBackResultSign(nil) + c.ServeJSON() + return + } + default: + callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusChange, utils.Int64ToStr(order.BizOrderId), order) + c.Data["json"] = callbackResponse c.ServeJSON() return } - - callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusChange, utils.Int64ToStr(order.BizOrderId), order) - c.Data["json"] = callbackResponse - c.ServeJSON() - return } // ApplyCancelOrder 用户发起售后申请 @@ -142,20 +145,23 @@ func (c *TaoBaoVegetableController) ApplyCancelOrder() { // 验签 FFF779F16365992BD721C9C1A027F03C sign := Sign(values, body, api.TaoVegetableApi.GetAppSecret()) - if sign != values.Get("sign") { // 76626F983F0F7E4A159AD64F9B13B332 - c.Data["json"] = tao_vegetable.CallBackResultSign(fmt.Errorf("非法签名")) - c.ServeJSON() - return - } else { - c.Data["json"] = tao_vegetable.CallBackResultSign(nil) + switch afsOrder.MerchantCode { + case "CSSJ": + if sign != values.Get("sign") { // 76626F983F0F7E4A159AD64F9B13B332 + c.Data["json"] = tao_vegetable.CallBackResultSign(fmt.Errorf("非法签名")) + c.ServeJSON() + return + } else { + c.Data["json"] = tao_vegetable.CallBackResultSign(nil) + c.ServeJSON() + return + } + default: + callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusApplyAfs, afsOrder.OutOrderId, afsOrder) + c.Data["json"] = callbackResponse c.ServeJSON() return } - - callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusApplyAfs, afsOrder.OutOrderId, afsOrder) - c.Data["json"] = callbackResponse - c.ServeJSON() - return } // UserCancelRefund 用户取消售后 @@ -184,20 +190,24 @@ func (c *TaoBaoVegetableController) UserCancelRefund() { // 验签 sign := Sign(values, body, api.TaoVegetableApi.GetAppSecret()) - if sign != values.Get("sign") { - c.Data["json"] = tao_vegetable.CallBackResultSign(fmt.Errorf("非法签名")) - c.ServeJSON() - return - } else { - c.Data["json"] = tao_vegetable.CallBackResultSign(nil) + switch afsOrder.MerchantCode { + case "CSSJ": + if sign != values.Get("sign") { + c.Data["json"] = tao_vegetable.CallBackResultSign(fmt.Errorf("非法签名")) + c.ServeJSON() + return + } else { + c.Data["json"] = tao_vegetable.CallBackResultSign(nil) + c.ServeJSON() + return + } + default: + callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusCancelAfs, afsOrder.OutOrderId, afsOrder) + c.Data["json"] = callbackResponse c.ServeJSON() return } - callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusCancelAfs, afsOrder.OutOrderId, afsOrder) - c.Data["json"] = callbackResponse - c.ServeJSON() - return } // CancelOnSaleRefundOrder 用户售中取消(走订单取消流程) @@ -226,20 +236,23 @@ func (c *TaoBaoVegetableController) CancelOnSaleRefundOrder() { // 验签 sign := Sign(values, body, api.TaoVegetableApi.GetAppSecret()) - if sign != values.Get("sign") { - c.Data["json"] = tao_vegetable.CallBackResultSign(fmt.Errorf("非法签名")) - c.ServeJSON() - return - } else { - c.Data["json"] = tao_vegetable.CallBackResultSign(nil) + switch afsOrder.PartCancelRequest.MerchantCode { + case "CSSJ": + if sign != values.Get("sign") { + c.Data["json"] = tao_vegetable.CallBackResultSign(fmt.Errorf("非法签名")) + c.ServeJSON() + return + } else { + c.Data["json"] = tao_vegetable.CallBackResultSign(nil) + c.ServeJSON() + return + } + default: + callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusOnSaleCancel, utils.Int64ToStr(afsOrder.PartCancelRequest.BizOrderId), afsOrder) + c.Data["json"] = callbackResponse c.ServeJSON() return } - - callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusOnSaleCancel, utils.Int64ToStr(afsOrder.PartCancelRequest.BizOrderId), afsOrder) - c.Data["json"] = callbackResponse - c.ServeJSON() - return } // RefundOrderSuccess 用户售后成功通知,只有退款成功了才会通知(商户拒绝退款,不会通知) @@ -267,20 +280,23 @@ func (c *TaoBaoVegetableController) RefundOrderSuccess() { } // 验签 sign := Sign(values, body, api.TaoVegetableApi.GetAppSecret()) - if sign != values.Get("sign") { - c.Data["json"] = tao_vegetable.CallBackResultSign(fmt.Errorf("非法签名")) - c.ServeJSON() - return - } else { - c.Data["json"] = tao_vegetable.CallBackResultSign(nil) + switch refundSuccess.MerchantCode { + case "CSSJ": + if sign != values.Get("sign") { + c.Data["json"] = tao_vegetable.CallBackResultSign(fmt.Errorf("非法签名")) + c.ServeJSON() + return + } else { + c.Data["json"] = tao_vegetable.CallBackResultSign(nil) + c.ServeJSON() + return + } + default: + callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusRefundSuccess, refundSuccess.OutSubOrderId, refundSuccess) + c.Data["json"] = callbackResponse c.ServeJSON() return } - - callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusRefundSuccess, refundSuccess.OutSubOrderId, refundSuccess) - c.Data["json"] = callbackResponse - c.ServeJSON() - return } func Sign(param url.Values, data, secret string) string {