From ffdc7f3a61c66e6671e8c9de69e23c92937b75f2 Mon Sep 17 00:00:00 2001
From: songchuang <192749120@qq.com>
Date: Wed, 19 Apr 2023 13:44:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E5=8D=95=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/internal/dao/statement.go   |  4 ++--
 cmd/internal/logic/statement.go | 19 +++++--------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/cmd/internal/dao/statement.go b/cmd/internal/dao/statement.go
index e64ed4f..0bae32f 100644
--- a/cmd/internal/dao/statement.go
+++ b/cmd/internal/dao/statement.go
@@ -197,7 +197,7 @@ func CreateArtworkSoldCopyDetail(tx *gorm.DB, uid1, uid2 string, excelTwoInfo *s
 }
 
 func GetAllBatchTimeTx() (batchTime []string, err error) {
-	if err = db.DB.Where("DISTINCT batch_time").Find(&model.ArtworkTx{}).Pluck("batch_time", &batchTime).Error; err != nil {
+	if err = db.DB.Distinct("batch_time").Find(&model.ArtworkTx{}).Pluck("batch_time", &batchTime).Error; err != nil {
 		zap.L().Error("get artworkTxList info err", zap.Error(err))
 		err = errors.New(m.ERROR_SELECT)
 		return
@@ -206,7 +206,7 @@ func GetAllBatchTimeTx() (batchTime []string, err error) {
 }
 
 func GetAllBatchTimeCopy() (batchTime []string, err error) {
-	if err = db.DB.Where("DISTINCT batch_time").Find(&model.ArtworkCopy{}).Pluck("batch_time", &batchTime).Error; err != nil {
+	if err = db.DB.Distinct("batch_time").Find(&model.ArtworkCopy{}).Pluck("batch_time", &batchTime).Error; err != nil {
 		zap.L().Error("get artworkTxList info err", zap.Error(err))
 		err = errors.New(m.ERROR_SELECT)
 		return
diff --git a/cmd/internal/logic/statement.go b/cmd/internal/logic/statement.go
index d1d8375..459c3f3 100644
--- a/cmd/internal/logic/statement.go
+++ b/cmd/internal/logic/statement.go
@@ -1,8 +1,6 @@
 package logic
 
 import (
-	"fmt"
-
 	"github.com/fonchain/fonchain-artistinfo/cmd/internal/dao"
 	statement "github.com/fonchain/fonchain-artistinfo/pb/artistinfoStatement"
 	db "github.com/fonchain/fonchain-artistinfo/pkg/db"
@@ -31,7 +29,7 @@ type Statement struct {
 
 func (a *Statement) UploadExcelOneTx(req *statement.UploadExcelOneTxRequest) (rep *statement.UploadExcelOneTxRespond, err error) {
 	rep = &statement.UploadExcelOneTxRespond{}
-	fmt.Println("req.ExcelOneInfo", req.ExcelOneInfo)
+
 	//开启事务，遇到错误就回滚
 	tx := db.DB.Begin()
 	defer func() {
@@ -113,13 +111,8 @@ func (a *Statement) UploadExcelTwoTx(req *statement.UploadExcelTwoTxRequest) (re
 			return rep, err
 		}
 
-		fmt.Println("exist", exist)
-		fmt.Println("artworkTx", artworkTx)
-		fmt.Println("artworkTx", artworkTx)
-
 		//没有的就生成物权批次
 		if exist {
-			fmt.Println("第一处")
 
 			//获取批次uid
 			uid1, err := util.GetUid()
@@ -131,7 +124,7 @@ func (a *Statement) UploadExcelTwoTx(req *statement.UploadExcelTwoTxRequest) (re
 			if err != nil {
 				return rep, err
 			}
-			fmt.Println("第二处")
+
 			//对账单画作物权委托详情uid
 			uid2, err := util.GetUid()
 			if err != nil {
@@ -143,18 +136,17 @@ func (a *Statement) UploadExcelTwoTx(req *statement.UploadExcelTwoTxRequest) (re
 				return rep, err
 			}
 		} else {
-			fmt.Println("第三处")
+
 			//查看画作是否已经被该批次录入过，被录入过就跳过
 			count, err := dao.IsExistArtworkSoldTxDetail(tx, artworkTx.Uid, v.TfNum)
 			if err != nil {
 				return rep, err
 			}
-			fmt.Println("count", count)
-			fmt.Println("err", err)
+
 			if count != 0 {
 				continue
 			}
-			fmt.Println("第四处")
+
 			//获取批次uid
 			uid, err := util.GetUid()
 			if err != nil {
@@ -164,7 +156,6 @@ func (a *Statement) UploadExcelTwoTx(req *statement.UploadExcelTwoTxRequest) (re
 			if err != nil {
 				return rep, err
 			}
-			fmt.Println("第五处")
 		}
 
 	}