1

services/print_server/app_server/print_edition.go

@@ -0,0 +1,27 @@
+package app_server
+
+import (
+	editionDao "git.rosy.net.cn/jx-print/dao"
+	editionModel "git.rosy.net.cn/jx-print/model/app_model"
+)
+
+type PrintEdition struct {
+}
+
+var PrintEditionServer = new(PrintEdition)
+
+func (p PrintEdition) AddEdition(param *editionModel.AddOrUpdatePrintEdition) error {
+	return editionDao.PrintEditionDao.AddEdition(param)
+}
+
+func (p PrintEdition) UpdateEdition(param *editionModel.AddOrUpdatePrintEdition) error {
+	return editionDao.PrintEditionDao.UpdateEdition(param)
+}
+
+func (p PrintEdition) DeleteEdition(param *editionModel.DeletePrintEdition) error {
+	return editionDao.PrintEditionDao.DeletePrintEdition(param.Id)
+}
+
+func (p PrintEdition) QueryEdition() ([]*editionModel.PrintEdition, error) {
+	return editionDao.PrintEditionDao.SelectEdition()
+}

services/print_server/app_server/print_notice.go

@@ -0,0 +1,27 @@
+package app_server
+
+import (
+	editionDao "git.rosy.net.cn/jx-print/dao"
+	editionModel "git.rosy.net.cn/jx-print/model/app_model"
+)
+
+type PrintNotice struct {
+}
+
+var PrintNoticeServer = new(PrintNotice)
+
+func (p PrintNotice) AddPrintNotice(param *editionModel.AddOrUpdatePrintNotice) error {
+	return editionDao.PrintNoticeDao.AddNotice(param)
+}
+
+func (p PrintNotice) UpdatePrintNotice(param *editionModel.AddOrUpdatePrintNotice) error {
+	return editionDao.PrintNoticeDao.UpdateNotice(param)
+}
+
+func (p PrintNotice) DeletePrintNotice(param *editionModel.DeletePrintNotice) error {
+	return editionDao.PrintNoticeDao.DeletePrintNotice(param.Id)
+}
+
+func (p PrintNotice) QueryPrintNotice(param *editionModel.QueryPrintNotice) ([]*editionModel.PrintNotice, error) {
+	return editionDao.PrintNoticeDao.SelectPrintNotice(param)
+}

services/print_server/app_server/print_setting.go

