update

app/admin/hdl/hdl_data_statistics.go

@@ -117,6 +117,8 @@ func CentralKitchenForSchoolDataStatisticsExport(c *gin.Context) {
 		req.EnterpriseName = enterprise.Name
 	}
 
+	go svc.CentralKitchenForSchoolDataStatisticsExport(req)
+
 	e.OutSuc(c, map[string]interface{}{
 		"msg": "导出成功，请稍后刷新数据列表",
 	}, nil)

app/db/db_central_kitchen_for_school_user_with_day.go

@@ -46,6 +46,12 @@ func (centralKitchenForSchoolUserWithDayDb *CentralKitchenForSchoolUserWithDayDb
 	return &m, nil
 }
 
+func (centralKitchenForSchoolUserWithDayDb *CentralKitchenForSchoolUserWithDayDb) CountCentralKitchenForSchoolUserWithDayByOrdNo(ordNo string, state int) (count int64, err error) {
+	var m model.CentralKitchenForSchoolUserWithDay
+	count, err = centralKitchenForSchoolUserWithDayDb.Db.Where("ord_no =?", ordNo).And("state !=?", state).Count(&m)
+	return count, nil
+}
+
 func (centralKitchenForSchoolUserWithDayDb *CentralKitchenForSchoolUserWithDayDb) FindCentralKitchenForSchoolUserWithDayByOrdNoAndState(ordNo string, state int) (*[]model.CentralKitchenForSchoolUserWithDay, error) {
 	var m []model.CentralKitchenForSchoolUserWithDay
 	if err := centralKitchenForSchoolUserWithDayDb.Db.Where("ord_no =?", ordNo).And("state =?", state).Desc("id").Find(&m); err != nil {

app/db/db_enterprise.go

@@ -49,6 +49,14 @@ func (enterpriseDb *EnterpriseDb) FindEnterprise(limit, start int) (*[]model.Ent
 	return &m, nil
 }
 
+func (enterpriseDb *EnterpriseDb) FindEnterpriseByKind(kind int) (*[]model.Enterprise, error) {
+	var m []model.Enterprise
+	if err := enterpriseDb.Db.Where("kind =?", kind).Desc("id").Find(&m); err != nil {
+		return nil, logx.Error(err)
+	}
+	return &m, nil
+}
+
 func (enterpriseDb *EnterpriseDb) GetEnterpriseByName(name string) (m *model.Enterprise, err error) {
 	m = new(model.Enterprise)
 	has, err := enterpriseDb.Db.Where("name =?", name).Get(m)

app/db/model/self_support_for_school_ord.go

@@ -24,7 +24,7 @@ type SelfSupportForSchoolOrd struct {
 	CpMerchantId          string    `json:"cp_merchant_id" xorm:"not null default '' comment('商户编码') CHAR(100)"`
 	TradeAmount           string    `json:"trade_amount" xorm:"not null default 0.00 comment('交易总金额') DECIMAL(8,2)"`
 	FaceTime              string    `json:"face_time" xorm:"not null default '' comment('刷脸时间') CHAR(100)"`
-	OrderStatus           int       `json:"order_status" xorm:"not null default 0 comment('支付状态 (0:待支付 1:支付成功)') TINYINT(1)"`
+	OrderStatus           int       `json:"order_status" xorm:"not null default 0 comment('支付状态 (1:待支付 2:支付成功)') TINYINT(1)"`
 	DebtBusinessCode      string    `json:"debt_business_code" xorm:"not null default '' comment('欠费订单异常渠道异常码(欠费返回)') CHAR(100)"`
 	DebtBusinessMsg       string    `json:"debt_business_msg" xorm:"not null default '' comment('欠费订单欠费原因(欠费返回)') VARCHAR(255)"`
 	CreateAt              time.Time `json:"create_at" xorm:"not null pk default 'CURRENT_TIMESTAMP' DATETIME"`