diff --git a/app/hdl/zhimeng_platform/hdl_hw_order_list.go b/app/hdl/zhimeng_platform/hdl_hw_order_list.go index 0f2f183..631cba3 100644 --- a/app/hdl/zhimeng_platform/hdl_hw_order_list.go +++ b/app/hdl/zhimeng_platform/hdl_hw_order_list.go @@ -14,7 +14,7 @@ func HwOrderList(c *gin.Context) { return } platformMap := map[string]string{ - "recharge": "视频会员直充", "starbucks": "星巴克", "movie": "电影", "mcdonald": "麦当劳", "nayuki": "奈雪", "luckin": "瑞幸咖啡", "pizza": "必胜客", + "hw_recharge": "视频会员直充", "starbucks": "星巴克", "movie": "电影", "mcdonald": "麦当劳", "nayuki": "奈雪", "luckin": "瑞幸咖啡", "pizza": "必胜客", "pagoda": "百果园", "burger_king": "汉堡王", "heytea": "喜茶", "to_kfc": "肯德基", "wallace": "华莱士", "flowerCake": "鲜花", "delivery": "比价寄", "tourism": "出游", } diff --git a/app/svc/platform/svc_hw_order_list.go b/app/svc/platform/svc_hw_order_list.go index 2605b04..ae09041 100644 --- a/app/svc/platform/svc_hw_order_list.go +++ b/app/svc/platform/svc_hw_order_list.go @@ -13,7 +13,7 @@ func HwOrderList(c *gin.Context, args map[string]string) ([]map[string]string, i list, total := db.GetHwOrderListTotal(args) var data = make([]map[string]string, 0) platformMap := map[string]string{ - "recharge": "视频会员直充", "starbucks": "星巴克", "movie": "电影", "mcdonald": "麦当劳", "nayuki": "奈雪", "luckin": "瑞幸咖啡", "pizza": "必胜客", + "hw_recharge": "视频会员直充", "starbucks": "星巴克", "movie": "电影", "mcdonald": "麦当劳", "nayuki": "奈雪", "luckin": "瑞幸咖啡", "pizza": "必胜客", "pagoda": "百果园", "burger_king": "汉堡王", "heytea": "喜茶", "to_kfc": "肯德基", "wallace": "华莱士", "flowerCake": "鲜花", "delivery": "比价寄", "tourism": "出游", } if len(list) > 0 { @@ -66,7 +66,7 @@ func HwOrderOutput(c *gin.Context, args map[string]string) (string, map[string]s "H1": "佣金", } platformMap := map[string]string{ - "recharge": "视频会员直充", "starbucks": "星巴克", "movie": "电影", "mcdonald": "麦当劳", "nayuki": "奈雪", "luckin": "瑞幸咖啡", "pizza": "必胜客", + "hw_recharge": "视频会员直充", "starbucks": "星巴克", "movie": "电影", "mcdonald": "麦当劳", "nayuki": "奈雪", "luckin": "瑞幸咖啡", "pizza": "必胜客", "pagoda": "百果园", "burger_king": "汉堡王", "heytea": "喜茶", "to_kfc": "肯德基", "wallace": "华莱士", "flowerCake": "鲜花", "delivery": "比价寄", "tourism": "出游", } diff --git a/app/task/svc/svc_hw_order_settle.go b/app/task/svc/svc_hw_order_settle.go index b2ce46a..801ff83 100644 --- a/app/task/svc/svc_hw_order_settle.go +++ b/app/task/svc/svc_hw_order_settle.go @@ -31,7 +31,7 @@ func HwOrderSettle() { } fmt.Println(utils.SerializeStr(order)) platformMap := map[string]string{ - "recharge": "视频会员直充", "starbucks": "星巴克", "movie": "电影", "mcdonald": "麦当劳", "nayuki": "奈雪", "luckin": "瑞幸咖啡", "pizza": "必胜客", + "hw_recharge": "视频会员直充", "starbucks": "星巴克", "movie": "电影", "mcdonald": "麦当劳", "nayuki": "奈雪", "luckin": "瑞幸咖啡", "pizza": "必胜客", "pagoda": "百果园", "burger_king": "汉堡王", "heytea": "喜茶", "to_kfc": "肯德基", "wallace": "华莱士", "flowerCake": "鲜花", "delivery": "比价寄", "tourism": "出游", } for _, v := range order { diff --git a/app/task/svc/svc_hw_recharge_order.go b/app/task/svc/svc_hw_recharge_order.go index 83688f4..aea73f8 100644 --- a/app/task/svc/svc_hw_recharge_order.go +++ b/app/task/svc/svc_hw_recharge_order.go @@ -20,7 +20,7 @@ func HwRechargeOrder() { var list = make([]map[string]interface{}, 0) json.Unmarshal([]byte(order), &list) for _, v := range list { - AddRechargeOrder("recharge", v) + AddRechargeOrder("hw_recharge", v) } } return diff --git a/go.mod b/go.mod index cdcdf90..dd41561 100644 --- a/go.mod +++ b/go.mod @@ -28,10 +28,46 @@ require ( github.com/syyongx/php2go v0.9.8 github.com/tidwall/gjson v1.14.1 go.uber.org/zap v1.16.0 - golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect - golang.org/x/net v0.14.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 gopkg.in/yaml.v2 v2.4.0 xorm.io/xorm v1.3.2 +) +require ( + filippo.io/edwards25519 v1.1.0 // indirect + github.com/bitly/go-simplejson v0.5.0 // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/goccy/go-json v0.10.2 // indirect + github.com/golang/snappy v0.0.4 // indirect + github.com/gookit/color v1.3.6 // indirect + github.com/gorilla/context v1.1.1 // indirect + github.com/gorilla/securecookie v1.1.1 // indirect + github.com/gorilla/sessions v1.2.1 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/leodido/go-urn v1.2.1 // indirect + github.com/mailru/easyjson v0.7.7 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect + github.com/nilorg/sdk v0.0.0-20221104025912-4b6ccb7004d8 // indirect + github.com/pelletier/go-toml/v2 v2.0.1 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/shopspring/decimal v1.3.1 // indirect + github.com/syndtr/goleveldb v1.0.0 // indirect + github.com/tidwall/match v1.1.1 // indirect + github.com/tidwall/pretty v1.2.0 // indirect + github.com/ugorji/go/codec v1.2.7 // indirect + go.uber.org/atomic v1.6.0 // indirect + go.uber.org/multierr v1.5.0 // indirect + golang.org/x/crypto v0.12.0 // indirect + golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect + golang.org/x/net v0.14.0 // indirect + golang.org/x/sync v0.1.0 // indirect + golang.org/x/sys v0.11.0 // indirect + golang.org/x/text v0.12.0 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + google.golang.org/protobuf v1.28.0 // indirect + xorm.io/builder v0.3.13 // indirect )