WH01243 4 жил өмнө
parent
commit
5cb353f1be

+ 0 - 1
entity/accountResources.go

@@ -11,5 +11,4 @@ type Balance struct {
 	Spec         string `xorm:"spec" form:"spec" json:"spec"`                         //规格
 	Spec         string `xorm:"spec" form:"spec" json:"spec"`                         //规格
 	AppId        string `xorm:"appId" form:"appId" json:"appId"`                      //标识
 	AppId        string `xorm:"appId" form:"appId" json:"appId"`                      //标识
 	EndTime      string `xorm:"endTime" form:"endTime" json:"endTime"`                //截止时间
 	EndTime      string `xorm:"endTime" form:"endTime" json:"endTime"`                //截止时间
-	Remarks      string `xorm:"remarks" form:"remarks" json:"remarks"`                //备注
 }
 }

+ 1 - 0
rpc/internal/logic/purchaseuserbalancelogic.go

@@ -49,6 +49,7 @@ func (l *PurchaseUserBalanceLogic) PurchaseUserBalance(in *resourcesCenter.Resou
 		DepartmentId:  in.DepartmentId,
 		DepartmentId:  in.DepartmentId,
 		Name:          in.Name,
 		Name:          in.Name,
 		UserType:      in.Model,
 		UserType:      in.Model,
+		Remarks: in.Remarks,
 	}
 	}
 	code, msg := balanceService.PurchaseUserBalance(balance,detailed)
 	code, msg := balanceService.PurchaseUserBalance(balance,detailed)
 	return &resourcesCenter.Response{
 	return &resourcesCenter.Response{

+ 2 - 2
service/balanceService.go

@@ -43,6 +43,7 @@ func (service *BalanceService) PurchaseUserBalance(balanceData *resourcesCenter.
 		RuleId:       detailedData.RuleId,
 		RuleId:       detailedData.RuleId,
 		Name:         detailedData.Name,
 		Name:         detailedData.Name,
 		ExportTime:   time.Now().Local(),
 		ExportTime:   time.Now().Local(),
+		Remarks:      detailedData.Remarks,
 		UserType:     1,
 		UserType:     1,
 	}
 	}
 	insertNumb, err := orm.Table(ConsumeRecord).Insert(&detailed)
 	insertNumb, err := orm.Table(ConsumeRecord).Insert(&detailed)
@@ -67,7 +68,6 @@ func (service *BalanceService) PurchaseUserBalance(balanceData *resourcesCenter.
 			Spec:         balanceData.Spec,
 			Spec:         balanceData.Spec,
 			AppId:        balanceData.AppId,
 			AppId:        balanceData.AppId,
 			EndTime:      balanceData.EndTime,
 			EndTime:      balanceData.EndTime,
-			Remarks:      balanceData.Remarks,
 		}
 		}
 		insertNumb, err = orm.Table(AccountResources).Insert(&balance)
 		insertNumb, err = orm.Table(AccountResources).Insert(&balance)
 		if err != nil {
 		if err != nil {
@@ -242,7 +242,7 @@ func (service *BalanceService) FindPreview(in *resourcesCenter.PreviewReq, url s
 	data := resp["data"].(map[string]interface{})
 	data := resp["data"].(map[string]interface{})
 	repeatNumb := data["existCount"].(float64)
 	repeatNumb := data["existCount"].(float64)
 	deductionNumb := data["newCount"].(float64)
 	deductionNumb := data["newCount"].(float64)
-	log.Println(repeatNumb,deductionNumb)
+	log.Println(repeatNumb, deductionNumb)
 	return entity.SuccessCode, "去重", int64(repeatNumb), int64(deductionNumb)
 	return entity.SuccessCode, "去重", int64(repeatNumb), int64(deductionNumb)
 }
 }