From 4f526b034a6e13a521ad71dcbdbea97043d6ea19 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期三, 20 三月 2024 19:21:20 +0800 Subject: [PATCH] 发货信息字段完善 --- api/v1/system_set.go | 56 +++++++++++++++++++++++--------------------------------- 1 files changed, 23 insertions(+), 33 deletions(-) diff --git a/api/v1/system_set.go b/api/v1/system_set.go index aca1708..53403e8 100644 --- a/api/v1/system_set.go +++ b/api/v1/system_set.go @@ -81,46 +81,36 @@ ctx.FailWithMsg(ecode.UnknownErr, "鍙傛暟閿欒") return } + m := make(map[string]string) + systemSet, err := service.GetSystemSet() + if err != nil { + ctx.FailWithMsg(ecode.UnknownErr, "鏌ヨ澶辫触") + return + } switch constvar.ModeType(modeType) { case constvar.BjdMode: - all, err := model.NewSystemSetSearch().SetModeType(modeType).FindAll() - if err == nil { - for _, set := range all { - //鎶ヤ环鍗曟槸鍚﹀繀椤诲叧鑱旈攢鍞満浼� - if set.Name == "鎶ヤ环鍗曟槸鍚﹀繀椤诲叧鑱旈攢鍞満浼�" { - if set.Value == "鏄�" { - c.Writer.Header().Set("Xsjh", "yes") - } else { - c.Writer.Header().Set("Xsjh", "no") - } - } - } + value := systemSet["鎶ヤ环鍗曟槸鍚﹀繀椤诲叧鑱旈攢鍞満浼�"].((map[string]interface{}))["value"] + if value == "鏄�" { + m["Xsjh"] = "yes" + } else { + m["Xsjh"] = "no" } case constvar.XsmxMode: - all, err := model.NewSystemSetSearch().SetModeType(modeType).FindAll() - if err == nil { - for _, set := range all { - //閿�鍞槑缁嗗崟鏄惁蹇呴』鍏宠仈鎶ヤ环鍗� - if set.Name == "閿�鍞槑缁嗗崟鏄惁蹇呴』鍏宠仈鎶ヤ环鍗�" { - if set.Value == "鏄�" { - c.Writer.Header().Set("Bjd", "yes") - } else { - c.Writer.Header().Set("Bjd", "no") - } - } - //閿�鍞槑缁嗗崟鏄惁蹇呴』鍏宠仈涓氬姟鏈轰細 - if set.Name == "閿�鍞槑缁嗗崟鏄惁蹇呴』鍏宠仈涓氬姟鏈轰細" { - if set.Value == "鏄�" { - c.Writer.Header().Set("Ywjh", "yes") - } else { - c.Writer.Header().Set("Ywjh", "no") - } - } - } + value := systemSet["閿�鍞槑缁嗗崟鏄惁蹇呴』鍏宠仈鎶ヤ环鍗�"].((map[string]interface{}))["value"] + if value == "鏄�" { + m["Bjd"] = "yes" + } else { + m["Bjd"] = "no" + } + value = systemSet["閿�鍞槑缁嗗崟鏄惁蹇呴』鍏宠仈涓氬姟鏈轰細"].((map[string]interface{}))["value"] + if value == "鏄�" { + m["Ywjh"] = "yes" + } else { + m["Ywjh"] = "no" } default: ctx.FailWithMsg(ecode.UnknownErr, "鍙傛暟閿欒") return } - ctx.Ok() + ctx.OkWithDetailed(m) } -- Gitblit v1.8.0