From 670f5365868688521fffa7a48b8a0323df8fed5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 12 Jul 2022 09:19:29 +0800
Subject: [PATCH] 1

---
 business/jxutils/datares/datares.go      | 51 ++++++++++++------------
 business/jxutils/datares/datares_test.go | 21 ++++------
 business/q_bida/q_bida_server.go         |  4 +-
 3 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/business/jxutils/datares/datares.go b/business/jxutils/datares/datares.go
index 12fe15b82..4123a8177 100644
--- a/business/jxutils/datares/datares.go
+++ b/business/jxutils/datares/datares.go
@@ -15,8 +15,8 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/globals"
-	"git.rosy.net.cn/jx-callback/globals/api"
-	"github.com/qiniu/api.v7/storage"
+	//"git.rosy.net.cn/jx-callback/globals/api"
+	//"github.com/qiniu/api.v7/storage"
 )
 
 const (
@@ -49,25 +49,26 @@ func Binary2Image(binaryData []byte, mimeType string) (img image.Image, outMimeT
 	return img, mimeType, err
 }
 
-func GetQiniuUploadToken(ctx *jxcontext.Context, suffix, hashCode string) (upTokenInfo *UploadResTokenInfo, err error) {
-	imgURL := ""
-	if hashCode != "" {
-		imgURL, _ = GetDataResource(ctx, hashCode)
-	}
-
-	putPolicy := storage.PutPolicy{
-		Scope:   globals.QiniuBucket,
-		Expires: qiniuTokenExpires,
-	}
-	upTokenInfo = &UploadResTokenInfo{
-		Token:    putPolicy.UploadToken(api.QiniuAPI),
-		Expires:  putPolicy.Expires,
-		FileName: jxutils.GenPicFileName(suffix),
-		Hit:      imgURL != "",
-		Img:      imgURL,
-	}
-	return upTokenInfo, err
-}
+//
+//func GetQiniuUploadToken(ctx *jxcontext.Context, suffix, hashCode string) (upTokenInfo *UploadResTokenInfo, err error) {
+//	imgURL := ""
+//	if hashCode != "" {
+//		imgURL, _ = GetDataResource(ctx, hashCode)
+//	}
+//
+//	putPolicy := storage.PutPolicy{
+//		Scope:   globals.QiniuBucket,
+//		Expires: qiniuTokenExpires,
+//	}
+//	upTokenInfo = &UploadResTokenInfo{
+//		Token:    putPolicy.UploadToken(api.QiniuAPI),
+//		Expires:  putPolicy.Expires,
+//		FileName: jxutils.GenPicFileName(suffix),
+//		Hit:      imgURL != "",
+//		Img:      imgURL,
+//	}
+//	return upTokenInfo, err
+//}
 
 // 此函数要求resBinary不能空，mimeType与hashCode必须是正确的
 func RegisterDataResource(ctx *jxcontext.Context, name, resourceURL, mimeType, hashCode string, resBinary []byte, imgType int, isAsyncUpload2Vendor bool) (dataRes *model.DataResource, err error) {
@@ -108,10 +109,10 @@ func RegisterDataResource(ctx *jxcontext.Context, name, resourceURL, mimeType, h
 		return dataRes, err
 	}
 	if imgType > 0 {
-		if globals.EnableStoreWrite {
-			// 忽略上传错误
-			UploadImage2Vendors(ctx, nil, dataRes, resBinary, isAsyncUpload2Vendor)
-		}
+		//if globals.EnableStoreWrite {
+		// 忽略上传错误
+		UploadImage2Vendors(ctx, nil, dataRes, resBinary, isAsyncUpload2Vendor)
+		//}
 	}
 	return dataRes, err
 }
diff --git a/business/jxutils/datares/datares_test.go b/business/jxutils/datares/datares_test.go
index 82080c758..a209a6f8c 100644
--- a/business/jxutils/datares/datares_test.go
+++ b/business/jxutils/datares/datares_test.go
@@ -1,32 +1,25 @@
 package datares
 
 import (
-	"fmt"
 	"testing"
 
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
-	"git.rosy.net.cn/jx-callback/globals/api2"
 	"git.rosy.net.cn/jx-callback/globals/testinit"
-
-	_ "git.rosy.net.cn/jx-callback/business/partner/purchase/ebai"
-	_ "git.rosy.net.cn/jx-callback/business/partner/purchase/jd"
-	_ "git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm"
 )
 
 func init() {
 	testinit.Init()
-	api2.Init()
 }
 
-func TestGetQiniuUploadToken(t *testing.T) {
-	token, err := GetQiniuUploadToken(jxcontext.AdminCtx, "", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	fmt.Print(token)
-}
+//func TestGetQiniuUploadToken(t *testing.T) {
+//	token, err := GetQiniuUploadToken(jxcontext.AdminCtx, "", "")
+//	if err != nil {
+//		t.Fatal(err)
+//	}
+//	fmt.Print(token)
+//}
 
 func TestGetDataResource(t *testing.T) {
 	dataRes, err := GetDataResource(jxcontext.AdminCtx, "1D3E4A8259F359FB4CF47D541843950D")
diff --git a/business/q_bida/q_bida_server.go b/business/q_bida/q_bida_server.go
index 994fa5041..b2febc879 100644
--- a/business/q_bida/q_bida_server.go
+++ b/business/q_bida/q_bida_server.go
@@ -566,12 +566,12 @@ func TryAgainOrder(ctx *jxcontext.Context, oldNo string) (*model.UserVendorOrder
 	}
 
 	// 获取用户发货地址信息
-	sendAddress, countSend, err := dao.QueryUserDeliveryAddress(dao.GetDB(), oldOrder.SenderAddressID, nil, 0, 1, 10)
+	sendAddress, countSend, err := dao.QueryUserDeliveryAddress(dao.GetDB(), oldOrder.SenderAddressID, nil, 0, 0, 10)
 	if err != nil || countSend != model.YES {
 		return nil, errors.New("查询错误/送货地址信息不正确")
 	}
 	// 获取用户收货
-	receiveAddress, receiveSend, err := dao.QueryUserDeliveryAddress(dao.GetDB(), oldOrder.SenderAddressID, nil, 0, 1, 10)
+	receiveAddress, receiveSend, err := dao.QueryUserDeliveryAddress(dao.GetDB(), oldOrder.ReceiveAddressID, nil, 0, 0, 10)
 	if err != nil || receiveSend != model.YES {
 		return nil, errors.New("查询错误/收货地址信息不正确")
 	}