feat:xiugai

service/exportChargeService.go

@@ -1,7 +1,6 @@
 package service
 
 import (
-	"log"
 	"strings"
 	"time"
 
@@ -100,7 +99,6 @@ func entCharge(data *resourcesCenter.ChargeReq) (resp *resourcesCenter.ChargeRes
 	} else {
 		return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "未查询到企业数据流量"}
 	}
-	log.Println("-----1")
 	if data.DeductNum > 0 {
 		if entNums < data.DeductNum {
 			return &resourcesCenter.ChargeResp{
@@ -118,8 +116,6 @@ func entCharge(data *resourcesCenter.ChargeReq) (resp *resourcesCenter.ChargeRes
 				},
 			}
 		}
-		log.Println("-----2")
-
 		// 先更新mgo企业数据总量
 		query := map[string]interface{}{
 			"entid": data.EntId,
@@ -136,8 +132,6 @@ func entCharge(data *resourcesCenter.ChargeReq) (resp *resourcesCenter.ChargeRes
 		if !b {
 			return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "企业余额操作失败"}
 		}
-		log.Println("-----3")
-
 		err = jyOrm.Begin()
 		//更新限额
 		if err != nil {
@@ -148,8 +142,6 @@ func entCharge(data *resourcesCenter.ChargeReq) (resp *resourcesCenter.ChargeRes
 			Incr("export_nums", data.ExportNum).
 			Incr("all_export_nums", data.ExportNum).
 			Update(&entity.PersonLimit{})
-		log.Println(updateNum, "-----4", err)
-
 		if err != nil {
 			_ = jyOrm.Rollback()
 			return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "操作失败，" + err.Error()}
@@ -179,33 +171,31 @@ func entCharge(data *resourcesCenter.ChargeReq) (resp *resourcesCenter.ChargeRes
 					Num5:         personLimit[0].MaxNums - personLimit[0].AllExportNums,
 				},
 			}
-			//保存账号使用明细
-			detailed := entity.Detailed{
-				AccountId:     data.UserId,
-				CompanyId:     data.EntId,
-				ResourceType:  "高级字段包",
-				Number:        data.ExportNum,
-				DeductionNumb: data.DeductNum,
-				Name:          "数据流包",
-				CreateTime:    time.Now().Local(),
-				Remarks:       data.Remark,
-				UserType:      0,
-				UserId:        data.UserId,
-				AccountType:   1,
-				EntId:         data.EntId,
-			}
-			updateNum, err = souceOrm.Table(ConsumeRecord).Insert(&detailed)
-			log.Println(updateNum, "-----5", err)
-
-			if err != nil || updateNum <= 0 {
-				_ = jyOrm.Rollback()
-				return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "账号使用明细保存失败"}
-			}
-			err = jyOrm.Commit()
-			if err != nil {
-				_ = jyOrm.Rollback()
-				return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "事务提交失败，" + err.Error()}
-			}
+		}
+		//保存账号使用明细
+		detailed := entity.Detailed{
+			AccountId:     data.UserId,
+			CompanyId:     data.EntId,
+			ResourceType:  "高级字段包",
+			Number:        data.ExportNum,
+			DeductionNumb: data.DeductNum,
+			Name:          "数据流包",
+			CreateTime:    time.Now().Local(),
+			Remarks:       data.Remark,
+			UserType:      0,
+			UserId:        data.UserId,
+			AccountType:   1,
+			EntId:         data.EntId,
+		}
+		updateNum, err = souceOrm.Table(ConsumeRecord).Insert(&detailed)
+		if err != nil || updateNum <= 0 {
+			_ = jyOrm.Rollback()
+			return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "账号使用明细保存失败"}
+		}
+		err = jyOrm.Commit()
+		if err != nil {
+			_ = jyOrm.Rollback()
+			return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "事务提交失败，" + err.Error()}
 		}
 	}
 	return &resourcesCenter.ChargeResp{