From 9ff39ca1a49ea47a9b7441886b2c91704535f470 Mon Sep 17 00:00:00 2001 From: DengBiao <2319963317@qq.com> Date: Sat, 2 Mar 2024 19:46:10 +0800 Subject: [PATCH] update --- app/admin/svc/svc_data_statisstics.go | 3 ++- app/customer/hdl/hdl_demo.go | 9 +++++++++ ...学校(商家分餐数据统计表).xlsx | Bin 9182 -> 9308 bytes 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/admin/svc/svc_data_statisstics.go b/app/admin/svc/svc_data_statisstics.go index 57d8dbc..759f2f7 100644 --- a/app/admin/svc/svc_data_statisstics.go +++ b/app/admin/svc/svc_data_statisstics.go @@ -316,7 +316,7 @@ func SelfSupportForSchoolDataStatisticsExport(req md.SelfSupportForSchoolDataSta //查询出所有的设备 var deviceList []*model.Device - err := db.Db.Where("enterprise_id != 0").Find(&deviceList) + err := db.Db.Where("enterprise_id != 0").Asc("id").Find(&deviceList) if err != nil { logx.Error(err) println("<<<>>>>1111Error:::", err.Error()) @@ -381,6 +381,7 @@ func SelfSupportForSchoolDataStatisticsExport(req md.SelfSupportForSchoolDataSta xlsx.SetSheetRow("", "A1", &titleList) sheetIndex := 2 //第一个表是模板表 for k, v := range data { + xlsx.SetSheetRow(k, "A1"+strconv.Itoa(1), &[]interface{}{"商 家 分 餐 数 据 统 计 表 " + "(" + req.StartDate + "至" + req.EndDate + ")"}) if k == "" { k = "未知" } diff --git a/app/customer/hdl/hdl_demo.go b/app/customer/hdl/hdl_demo.go index b21df11..1d901b1 100644 --- a/app/customer/hdl/hdl_demo.go +++ b/app/customer/hdl/hdl_demo.go @@ -149,6 +149,15 @@ func WxPay(c *gin.Context) { } func Demo(c *gin.Context) { + + _, err := svc.DealCentralKitchenForSchoolOrderCallBackForWx("141271708763327845", "4200002114202402240122111525", "SUCCESS") + if err != nil { + e.OutErr(c, e.ERR, err.Error()) + return + } + e.OutSuc(c, "success", nil) + return + sysCfgDb := db.SysCfgDb{} sysCfgDb.Set() sysCfg := sysCfgDb.SysCfgFindWithDb(enum.OpenAppletAppid, enum.OpenAppletAppPrivateKey, enum.OpenAppletPublicKey) diff --git a/static/template/自营学校(商家分餐数据统计表).xlsx b/static/template/自营学校(商家分餐数据统计表).xlsx index 5f03acb2cd9ef766ded8a702e05a519b27b79c72..55395d35ddddbc9e2271dc5ff2650adad2759805 100644 GIT binary patch delta 5303 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 WJwyNi$FD&nF4%-z$kS?DMOBMSMz?f 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 R|Ib~5jeKj`5$W_mgWEe