Merge branch 'master' of https://app.yhyue.com:8443/moapp/jyResourcesCenter

rpc/test/company_test.go

@@ -36,22 +36,22 @@ Spec
 string //标识
 AppId
 string //剑鱼标识
-Model
+Modelcode
 int64  //操作类型0使用1新增*/
 //修改结存
 func Test_UpdateUserBalance(t *testing.T) {
 	ctx, _ := context.WithTimeout(context.Background(), 5*time.Second)
 	FileSystem := resourcesCenterclient.NewResourcesCenter(zrpc.MustNewClient(c.FileSystemConf))
 	req := &resourcesCenter.Balance{
-		AccountId:    1,
-		CompanyId:    2,
-		DepartmentId: 3,
+		AccountId:    111,
+		CompanyId:    0,
+		DepartmentId: 0,
 		Name:         "数据导出",
 		ResourceType:         "001",
-		Number:       123,
+		Number:       1300,
 		Spec:         "021",
 		AppId:        "10000",
-		Model:        1,
+		Model:        0,
 	}
 	res, err := FileSystem.UpdateUserBalance(ctx, req)
 	log.Println("err ", err)
@@ -80,15 +80,15 @@ func Test_UpdateUserDetailed(t *testing.T) {
 	ctx, _ := context.WithTimeout(context.Background(), 5*time.Second)
 	FileSystem := resourcesCenterclient.NewResourcesCenter(zrpc.MustNewClient(c.FileSystemConf))
 	req := &resourcesCenter.Detailed{
-		AccountId:     1,
-		CompanyId:     2,
-		ResourceType:  "100",
-		ExportNum:     100,
+		AccountId:     111,
+		CompanyId:     0,
+		ResourceType:  "001",
+		ExportNum:     1300,
 		DeductionType: "1",
-		RuleId:        12,
-		UserType:      1,
-		DepartmentId:  3,
-		UserId:"WEWEWE112",
+		RuleId:        1,
+		UserType:      0,
+		DepartmentId:  0,
+		UserId:"1111111",
 	}
 	res, err := FileSystem.UpdateUserDetailed(ctx, req)
 	log.Println("err ", err)

service/balanceService.go

@@ -36,7 +36,7 @@ func (service *BalanceService) UpdateUserBalance(in *resourcesCenter.Balance) (i
 			CompanyId:    in.CompanyId,
 			DepartmentId: in.DepartmentId,
 			Name:         in.Name,
-			ResourceType:         in.ResourceType,
+			ResourceType: in.ResourceType,
 			Number:       in.Number,
 			Spec:         in.Spec,
 			AppId:        in.AppId,
@@ -52,13 +52,13 @@ func (service *BalanceService) UpdateUserBalance(in *resourcesCenter.Balance) (i
 
 	}
 	if in.Model == 0 {
-		if (balance.Number > in.Number) {
+		if (balance.Number < in.Number) {
 			return entity.ErrorCode, "该用户结存不够不可使用"
 		}
 		balance.Number = balance.Number - in.Number
 		updateNumb, err := orm.Table(AccountResources).
 			Cols("number").
-			Where("accountId=? and  companyId=? and  departmentId=? and  code=?", in.AccountId, in.CompanyId, in.DepartmentId, in.ResourceType).
+			Where("accountId=? and  companyId=? and  departmentId=? and  resourceType=?", in.AccountId, in.CompanyId, in.DepartmentId, in.ResourceType).
 			Update(&balance)
 		if err != nil {
 			log.Panicln("结存修改失败：", err)
@@ -71,7 +71,7 @@ func (service *BalanceService) UpdateUserBalance(in *resourcesCenter.Balance) (i
 	}
 	balance.Number = balance.Number + in.Number
 	updateNumb, err := orm.Table(AccountResources).
-		Where("accountId=? and  companyId=? and  departmentId=? and  code=?", in.AccountId, in.CompanyId, in.DepartmentId, in.ResourceType).
+		Where("accountId=? and  companyId=? and  departmentId=? and  resourceType=?", in.AccountId, in.CompanyId, in.DepartmentId, in.ResourceType).
 		Update(&balance)
 	if err != nil {
 		log.Panicln("结存修改失败：", err)
@@ -96,6 +96,7 @@ func (service *BalanceService) UpdateUserDetailed(in *resourcesCenter.Detailed)
 		RuleId:       in.RuleId,
 		ExportTime:   time.Now().Local(),
 		UserType:     in.UserType,
+		UserId:       in.UserId,
 	}
 	insertNumb, err := orm.Table(ConsumeRecord).Insert(&detailed)
 	if err != nil {