tijiao

entity/detailed.go

@@ -9,7 +9,7 @@ type Detailed struct {
 	DepartmentId  int64     `xorm:"departmentId" form:"departmentId" json:"departmentId"`    //组织标识
 	ResourceType  string    `xorm:"resourceType" form:"resourceType" json:"resourceType"`    //资源类型
 	ExportNum     int64     `xorm:"exportNum" form:"exportNum" json:"exportNum"`             //导出数量
-	DeductionType int64    `xorm:"deductionType" form:"deductionType" json:"deductionType"` //扣类型(1高级字段包)
+	DeductionType int64    `xorm:"deductionType" form:"deductionType" json:"deductionType"` //扣费类型(1高级字段包)
 	RuleId        int64     `xorm:"ruleId" form:"ruleId" json:"ruleId"`                      //使用规则标识
 	ExportTime    time.Time `xorm:"exportTime" form:"exportTime" json:"exportTime"`          //导出时间
 	UserType      int64     `xorm:"userType" form:"userType" json:"userType"`                //流水类型0使用1新增

rpc/resourcesCenter.proto

@@ -22,7 +22,7 @@ option go_package = "resourcesCenter/";
       int64    companyId =2;         //企业标识
       string    resourceType =3;      //资源类型
       int64   exportNum=4;          //导出数量
-      string    deductionType =5;     //扣类型(1高级字段包)
+      string    deductionType =5;     //扣费类型(1高级字段包)
       int64    ruleId =6;            //使用规则标识
       int64    exportTime =7;        //导出时间
       int64    userType =8;          //流水类型0使用1新增

rpc/resourcesCenter/resourcesCenter.pb.go

@@ -199,7 +199,7 @@ type Detailed struct {
 	CompanyId     int64  `protobuf:"varint,2,opt,name=companyId,proto3" json:"companyId,omitempty"`        //企业标识
 	ResourceType  string `protobuf:"bytes,3,opt,name=resourceType,proto3" json:"resourceType,omitempty"`   //资源类型
 	ExportNum     int64  `protobuf:"varint,4,opt,name=exportNum,proto3" json:"exportNum,omitempty"`        //导出数量
-	DeductionType string `protobuf:"bytes,5,opt,name=deductionType,proto3" json:"deductionType,omitempty"` //扣类型(1高级字段包)
+	DeductionType string `protobuf:"bytes,5,opt,name=deductionType,proto3" json:"deductionType,omitempty"` //扣费类型(1高级字段包)
 	RuleId        int64  `protobuf:"varint,6,opt,name=ruleId,proto3" json:"ruleId,omitempty"`              //使用规则标识
 	ExportTime    int64  `protobuf:"varint,7,opt,name=exportTime,proto3" json:"exportTime,omitempty"`      //导出时间
 	UserType      int64  `protobuf:"varint,8,opt,name=userType,proto3" json:"userType,omitempty"`          //流水类型0使用1新增

rpc/test/company_test.go

@@ -67,11 +67,11 @@ string //资源类型
 ExportNum
 int64  //导出数量
 DeductionType
-string //扣类型(1高级字段包)
+string //扣费类型(1高级字段包)
 int64
-ExportTime
+ExportTime 导出时间
 RuleId  //使用规则标识
-int64  //导出时间
+int64  //
 UserType
 int64  //流水类型0使用1新增
 DepartmentId

rpc/test/resourcesRecord_test.go

@@ -19,7 +19,7 @@ func init() {
 }
 
 func Test_FindResourcesAuth(t *testing.T) {
-	ctx, _ := context.WithTimeout(context.Background(), 5*time.Second)
+	ctx, _ := context.WithTimeout(context.Background(), 510*time.Second)
 	FileSystem := resourcesCenterclient.NewResourcesCenter(zrpc.MustNewClient(c.FileSystemConf))
 	req := &resourcesCenter.ResourcesAuthReq{}
 	req.EmployeeId = 6

service/balanceService.go

@@ -97,7 +97,7 @@ func (service *BalanceService) UpdateUserDetailed(in *resourcesCenter.Detailed)
 		ExportTime:   time.Now().Local(),
 		UserType:     in.UserType,
 	}
-	insertNumb, err := orm.Table(ConsumeRecord).Insert(&detailed)
+	insertNumb, err := orm.Table(ConsumeRecord). (&detailed)
 	if err != nil {
 		log.Panicln("新增流水失败：", err)
 		return entity.ErrorCode, "新增流水失败"