Merge branch 'feature/v1.0.7' of https://app.yhyue.com/moapp/jyResourcesCenter into feature/v1.0.7

service/exportChargeService.go

@@ -190,7 +190,7 @@ func entCharge(data *resourcesCenter.ChargeReq) (resp *resourcesCenter.ChargeRes
 			Source:        int(data.Source),
 		}
 		if detailed.EntUserId > 0 {
-			jyOrm.Table("entniche_user").Select("CONCAT(NAME,'（',phone,'）')").Where("id=?", detailed.EntUserId).Get(&detailed.Operator)
+			_, _ = jyOrm.Table("entniche_user").Select("CONCAT(NAME,'（',phone,'）')").Where("id=?", detailed.EntUserId).Get(&detailed.Operator)
 		}
 		updateNum, err = souceOrm.Table(ConsumeRecord).Insert(&detailed)
 		if err != nil || updateNum <= 0 {
@@ -220,7 +220,7 @@ func entCharge(data *resourcesCenter.ChargeReq) (resp *resourcesCenter.ChargeRes
 
 func personCharge(data *resourcesCenter.ChargeReq) (resp *resourcesCenter.ChargeResp) {
 	now := time.Now().Format("2006-01-02")
-	jyOrm := entity.Engine.NewSession()
+	jyOrm := entity.JyEngine.NewSession()
 	centerOrm := entity.Engine.NewSession()
 	var personNums int64
 	_, err := centerOrm.Table("account_resources").Select("sum(number) as number").
@@ -256,12 +256,13 @@ func personCharge(data *resourcesCenter.ChargeReq) (resp *resourcesCenter.Charge
 			_ = centerOrm.Rollback()
 			return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "个人账号资源查询失败"}
 		}
+		var deductNum = data.DeductNum
 		for _, value := range balanceList {
 			if value.Number > data.DeductNum {
 				value.Number = value.Number - data.DeductNum
-				data.DeductNum = 0
+				deductNum = 0
 			} else {
-				data.DeductNum = data.DeductNum - value.Number
+				deductNum = deductNum - value.Number
 				value.Number = 0
 			}
 			updateNum, err = centerOrm.Table(AccountResources).
@@ -271,7 +272,7 @@ func personCharge(data *resourcesCenter.ChargeReq) (resp *resourcesCenter.Charge
 				_ = centerOrm.Rollback()
 				return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "修改账户失败"}
 			}
-			if data.DeductNum == 0 {
+			if deductNum == 0 {
 				break
 			}
 		}
@@ -293,15 +294,20 @@ func personCharge(data *resourcesCenter.ChargeReq) (resp *resourcesCenter.Charge
 			Source:        int(data.Source),
 		}
 		if detailed.EntUserId > 0 {
-			jyOrm.Table("entniche_user").Select("CONCAT(NAME,'（',phone,'）')").Where("id=?", detailed.EntUserId).Get(&detailed.Operator)
+			_, err = jyOrm.Table("entniche_user").Select("CONCAT(NAME,'（',phone,'）')").Where("id=?", detailed.EntUserId).Get(&detailed.Operator)
+		}
+		if err != nil {
+			_ = centerOrm.Rollback()
+			return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "操作人查询失败"}
 		}
 		updateNum, err = centerOrm.Table(ConsumeRecord).Insert(&detailed)
 		if err != nil || updateNum <= 0 {
+			_ = centerOrm.Rollback()
 			return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "账号使用明细保存失败"}
 		}
 		err = centerOrm.Commit()
 		if err != nil {
-			_ = jyOrm.Rollback()
+			_ = centerOrm.Rollback()
 			return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "事务提交失败"}
 		}
 	}