From 2a1863c144fd4c106a67718d289ea7fab89a40f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 21 Apr 2020 14:08:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97=E5=A2=9E=E5=8A=A0=E5=8F=AF?=
 =?UTF-8?q?=E8=B0=83=E8=8A=82=E6=89=93=E5=8D=B0=E6=9C=BA=E5=A3=B0=E9=9F=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go                  |  8 +++++++-
 business/jxutils/jxutils.go                    | 18 ++++++++++++++++++
 business/partner/partner_printer.go            |  5 +++--
 business/partner/printer/feie/feie.go          |  7 +++++++
 .../partner/printer/yilianyun/yilianyun.go     |  7 +++++++
 5 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index a69bd8b2a..ec78f45ec 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -762,7 +762,7 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
 		delete(valid, "printerKey")
 	}
 	// 网络打印机处理
-	if valid["printerVendorID"] != nil || valid["printerSN"] != nil || valid["printerKey"] != nil {
+	if valid["printerVendorID"] != nil || valid["printerSN"] != nil || valid["printerKey"] != nil || valid["soundPercentage"] != nil {
 		if valid["printerVendorID"] == nil {
 			valid["printerVendorID"] = store.PrinterVendorID
 		}
@@ -788,6 +788,12 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
 			if newID2 != "" {
 				valid["printerKey"] = newID2
 			}
+			if valid["soundPercentage"] != nil {
+				err = handler.SetSound(ctx, store.PrinterSN, store.PrinterKey, jxutils.TranslateSoundSize(printerVendorID, valid["soundPercentage"].(int)))
+				if err != nil {
+					return 0, err
+				}
+			}
 		} else {
 			valid["printerVendorID"] = 0
 			valid["printerSN"] = ""
diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go
index 89c74be2c..149438c4c 100644
--- a/business/jxutils/jxutils.go
+++ b/business/jxutils/jxutils.go
@@ -823,3 +823,21 @@ func TranslateStorePriceType(storePriceType int8) int8 {
 	}
 	return storePriceType
 }
+
+func TranslateSoundSize(vendorID, soundPercentage int) (soundSize string) {
+	if vendorID == model.VendorIDYiLianYun || vendorID == model.VendorIDFeiE {
+		if soundPercentage == 0 {
+			soundSize = "0"
+		}
+		if soundPercentage > 0 && soundPercentage <= 33 {
+			soundSize = "1"
+		}
+		if soundPercentage > 33 && soundPercentage <= 66 {
+			soundSize = "2"
+		}
+		if soundPercentage > 66 && soundPercentage <= 100 {
+			soundSize = "3"
+		}
+	}
+	return soundSize
+}
diff --git a/business/partner/partner_printer.go b/business/partner/partner_printer.go
index 51a413c74..d72388153 100644
--- a/business/partner/partner_printer.go
+++ b/business/partner/partner_printer.go
@@ -20,8 +20,8 @@ const (
 )
 
 const (
-	PrinterFontSizeNormal 	= int8(0)//正常大小
-	PrinterFontSizeBig 		= int8(1)//两倍大小
+	PrinterFontSizeNormal = int8(0) //正常大小
+	PrinterFontSizeBig    = int8(1) //两倍大小
 )
 
 var (
@@ -62,6 +62,7 @@ type IPrinterHandler interface {
 
 	EmptyPrintList(ctx *jxcontext.Context, id1, id2 string) (err error)
 	PlayText(ctx *jxcontext.Context, id1, id2, orderID, text string) (printerStatus *PrinterStatus, err error)
+	SetSound(ctx *jxcontext.Context, id1, id2, sound string) (err error)
 }
 
 var (
diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go
index 09085495d..95df6cd28 100644
--- a/business/partner/printer/feie/feie.go
+++ b/business/partner/printer/feie/feie.go
@@ -269,3 +269,10 @@ func (c *PrinterHandler) EmptyPrintList(ctx *jxcontext.Context, id1, id2 string)
 func (c *PrinterHandler) PlayText(ctx *jxcontext.Context, id1, id2, orderID, text string) (printerStatus *partner.PrinterStatus, err error) {
 	return c.GetPrinterStatus(ctx, id1, id2)
 }
+
+func (c *PrinterHandler) SetSound(ctx *jxcontext.Context, id1, id2, sound string) (err error) {
+	if globals.EnableStoreWrite {
+		err = api.FeieAPI.SetSound(id1, sound)
+	}
+	return err
+}
diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go
index e22b212cc..f9036496f 100644
--- a/business/partner/printer/yilianyun/yilianyun.go
+++ b/business/partner/printer/yilianyun/yilianyun.go
@@ -281,3 +281,10 @@ func (c *PrinterHandler) PlayText(ctx *jxcontext.Context, id1, id2, orderID, tex
 	}
 	return nil, err
 }
+
+func (c *PrinterHandler) SetSound(ctx *jxcontext.Context, id1, id2, sound string) (err error) {
+	if globals.EnableStoreWrite {
+		err = api.YilianyunAPI.SetSound(id1, sound)
+	}
+	return err
+}