@@ -42,12 +42,13 @@ func (p *PrintSettingServer) SystemInitPrintSetting(txDB *sqlx.Tx, printNo strin
 	day := time.Now()
 
 	param, err := MarshalJson2String(&settingModel.PrintSetting{
-		CreatedAt:       day,
-		UpdatedAt:       day,
-		DeletedAt:       utils.DefaultTimeValue,
-		PrintNo:         printNo,
-		CallNameSetting: 64,
-		SystemVoice:     1,
+		CreatedAt:        day,
+		UpdatedAt:        day,
+		DeletedAt:        utils.DefaultTimeValue,
+		PrintNo:          printNo,
+		CallNameSetting:  64, // 老板
+		BusinessPrintNum: 1,  // 打印一份
+		CustomerPrintNum: 1,  // 打印一份
 	})
 	if err != nil {
 		return err
@@ -75,130 +76,78 @@ func (p *PrintSettingServer) QueryPrintSetting(printNo string) (*settingModel.Pr
 
 // MarshalJson2String 工具类
 func MarshalJson2String(param *settingModel.PrintSetting) (*settingModel.PrintSetting, error) {
-	// 打印机提示语音设置
-	printVoiceSetting := &settingModel.PrintVoice{
-		TimeVoice:          settingModel.SettingClose,
-		PaperShortageVoice: settingModel.SettingOpen,
-		DisconnectVoice:    settingModel.SettingOpen,
-		LoseAuthorization:  settingModel.SettingOpen,
+	// 语音设置
+	voiceSetting := &settingModel.VoiceSettingDetail{
+		WaitOrderVoice:            settingModel.SettingOpen,
+		RiderTakeOrderVoice:       settingModel.SettingOpen,
+		ApplyUserOrderCancelVoice: settingModel.SettingOpen,
+		ApplyRefundOrderVoice:     settingModel.SettingOpen,
+		ApplyRefundGoodsVoice:     settingModel.SettingOpen,
+		RefundGoodsVoice:          settingModel.SettingOpen,
+		ConfirmGoodsVoice:         settingModel.SettingOpen,
+		SuccessGoodsVoice:         settingModel.SettingOpen,
+		ConsultingPrint:           settingModel.SettingOpen,
+		ReminderVoice:             settingModel.SettingOpen,
+		CustomerRejectionVoice:    settingModel.SettingOpen,
+		CusterRefundVoice:         settingModel.SettingOpen,
+		LoseAuthorization:         settingModel.SettingOpen,
 	}
-	printVoiceSettingByte, err := json.Marshal(printVoiceSetting)
+	customerVoiceSettingByte, err := json.Marshal(voiceSetting)
 	if err != nil {
 		return nil, err
 	}
-	param.PrintVoiceSetting = string(printVoiceSettingByte)
+	param.VoiceSetting = string(customerVoiceSettingByte)
 
-	// 订单提示设置
-	orderVoiceSetting := &settingModel.OrderVoice{
-		PrintOrder:               settingModel.SettingOpen,
-		OrderNotice:              settingModel.SettingOpen,
-		UserOrderCancel:          settingModel.SettingClose,
-		UserOrderCancelVoice:     settingModel.SettingOpen,
-		RefundOrder:              settingModel.SettingOpen,
-		RefundOrderVoice:         settingModel.SettingOpen,
-		BusinessOrderCancel:      settingModel.SettingClose,
-		BusinessOrderCancelVoice: settingModel.SettingOpen,
+	// 打印设置
+	printSetting := &settingModel.PrintSettingDetail{
+		UserOrderCancel:      settingModel.SettingOpen,
+		RefundOrder:          settingModel.SettingOpen,
+		BusinessOrderCancel:  settingModel.SettingOpen,
+		RiderTakeOrder:       settingModel.SettingOpen,
+		CusterRefundPrint:    settingModel.SettingOpen,
+		WaitOrderPrint:       settingModel.SettingOpen,
+		ApplyUserCancelOrder: settingModel.SettingOpen,
+		ApplyUserRefund:      settingModel.SettingOpen,
+		OrderCancelSuccess:   settingModel.SettingOpen,
 	}
-	orderVoiceSettingByte, err := json.Marshal(orderVoiceSetting)
+	pickingSettingByte, err := json.Marshal(printSetting)
 	if err != nil {
 		return nil, err
 	}
-	param.OrderVoiceSetting = string(orderVoiceSettingByte)
-
-	// 送达设置
-	riderVoiceSetting := &settingModel.RiderVoice{
-		RiderTakeOrder:      settingModel.SettingOpen,
-		RiderTakeOrderVoice: settingModel.SettingOpen,
-		RiderServiceVoice:   settingModel.SettingOpen,
-		RiderReminderVoice:  settingModel.SettingOpen,
-	}
-	riderVoiceSettingByte, err := json.Marshal(riderVoiceSetting)
-	if err != nil {
-		return nil, err
-	}
-	param.RiderVoiceSetting = string(riderVoiceSettingByte)
-
-	// 客户收货语音设置
-	customerVoiceSetting := &settingModel.CustomerReceivingGoods{
-		CustomerRejectionPrint: settingModel.SettingClose,
-		CustomerRejectionVoice: settingModel.SettingOpen,
-		CustcareRefundPrint:    settingModel.SettingClose,
-		CustcareRefundVoice:    settingModel.SettingOpen,
-		ConsultingPrint:        settingModel.SettingClose,
-		ConsultingVoice:        settingModel.SettingClose,
-	}
-	customerVoiceSettingByte, err := json.Marshal(customerVoiceSetting)
-	if err != nil {
-		return nil, err
-	}
-	param.CustomerVoiceSetting = string(customerVoiceSettingByte)
-
-	// 拣货设置
-	pickingSetting := &settingModel.ShopPickingVoice{
-		BusinessOffLine:      settingModel.SettingClose,
-		BusinessOffLineVoice: settingModel.SettingOpen,
-		WaitOrderPrint:       settingModel.SettingClose,
-		WaitOrderVoice:       settingModel.SettingOpen,
-		WaitPickingPrint:     settingModel.SettingClose,
-		WaitPickingVoice:     settingModel.SettingOpen,
-	}
-	pickingSettingByte, err := json.Marshal(pickingSetting)
-	if err != nil {
-		return nil, err
-	}
-	param.PickingSetting = string(pickingSettingByte)
+	param.PrintSetting = string(pickingSettingByte)
 	return param, nil
 }
 
 // UnMarshalString2Json 将字符串设置转换为对象设置
 func UnMarshalString2Json(param *settingModel.PrintSetting) (*settingModel.PrintSettingObj, error) {
 	var (
-		printVoiceSetting    = &settingModel.PrintVoice{}
-		orderVoiceSetting    = &settingModel.OrderVoice{}
-		riderVoiceSetting    = &settingModel.RiderVoice{}
-		customerVoiceSetting = &settingModel.CustomerReceivingGoods{}
-		pickingSetting       = &settingModel.ShopPickingVoice{}
+		printSetting = &settingModel.PrintSettingDetail{}
+		voiceSetting = &settingModel.VoiceSettingDetail{}
 	)
 
 	result := &settingModel.PrintSettingObj{
-		ID:                   param.ID,
-		CreatedAt:            param.CreatedAt,
-		UpdatedAt:            param.UpdatedAt,
-		DeletedAt:            param.DeletedAt,
-		PrintNo:              param.PrintNo,
-		CallNameSetting:      param.CallNameSetting,
-		SystemVoice:          param.SystemVoice,
-		PrintVoiceSetting:    nil,
-		OrderVoiceSetting:    nil,
-		RiderVoiceSetting:    nil,
-		CustomerVoiceSetting: nil,
-		PickingSetting:       nil,
+		ID:                    param.ID,
+		CreatedAt:             param.CreatedAt,
+		UpdatedAt:             param.UpdatedAt,
+		DeletedAt:             param.DeletedAt,
+		PrintNo:               param.PrintNo,
+		CallNameSetting:       param.CallNameSetting,
+		BusinessOffLineVoice:  param.BusinessOffLineVoice,
+		BalanceNotEnoughVoice: param.BalanceNotEnoughVoice,
+		EveryDayGreetVoice:    param.EveryDayGreetVoice,
+		BusinessPrintNum:      param.BusinessPrintNum,
+		CustomerPrintNum:      param.CustomerPrintNum,
 	}
 
-	if err := json.Unmarshal([]byte(param.PrintVoiceSetting), printVoiceSetting); err != nil {
+	if err := json.Unmarshal([]byte(param.VoiceSetting), voiceSetting); err != nil {
 		return nil, err
 	}
-	result.PrintVoiceSetting = printVoiceSetting
+	result.VoiceSetting = voiceSetting
 
-	if err := json.Unmarshal([]byte(param.OrderVoiceSetting), orderVoiceSetting); err != nil {
+	if err := json.Unmarshal([]byte(param.PrintSetting), printSetting); err != nil {
 		return nil, err
 	}
-	result.OrderVoiceSetting = orderVoiceSetting
-
-	if err := json.Unmarshal([]byte(param.RiderVoiceSetting), riderVoiceSetting); err != nil {
-		return nil, err
-	}
-	result.RiderVoiceSetting = riderVoiceSetting
-
-	if err := json.Unmarshal([]byte(param.CustomerVoiceSetting), customerVoiceSetting); err != nil {
-		return nil, err
-	}
-	result.CustomerVoiceSetting = customerVoiceSetting
-
-	if err := json.Unmarshal([]byte(param.PickingSetting), pickingSetting); err != nil {
-		return nil, err
-	}
-	result.PickingSetting = pickingSetting
+	result.PrintSetting = printSetting
 
 	return result, nil
 }

services/print_server/print.go

@@ -247,3 +247,8 @@ func GetPrinterReport(c *gin.Context, tokenInfo *model.TokenInfo) (getPrinterRep
 func DeletePrintMsg(printNos string) error {
 	return dao.DeletePrinterMsg(printNos)
 }
+
+// ClearMsg 清除缓存消息
+func ClearMsg(printNo string) error {
+	return dao.ClearPrintMsg(printNo)
+}