liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-07-08 17:15:01 +08:00
parent 8a0d844adb
commit a7315eeb12
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/jxutils/jxutils.go
View File

@@ -667,3 +667,11 @@ func GetWeekTime() (weekTimeBegin, weekTimeEnd time.Time) {
weekTimeEnd = weekTimeBegin.AddDate(0, 0, 7) weekTimeEnd = weekTimeBegin.AddDate(0, 0, 7)
return weekTimeBegin, weekTimeEnd return weekTimeBegin, weekTimeEnd
} }
func BuildErr(errs []error) (err error) {
var errStr = strings.Builder{}
for _, v := range errs {
errStr.WriteString(v.Error())
}
return fmt.Errorf(errStr.String())
}

6
controllers/api_controller.go
View File

@@ -187,7 +187,6 @@ end:
func (c *ApiController) AddPrinter(dataMap map[string]interface{}) (data, errCode string, err error) { func (c *ApiController) AddPrinter(dataMap map[string]interface{}) (data, errCode string, err error) {
var ( var (
printers []*model.Printer printers []*model.Printer
//printNo, printKey, name string
printersStr string printersStr string
//appID int //appID int
) )
@@ -202,6 +201,11 @@ func (c *ApiController) AddPrinter(dataMap map[string]interface{}) (data, errCod
if err = utils.UnmarshalUseNumber([]byte(printersStr), &printers); err != nil { if err = utils.UnmarshalUseNumber([]byte(printersStr), &printers); err != nil {
return buildParamErrCodeAndErr("prints") return buildParamErrCodeAndErr("prints")
} }
//for _, v := range printers {
// if v.PrintNo {
//
// }
//}
//appID = utils.Str2Int(dataMap[keyAppID].(string)) //appID = utils.Str2Int(dataMap[keyAppID].(string))
//if err = cms.AddPrinter(appID, printers); err != nil { //if err = cms.AddPrinter(appID, printers); err != nil {
// return "", model.ErrCodeGeneralFailed, err // return "", model.ErrCodeGeneralFailed, err