diff --git a/internal/dao/orderRecordsDao.go b/internal/dao/orderRecordsDao.go index 074bb96..213d94b 100644 --- a/internal/dao/orderRecordsDao.go +++ b/internal/dao/orderRecordsDao.go @@ -118,6 +118,8 @@ func UpdateOrderRecordByOrderNO(orderRecord *model.BundleOrderRecords) (res *bun if orderRecord.Status == 2 { tempValues := make([]*model.BundleOrderValueAdd, 0) + fmt.Println("======================================:") + fmt.Println("tempValues:", tempValues) err = app.ModuleClients.BundleDB.Model(&model.BundleOrderValueAdd{}). Where("order_no = ?", orderRecord.OrderNo). Find(&tempValues).Error @@ -130,24 +132,24 @@ func UpdateOrderRecordByOrderNO(orderRecord *model.BundleOrderRecords) (res *bun } } - tempRecord := new(model.BundleOrderRecords) - if err := app.ModuleClients.BundleDB.Where("deleted_at is null and order_no = ?", orderRecord.OrderNo).First(&tempRecord).Error; err != nil { - if errors.Is(err, gorm.ErrRecordNotFound) { - return nil, errors.New("订单记录不存在") - } - return nil, fmt.Errorf("查询订单失败: %v", err) - } - if orderRecord.Status == 2 && tempRecord.AmountType == 2 && tempRecord.TotalAmount > 0 { - // 当回调支付成功,币种是美元,且订单金额大于0,计算美元手续费:订单金额*0.019(四舍五入保留两位小数字)+0.1 - amount := decimal.NewFromFloat32(tempRecord.TotalAmount) - rate, _ := decimal.NewFromString("0.019") - fee := amount.Mul(rate) - // 4. 四舍五入保留两位小数 - feeRounded := fee.Round(2) - addition, _ := decimal.NewFromString("0.1") - result := feeRounded.Add(addition) - valueAdd.HandlingFee = result.String() - } + //tempRecord := new(model.BundleOrderRecords) + //if err := app.ModuleClients.BundleDB.Where("deleted_at is null and order_no = ?", orderRecord.OrderNo).First(&tempRecord).Error; err != nil { + // if errors.Is(err, gorm.ErrRecordNotFound) { + // return nil, errors.New("订单记录不存在") + // } + // return nil, fmt.Errorf("查询订单失败: %v", err) + //} + //if orderRecord.Status == 2 && tempRecord.AmountType == 2 && tempRecord.TotalAmount > 0 { + // // 当回调支付成功,币种是美元,且订单金额大于0,计算美元手续费:订单金额*0.019(四舍五入保留两位小数字)+0.1 + // amount := decimal.NewFromFloat32(tempRecord.TotalAmount) + // rate, _ := decimal.NewFromString("0.019") + // fee := amount.Mul(rate) + // // 4. 四舍五入保留两位小数 + // feeRounded := fee.Round(2) + // addition, _ := decimal.NewFromString("0.1") + // result := feeRounded.Add(addition) + // valueAdd.HandlingFee = result.String() + //} } @@ -159,6 +161,8 @@ func UpdateOrderRecordByOrderNO(orderRecord *model.BundleOrderRecords) (res *bun return res, commonErr.ReturnError(err, msg.ErrorUpdateOrderInfo, "更新增值服务支付状态失败: ") } // Step 2: 再更新主订单信息(如果存在) + fmt.Println("======================================:") + fmt.Println("orderRecord:", orderRecord) err = app.ModuleClients.BundleDB.Model(&model.BundleOrderRecords{}). Where("order_no = ?", orderRecord.OrderNo). Updates(orderRecord).Error