Merge branch 'jng'

internal/dao/orderRecordsDao.go

@@ -112,6 +112,22 @@ func UpdateOrderRecordByOrderNO(orderRecord *model.BundleOrderRecords) (res *bun
 		valueAdd.CheckoutSessionId = orderRecord.CheckoutSessionId
 		valueAdd.CheckoutSessionUrl = orderRecord.CheckoutSessionUrl
 	}
+
+	if orderRecord.Status == 2 {
+		tempValues := make([]*model.BundleOrderValueAdd, 0)
+		err = app.ModuleClients.BundleDB.Model(&model.BundleOrderValueAdd{}).
+			Where("order_no = ?", orderRecord.OrderNo).
+			Find(&tempValues).Error
+		if len(tempValues) > 0 {
+			for _, value := range tempValues {
+				if value.PaymentStatus == 2 {
+					fmt.Println("====================已经付过了")
+					return nil, errors.New("已付款了")
+				}
+			}
+		}
+	}
+
 	err = app.ModuleClients.BundleDB.Model(&model.BundleOrderValueAdd{}).
 		Where("order_no = ?", orderRecord.OrderNo).
 		Updates(valueAdd).Error
@@ -452,6 +468,9 @@ func OrderRecordsListV2(req *bundle.OrderRecordsRequestV2) (res *bundle.OrderRec
 	if req.OrderAddCreateAtStart != "" && req.OrderAddCreateAtEnd != "" {
 		modelObj = modelObj.Where("bundle_order_records.created_at between ? and ?", req.OrderAddCreateAtStart, req.OrderAddCreateAtEnd)
 	}
+	if req.BundlePayStart != "" && req.BundlePayEnd != "" {
+		modelObj = modelObj.Where("bundle_order_records.pay_time between ? and ?", req.BundlePayStart, req.BundlePayEnd)
+	}
 	err = modelObj.Count(&count).Error
 	if req.PageSize != 0 && req.Page != 0 {
 		modelObj = modelObj.Limit(int(req.PageSize)).Offset(int(req.Page-1) * int(req.PageSize))
@@ -477,6 +496,7 @@ func OrderRecordsListV2(req *bundle.OrderRecordsRequestV2) (res *bundle.OrderRec
 			BundleCreateAt: record.CreatedAt.Format("2006-01-02 15:04:05"),
 			Amount:         record.Amount,
 			CustomerId:     customerID,
+			PayTime:        record.PayTime,
 		}
 
 		// 聚合子订单
@@ -493,6 +513,7 @@ func OrderRecordsListV2(req *bundle.OrderRecordsRequestV2) (res *bundle.OrderRec
 					OrderAddNo:        orderAddNo,
 					Amount:            amount,
 					CurrencyType:      int32(sub.CurrencyType),
+					HandlingFee:       sub.HandlingFee, //手续费
 					OrderAddCreateAt:  sub.CreatedAt.Format("2006-01-02 15:04:05"),
 					AddPayStatus:      int32(sub.PaymentStatus),
 					Contract:          sub.SignContract,

internal/model/bundle_order_records.go

@@ -65,6 +65,7 @@ type BundleOrderValueAdd struct {
 	Snapshot           string  `gorm:"column:snapshot;comment:快照" json:"snapshot"` //订单快照
 	CheckoutSessionId  string  `json:"checkoutSessionId" gorm:"column:checkout_session_id;type:varchar(1024);default:null;comment:checkoutSessionId"`
 	CheckoutSessionUrl string  `json:"checkoutSessionUrl" gorm:"column:checkout_session_url;type:varchar(1024);default:null;comment:checkoutSessionUrl"`
+	HandlingFee        string  `gorm:"column:handling_fee;comment:手续费" json:"handlingFee"`
 }
 
 // 财务确认状态

pb/bundle.proto

@@ -180,6 +180,8 @@ message OrderRecordsRequestV2{
   int32 page = 12;
   int32 pageSize = 13;
   repeated int64 userIds = 14;
+  string bundlePayStart = 15;
+  string bundlePayEnd = 16;
 }
 message OrderRecordsResponseV2{
   repeated OrderBundleRecordInfo bundleInfo = 1;
@@ -197,13 +199,14 @@ message OrderBundleRecordInfo{
   float amount = 7;
   repeated OrderAddBundleRecordInfo addBundleInfo = 8;
   int64 customerId = 9;
+  string payTime = 10;
 }
 message OrderAddBundleRecordInfo{
   string orderAddNo = 1;
   float amount = 2;
   float settlementAmount = 3;
   int32 currencyType = 4;
-  float handlingFee = 5;
+  string handlingFee = 5;
   float exchangeRate = 6;
   string orderAddCreateAt = 7;
   int32 addPayStatus = 8;