From da0715b4f4db5afad1a53d09d397b7ca88ba6653 Mon Sep 17 00:00:00 2001
From: kanade <kanade@kumo.work>
Date: Tue, 17 May 2022 14:15:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=AF=E4=BB=98=E5=AE=9D?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/v2/logic/manage/after/after.go       |  4 ----
 internal/v2/logic/pay/alipay/refund.go        | 21 ++++++++++++++-----
 internal/v2/logic/pay/wechat/refund.go        |  7 -------
 internal/v2/model/search_ali/searchByAliES.go |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/internal/v2/logic/manage/after/after.go b/internal/v2/logic/manage/after/after.go
index cac5c81..c89e41f 100644
--- a/internal/v2/logic/manage/after/after.go
+++ b/internal/v2/logic/manage/after/after.go
@@ -2,7 +2,6 @@ package after
 
 import (
 	"errors"
-	"log"
 	"recook/internal/dbc"
 	"recook/internal/libs/bean"
 	"recook/internal/service/comFunc"
@@ -485,12 +484,9 @@ func refundWithType(tx *gorm.DB, asGoods after.RecookAfterSalesGoodsModel) error
 			mysql2.Db.First(&od2, "jcook_order_id = ?", od.JCookRootID)
 			asGoods.OrderTotalAmount = od2.ActualTotalAmount
 		}
-		log.Println("========================================1")
 		if err := wechat.Refund(&asGoods); err != nil {
-			log.Println("========================================3", err)
 			return err
 		}
-		log.Println("========================================2")
 	case manage.RecookOrderInfoPayMethodAlipay:
 		if err := alipay.Refund(tx, &asGoods); err != nil {
 			return err
diff --git a/internal/v2/logic/pay/alipay/refund.go b/internal/v2/logic/pay/alipay/refund.go
index a893354..e603830 100644
--- a/internal/v2/logic/pay/alipay/refund.go
+++ b/internal/v2/logic/pay/alipay/refund.go
@@ -3,6 +3,8 @@ package alipay
 import (
 	"errors"
 	"fmt"
+	alipay2 "git.oa00.com/go/alipay"
+	"github.com/smartwalle/alipay/v3"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -78,16 +80,25 @@ func Refund(tx *gorm.DB, asGoods *after.RecookAfterSalesGoodsModel) error {
 	//这边判断是否有金额
 	fmt.Println("退款金额:", asGoods.RefundAmount.Truncate(2).String(), "========")
 	if asGoods.RefundAmount.GreaterThan(decimal.NewFromFloat(0.0)) {
-		detailParam := RefundDetailParam{
+		param := alipay.TradeRefund{
 			OutTradeNo:   asGoods.TradeNo,
 			RefundAmount: asGoods.RefundAmount.Truncate(2).String(),
 			OutRequestNo: asGoods.RefundNo,
 		}
-
-		pub := newPublicParam(&detailParam)
-		if err := RequestOrderRefund(&pub); err != nil {
-			return err
+		refund, _ := alipay2.Alipay.TradeRefund(param)
+		if !refund.Content.Code.IsSuccess() {
+			return errors.New("支付宝退款结果不对")
 		}
+		//detailParam := RefundDetailParam{
+		//	OutTradeNo:   asGoods.TradeNo,
+		//	RefundAmount: asGoods.RefundAmount.Truncate(2).String(),
+		//	OutRequestNo: asGoods.RefundNo,
+		//}
+		//
+		//pub := newPublicParam(&detailParam)
+		//if err := RequestOrderRefund(&pub); err != nil {
+		//	return err
+		//}
 	}
 
 	return pay.SyncRefundSuccessCallback(tx, asGoods)
diff --git a/internal/v2/logic/pay/wechat/refund.go b/internal/v2/logic/pay/wechat/refund.go
index 5aeea49..f3e4283 100644
--- a/internal/v2/logic/pay/wechat/refund.go
+++ b/internal/v2/logic/pay/wechat/refund.go
@@ -134,19 +134,12 @@ func requestOrderRefund(param *RefundParam) error {
 	defer func() { _ = response.Body.Close() }()
 	result, err := ioutil.ReadAll(response.Body)
 	if err != nil {
-		log.Println("========================================")
-		log.Println(string(result))
-		log.Println(err)
 		return err
 	}
 
 	var r RefundQueryResult
 	err = xml.Unmarshal(result, &r)
 	if err != nil {
-		log.Println("========================================")
-		log.Println(string(result))
-		log.Println(err)
-		log.Println(r)
 		return err
 	}
 
diff --git a/internal/v2/model/search_ali/searchByAliES.go b/internal/v2/model/search_ali/searchByAliES.go
index 1d5fcef..5f44691 100644
--- a/internal/v2/model/search_ali/searchByAliES.go
+++ b/internal/v2/model/search_ali/searchByAliES.go
@@ -25,8 +25,8 @@ func CreateRes(cmd string, f F) Res {
 
 var (
 	EndPoint        = "opensearch-cn-shanghai.aliyuncs.com"
-	AccessKeyId     = "LTAI5tR6hFZwtJLKFq4Sxibg"
-	AccessKeySecret = "pn0fKjGY7zoLzWdGjjcxJP95jrAhAn"
+	AccessKeyId     = "LTAI5tBeJdJBq2R9quhwGeQH"
+	AccessKeySecret = "sKvHrPwNWbVeDgUARAiGTluW06AQ4c"
 	App             = "zjyc"
 	Table           = "main"
 )