Merge remote-tracking branch 'origin/mark' into don

business/jxstore/cms/cms.go

@@ -266,7 +266,9 @@ func DeleteConfig(ctx *jxcontext.Context, key, configType string) (err error) {
 		if err = err2; err == nil && len(userIDs) > 0 {
 			userList, totalCount, err2 := dao.GetUsers(dao.GetDB(), 0, "", userIDs, "", "", 0, -1)
 			if err = err2; err == nil && totalCount > 0 {
-				err = fmt.Errorf("还有人员在使用角色:%s，人员信息:%s", key, utils.MustMarshal(utils.Struct2Map(userList, "compact")))
+				// todo
+				// err = fmt.Errorf("还有人员在使用角色:%s，人员信息:%s", key, utils.MustMarshal(utils.Struct2Map(userList, "compact")))
+				err = fmt.Errorf("还有人员在使用角色:%s，人员信息:%s", key, utils.Format4Output(userList, false))
 			}
 		}
 		errList.AddErr(err)

business/partner/printer/feie/feie_test.go

@@ -1 +1,43 @@
 package feie
+
+import (
+	"testing"
+
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+
+	"git.rosy.net.cn/baseapi/utils"
+
+	"git.rosy.net.cn/jx-callback/business/partner"
+
+	_ "git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
+	_ "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler/defsch"
+	"git.rosy.net.cn/jx-callback/globals/testinit"
+)
+
+func init() {
+	testinit.Init()
+}
+
+func TestGetCityShops(t *testing.T) {
+	orderID := "919864156000342"
+	vendorID := 0
+	order, err := partner.CurOrderManager.LoadOrder(orderID, vendorID)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	context := CurPrinterHandler.getOrderContent(order, "mobile")
+	status, err := CurPrinterHandler.PrintMsg(jxcontext.AdminCtx, "id1", "id2", "title", context)
+	t.Log(utils.Format4Output(status, false))
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestRegisterPrinter(t *testing.T) {
+	newID1, newID2, err := CurPrinterHandler.RegisterPrinter(jxcontext.AdminCtx, "id1", "id2", "title")
+	t.Log(newID1 + "," + newID2)
+	if err != nil {
+		t.Fatal(err)
+	}
+}

conf/app.conf

@@ -283,7 +283,7 @@ enableElmStoreWrite = false
 enableMtwmStoreWrite = false
 enableWscStoreWrite = false
 
-jdToken  = "ccb10daf-e6f5-4a58-ada5-b97f9073a137"
+jdToken  = "77e703b7-7997-441b-a12a-2e522efb117a"
 jdAppKey = "1dba76d40cac446ca500c0391a0b6c9d"
 jdSecret = "a88d031a1e7b462cb1579f12e97fe7f4"