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

修改

Browse Source
This commit is contained in:
suyl
2021-07-08 18:08:39 +08:00
parent c20d156e19
commit 295d790dab
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
business/jxstore/cms/print.go
View File

@@ -59,16 +59,24 @@ func DelPrinter(appID int, printNos []string) (err error) {
return err return err
} }
func UpdatePrinter(appID int, printNo, name string) (err error) { func UpdatePrinter(appID int, printNo, name, sim string) (err error) {
var ( var (
db = dao.GetDB() db = dao.GetDB()
fields []string
) )
//看有没有 //看有没有
if printers, _ := dao.GetPrinters(db, appID, printNo); len(printers) == 0 { if printers, _ := dao.GetPrinters(db, appID, printNo); len(printers) == 0 {
return fmt.Errorf("该应用下未找到该打印机！print_no : %v", printNo) return fmt.Errorf("该应用下未找到该打印机！print_no : %v", printNo)
} else { } else {
printers[0].Name = name if printers[0].Name != name {
if _, err = dao.UpdateEntity(db, printers[0], "Name"); err != nil { printers[0].Name = name
fields = append(fields, "name")
}
if printers[0].SIM != sim {
printers[0].SIM = sim
fields = append(fields, "sim")
}
if _, err = dao.UpdateEntity(db, printers[0], fields...); err != nil {
return err return err
} }
} }
@@ -99,7 +107,9 @@ func DoPrint(appID int, msgID, printNo, content string, orderNo int) (err error)
db = dao.GetDB() db = dao.GetDB()
) )
//打印机必须绑定在该应用下才能打印 //打印机必须绑定在该应用下才能打印
if printers, _ := dao.GetPrinters(db, appID, printNo); len(printers) == 0 {
return fmt.Errorf("未在该应用下获取到此打印机！print_no %v", printNo)
}
printMsg := &model.PrintMsg{ printMsg := &model.PrintMsg{
PrintNo: printNo, PrintNo: printNo,
Content: content, Content: content,

17
controllers/api_controller.go
View File

@@ -243,11 +243,11 @@ func (c *ApiController) DelPrinter(dataMap map[string]interface{}) (data, errCod
return "", errCode, err return "", errCode, err
} }
//修改打印机备注名 //修改打印机信息
func (c *ApiController) UpdatePrinter(dataMap map[string]interface{}) (data, errCode string, err error) { func (c *ApiController) UpdatePrinter(dataMap map[string]interface{}) (data, errCode string, err error) {
var ( var (
printNo, name string printNo, name, sim string
appID int appID int
) )
globals.SugarLogger.Debugf("Begin API UpdatePrinter data: [%v]", utils.Format4Output(dataMap, false)) globals.SugarLogger.Debugf("Begin API UpdatePrinter data: [%v]", utils.Format4Output(dataMap, false))
if _, ok := dataMap[keyPrintNo].(string); !ok { if _, ok := dataMap[keyPrintNo].(string); !ok {
@@ -257,15 +257,10 @@ func (c *ApiController) UpdatePrinter(dataMap map[string]interface{}) (data, err
return buildParamErrCodeAndErr(keyPrintNo) return buildParamErrCodeAndErr(keyPrintNo)
} }
} }
if _, ok := dataMap[keyName].(string); !ok { name = dataMap[keyName].(string)
return buildParamErrCodeAndErr(keyName) sim = dataMap["sim"].(string)
} else {
if name = dataMap[keyName].(string); name == "" {
return buildParamErrCodeAndErr(keyName)
}
}
appID = utils.Str2Int(dataMap[keyAppID].(string)) appID = utils.Str2Int(dataMap[keyAppID].(string))
if err = cms.UpdatePrinter(appID, printNo, name); err != nil { if err = cms.UpdatePrinter(appID, printNo, name, sim); err != nil {
return "", model.ErrCodeGeneralFailed, err return "", model.ErrCodeGeneralFailed, err
} }
return "", errCode, err return "", errCode, err