fix(已出账单): 生成逻辑按照上机时间的结束时间汇总

service/settle_account_bill/settle_account_bill.go

@@ -202,8 +202,8 @@ func (s Service) GenerateBill() error {
 	}
 	endDate := now.AddDate(0, 0, -1).Format("Y-m-d 23:59:59")
 	startDate := now.AddDate(0, -1, 0).Format("Y-m-d 00:00:00")
-
-	all, err = s.Dao.DB.Model("settle_account_main").Where(fmt.Sprintf("CreateOn>='%v' AND CreateOn<='%v' AND Status='0'", startDate, endDate)).FindAll()
+	// appointment.Status：1 待审核；2	已通过；3	已拒绝；4	已取消；5	已过期；6	超时取消
+	all, err = s.Dao.DB.Model("settle_account_main").InnerJoin("appointment", "appointment.Id=settle_account_main.AppointId").Fields("settle_account_main.*").Where(fmt.Sprintf("settle_account_main.Status='0' AND ((appointment.Status=2 AND appointment.SignOutTime>='%v' AND appointment.SignOutTime<='%v') OR (appointment.Status=4 OR appointment.Status=6))", startDate, endDate)).FindAll()
 	if err != nil {
 		return err
 	}