From 84c4376f08478dbcc8ff649e7103d679428f18cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 27 Mar 2023 09:31:27 +0800
Subject: [PATCH] 1

---
 platformapi/jdapi/store.go           |  2 --
 platformapi/jxprintapi/jxprintapi.go |  1 +
 platformapi/mtwmapi/act.go           |  2 +-
 platformapi/mtwmapi/act_test.go      | 13 +++++--------
 platformapi/mtwmapi/mtwmapi_test.go  |  4 ++--
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/platformapi/jdapi/store.go b/platformapi/jdapi/store.go
index bf9f6c65..cdd46407 100644
--- a/platformapi/jdapi/store.go
+++ b/platformapi/jdapi/store.go
@@ -4,7 +4,6 @@ package jdapi
 import (
 	"encoding/json"
 	"git.rosy.net.cn/baseapi/utils"
-	"git.rosy.net.cn/jx-callback/globals"
 )
 
 const (
@@ -338,7 +337,6 @@ func (a *API) GetStoreInfoByStationNo2(storeNo string) (storeDetail *StoreDetail
 // }
 
 func (a *API) UpdateStoreInfo4Open2(updateParams *OpStoreParams, modifyCloseStatus bool) (err error) {
-	globals.SugarLogger.Debugf("====UpdateStoreInfo4Open2 : %s", utils.Format4Output(updateParams, false))
 	updateParams.Operator = utils.GetAPIOperator(updateParams.Operator)
 	mapData := utils.Struct2MapByJson(updateParams)
 	if !modifyCloseStatus {
diff --git a/platformapi/jxprintapi/jxprintapi.go b/platformapi/jxprintapi/jxprintapi.go
index 960ec3c0..10c58fc5 100644
--- a/platformapi/jxprintapi/jxprintapi.go
+++ b/platformapi/jxprintapi/jxprintapi.go
@@ -172,6 +172,7 @@ func (a *API) GetPrinterStatus(printNo string) (status int64, err error) {
 }
 
 func (a *API) DoPrint(printNo, content string, orderNo int) (msgID string, err error) {
+	content = utils.FilterMb4(content)
 	result, err := a.AccessAPI("DoPrint", map[string]interface{}{
 		"print_no": printNo,
 		"content":  content,
diff --git a/platformapi/mtwmapi/act.go b/platformapi/mtwmapi/act.go
index e64ba6bb..885059dd 100644
--- a/platformapi/mtwmapi/act.go
+++ b/platformapi/mtwmapi/act.go
@@ -441,7 +441,7 @@ func (a *API) RetailDiscountDelete2(poiCode string, actType int, actIDList []str
 	return failedList, err
 }
 
-func (a *API) RetailDiscountDelete(poiCode string, actType int, actIDList []string) (err error) {
+func (a *API) RetailiscountDelete(poiCode string, actType int, actIDList []string) (err error) {
 	_, err = a.RetailDiscountDelete2(poiCode, actType, actIDList)
 	return err
 }
diff --git a/platformapi/mtwmapi/act_test.go b/platformapi/mtwmapi/act_test.go
index 97ff0209..96e8a45c 100644
--- a/platformapi/mtwmapi/act_test.go
+++ b/platformapi/mtwmapi/act_test.go
@@ -1,6 +1,7 @@
 package mtwmapi
 
 import (
+	"git.rosy.net.cn/jx-callback/globals"
 	"testing"
 	"time"
 
@@ -154,18 +155,14 @@ func TestRetailDiscountBatchSave(t *testing.T) {
 }
 
 func TestRetailDiscountList(t *testing.T) {
-	result, err := api.RetailDiscountList("8040309", RetailActTypeDirectDown)
+	result, err := api.RetailDiscountList("8694203", RetailActTypeSecKill)
 	if err != nil {
 		t.Fatal(err)
 	}
-	t.Log(utils.Format4Output(result, false))
-}
-
-func TestRetailDiscountDelete(t *testing.T) {
-	err := api.RetailDiscountDelete(testPoiCode, RetailActTypeDirectDown, []string{"329187452"})
-	if err != nil {
-		t.Fatal(err)
+	for _, v := range result {
+		globals.SugarLogger.Debugf("%s", utils.Format4Output(v, false))
 	}
+	//t.Log(utils.Format4Output(result, false))
 }
 
 func TestInStoreCouponList(t *testing.T) {
diff --git a/platformapi/mtwmapi/mtwmapi_test.go b/platformapi/mtwmapi/mtwmapi_test.go
index bf0ba738..75a6a131 100644
--- a/platformapi/mtwmapi/mtwmapi_test.go
+++ b/platformapi/mtwmapi/mtwmapi_test.go
@@ -20,10 +20,10 @@ func init() {
 	baseapi.Init(sugarLogger)
 
 	// 菜市
-	//api = New("589", "a81eb3df418d83d6a1a4b7c572156d2f", "", "")
+	api = New("589", "a81eb3df418d83d6a1a4b7c572156d2f", "", "")
 
 	// 果园
-	api = New("4123", "df2c88338b85f830cebce2a9eab56628", "", "")
+	//api = New("4123", "df2c88338b85f830cebce2a9eab56628", "", "")
 
 	//商超
 	//api = New("5873", "41c479790a76f86326f89e8048964739", "", "") //token_nH_IlcWQKAkZBqklwItNRw