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 5f03acb..55395d3 100644 Binary files a/static/template/自营学校(商家分餐数据统计表).xlsx and b/static/template/自营学校(商家分餐数据统计表).xlsx differ