style()：格式化代码

common/test.go

@@ -16,7 +16,6 @@ import (
 	"github.com/gogf/gf/encoding/gjson"
 )
 
-
 func TestRpcxHandler(tenant, token, url, path, method string, data string) ([]byte, error) {
 	req, err := http.NewRequest("POST", url, bytes.NewBuffer([]byte(data)))
 	if err != nil {

dao/account/internal/base_account.go

@@ -25,23 +25,23 @@ type BaseAccountDao struct {
 
 // BaseAccountColumns defines and stores column names for table base_account.
 type baseAccountColumns struct {
-	Id            string // 主键
-	Account       string // 账户
-	AccountName   string // 账户名称
-	Surplus       string // 账户余额
-	Available     string // 可用余额
-	Limit         string // 使用限额
-	Advance       string // 优先级
-	DeletedAt     string //
-	MainUserId    string // 主用户Id
-	MainUser      string // 主用户
-	Remark        string // 备注
-	CreateUserId  string //
-	CreateBy      string //
-	CreateOn      string //
-	UpdateUserId  string // 更新者ID
-	UpdateBy      string // 更新者
-	UpdateOn      string // 更新时间
+	Id           string // 主键
+	Account      string // 账户
+	AccountName  string // 账户名称
+	Surplus      string // 账户余额
+	Available    string // 可用余额
+	Limit        string // 使用限额
+	Advance      string // 优先级
+	DeletedAt    string //
+	MainUserId   string // 主用户Id
+	MainUser     string // 主用户
+	Remark       string // 备注
+	CreateUserId string //
+	CreateBy     string //
+	CreateOn     string //
+	UpdateUserId string // 更新者ID
+	UpdateBy     string // 更新者
+	UpdateOn     string // 更新时间
 }
 
 var (

dao/account/internal/settle_account_bill.go

@@ -26,36 +26,36 @@ type SettleAccountBillDao struct {
 
 // SettleAccountBillColumns defines and stores column names for table settle_account_bill.
 type settleAccountBillColumns struct {
-	Id                      string // 主键
-	Code                    string // 账单号
-	TotalCount              string // 计费总额（弃用，改为实时查询）
-	SettleTime              string // 结算时间
-	StartDate               string // 账单开始时间
-	EndDate                 string // 账单结束时间
-	Status                  string // 账单状态 0未确认 1已确认 2已结算 3已扣款
-	ActualVerificationDate  string // 实际核销时间
-	ActualVerificationUser  string // 实际核销人
-	VerificationUserId      string // 核销人Id
-	VerificationUser        string // 核销人
-	VerificationDate        string // 完成核销时间
-	CreateUserId            string //
-	CreateBy                string //
-	CreateOn                string //
-	DeletedAt               string // 删除时间
-	MainUserId              string // 主用户Id
-	MainUser                string // 主用户
-	AccountId               string // 经费账号Id
-	PaymentDueDate          string // 付款截止日期
-	SettleUserId            string // 结算人Id
-	SettleUser              string // 结算人
-	SettleDate              string // 结算时间
-	DeductMoneyUserId       string // 扣款人Id
-	DeductMoneyUser         string // 扣款人
-	DeductMoneyDate         string // 扣款时间
-	Remark                  string // 备注
-	UpdateUserId            string // 更新者ID
-	UpdateBy                string // 更新者
-	UpdateOn                string // 更新时间
+	Id                     string // 主键
+	Code                   string // 账单号
+	TotalCount             string // 计费总额（弃用，改为实时查询）
+	SettleTime             string // 结算时间
+	StartDate              string // 账单开始时间
+	EndDate                string // 账单结束时间
+	Status                 string // 账单状态 0未确认 1已确认 2已结算 3已扣款
+	ActualVerificationDate string // 实际核销时间
+	ActualVerificationUser string // 实际核销人
+	VerificationUserId     string // 核销人Id
+	VerificationUser       string // 核销人
+	VerificationDate       string // 完成核销时间
+	CreateUserId           string //
+	CreateBy               string //
+	CreateOn               string //
+	DeletedAt              string // 删除时间
+	MainUserId             string // 主用户Id
+	MainUser               string // 主用户
+	AccountId              string // 经费账号Id
+	PaymentDueDate         string // 付款截止日期
+	SettleUserId           string // 结算人Id
+	SettleUser             string // 结算人
+	SettleDate             string // 结算时间
+	DeductMoneyUserId      string // 扣款人Id
+	DeductMoneyUser        string // 扣款人
+	DeductMoneyDate        string // 扣款时间
+	Remark                 string // 备注
+	UpdateUserId           string // 更新者ID
+	UpdateBy               string // 更新者
+	UpdateOn               string // 更新时间
 }
 
 var (

dao/account/internal/settle_account_detail.go

@@ -26,30 +26,30 @@ type SettleAccountDetailDao struct {
 
 // SettleAccountDetailColumns defines and stores column names for table settle_account_detail.
 type settleAccountDetailColumns struct {
-	Id              string // 主键
-	Pid             string // 结算明细主表Id
-	UnitPrice       string // 计费单价
-	ActualMinutes   string // 实际机时(分钟)
-	Minutes         string // 计费时长(分钟)
-	PaymentType     string // 计费类型：0计时收费；1违约收费；2辅助收费
-	PaymentAccount  string // 费用
-	CreateUserId    string //
-	CreateBy        string //
-	CreateOn        string //
-	BillId          string // 账单Id
-	MainUserId      string // 主用户Id
-	MainUser        string // 主用户
-	AttachUserId    string // 从用户Id
-	AttachUser      string // 从用户
-	Data1           string // 备用字段1
-	Data2           string // 备用字段2
-	Data3           string // 备用字段3
-	Data4           string // 备用字段4
-	Data5           string // 备用字段5
-	Remark          string // 备注
-	UpdateUserId    string // 更新者ID
-	UpdateBy        string // 更新者
-	UpdateOn        string // 更新时间
+	Id             string // 主键
+	Pid            string // 结算明细主表Id
+	UnitPrice      string // 计费单价
+	ActualMinutes  string // 实际机时(分钟)
+	Minutes        string // 计费时长(分钟)
+	PaymentType    string // 计费类型：0计时收费；1违约收费；2辅助收费
+	PaymentAccount string // 费用
+	CreateUserId   string //
+	CreateBy       string //
+	CreateOn       string //
+	BillId         string // 账单Id
+	MainUserId     string // 主用户Id
+	MainUser       string // 主用户
+	AttachUserId   string // 从用户Id
+	AttachUser     string // 从用户
+	Data1          string // 备用字段1
+	Data2          string // 备用字段2
+	Data3          string // 备用字段3
+	Data4          string // 备用字段4
+	Data5          string // 备用字段5
+	Remark         string // 备注
+	UpdateUserId   string // 更新者ID
+	UpdateBy       string // 更新者
+	UpdateOn       string // 更新时间
 }
 
 var (

dao/account/internal/settle_account_main.go

@@ -59,10 +59,10 @@ type settleAccountMainColumns struct {
 	UpdateUserId       string // 更新者ID
 	UpdateBy           string // 更新者
 	UpdateOn           string // 更新时间
-	VerificationUserId      string // 确认人Id
-	VerificationUser        string // 确认人
-	VerificationDate        string // 确认时间
-	AccountStatus           string // 结算状态 0未结算 1已结算
+	VerificationUserId string // 确认人Id
+	VerificationUser   string // 确认人
+	VerificationDate   string // 确认时间
+	AccountStatus      string // 结算状态 0未结算 1已结算
 }
 
 var (
@@ -72,44 +72,44 @@ var (
 		DB:    g.DB("default"),
 		Table: "settle_account_main",
 		Columns: settleAccountMainColumns{
-			Id:                "Id",
-			BillId:            "BillId",
-			AppointId:         "AppointId",
-			AppointUserId:     "AppointUserId",
-			AppointUser:       "AppointUser",
-			MainUserId:        "MainUserId",
-			MainUser:          "MainUser",
-			FeeType:           "FeeType",
-			SettleStatus:      "SettleStatus",
-			TotalPrice:        "TotalPrice",
-			SettleTime:        "SettleTime",
-			CreateUserId:      "CreateUserId",
-			CreateBy:          "CreateBy",
-			CreateOn:          "CreateOn",
-			DeletedAt:         "DeletedAt",
-			AttachUserId:      "AttachUserId",
-			AttachUser:        "AttachUser",
-			Status:            "Status",
-			AppointStartDate:  "AppointStartDate",
-			AppointEndDate:    "AppointEndDate",
-			ActualStartDate:   "ActualStartDate",
-			ActualEndDate:     "ActualEndDate",
-			ActualMachineHour: "ActualMachineHour",
-			InstrumentId:      "InstrumentId",
-			InstrumentCode:    "InstrumentCode",
-			InstrumentName:    "InstrumentName",
-			SettleUserId:      "SettleUserId",
-			SettleUser:        "SettleUser",
-			SettleDate:        "SettleDate",
-			FeeTime:           "FeeTime",
-			Remark:            "Remark",
-			UpdateUserId:      "UpdateUserId",
-			UpdateBy:          "UpdateBy",
-			UpdateOn:          "UpdateOn",
-			VerificationUserId:     "VerificationUserId",
-			VerificationUser:       "VerificationUser",
-			VerificationDate:       "VerificationDate",
-			AccountStatus:          "AccountStatus",
+			Id:                 "Id",
+			BillId:             "BillId",
+			AppointId:          "AppointId",
+			AppointUserId:      "AppointUserId",
+			AppointUser:        "AppointUser",
+			MainUserId:         "MainUserId",
+			MainUser:           "MainUser",
+			FeeType:            "FeeType",
+			SettleStatus:       "SettleStatus",
+			TotalPrice:         "TotalPrice",
+			SettleTime:         "SettleTime",
+			CreateUserId:       "CreateUserId",
+			CreateBy:           "CreateBy",
+			CreateOn:           "CreateOn",
+			DeletedAt:          "DeletedAt",
+			AttachUserId:       "AttachUserId",
+			AttachUser:         "AttachUser",
+			Status:             "Status",
+			AppointStartDate:   "AppointStartDate",
+			AppointEndDate:     "AppointEndDate",
+			ActualStartDate:    "ActualStartDate",
+			ActualEndDate:      "ActualEndDate",
+			ActualMachineHour:  "ActualMachineHour",
+			InstrumentId:       "InstrumentId",
+			InstrumentCode:     "InstrumentCode",
+			InstrumentName:     "InstrumentName",
+			SettleUserId:       "SettleUserId",
+			SettleUser:         "SettleUser",
+			SettleDate:         "SettleDate",
+			FeeTime:            "FeeTime",
+			Remark:             "Remark",
+			UpdateUserId:       "UpdateUserId",
+			UpdateBy:           "UpdateBy",
+			UpdateOn:           "UpdateOn",
+			VerificationUserId: "VerificationUserId",
+			VerificationUser:   "VerificationUser",
+			VerificationDate:   "VerificationDate",
+			AccountStatus:      "AccountStatus",
 		},
 	}
 )
@@ -121,44 +121,44 @@ func NewSettleAccountMainDao(tenant string) SettleAccountMainDao {
 		DB:    g.DB(tenant),
 		Table: "settle_account_main",
 		Columns: settleAccountMainColumns{
-			Id:                "Id",
-			BillId:            "BillId",
-			AppointId:         "AppointId",
-			AppointUserId:     "AppointUserId",
-			AppointUser:       "AppointUser",
-			MainUserId:        "MainUserId",
-			MainUser:          "MainUser",
-			FeeType:           "FeeType",
-			SettleStatus:      "SettleStatus",
-			TotalPrice:        "TotalPrice",
-			SettleTime:        "SettleTime",
-			CreateUserId:      "CreateUserId",
-			CreateBy:          "CreateBy",
-			CreateOn:          "CreateOn",
-			DeletedAt:         "DeletedAt",
-			AttachUserId:      "AttachUserId",
-			AttachUser:        "AttachUser",
-			Status:            "Status",
-			AppointStartDate:  "AppointStartDate",
-			AppointEndDate:    "AppointEndDate",
-			ActualStartDate:   "ActualStartDate",
-			ActualEndDate:     "ActualEndDate",
-			ActualMachineHour: "ActualMachineHour",
-			InstrumentId:      "InstrumentId",
-			InstrumentCode:    "InstrumentCode",
-			InstrumentName:    "InstrumentName",
-			SettleUserId:      "SettleUserId",
-			SettleUser:        "SettleUser",
-			SettleDate:        "SettleDate",
-			FeeTime:           "FeeTime",
-			Remark:            "Remark",
-			UpdateUserId:      "UpdateUserId",
-			UpdateBy:          "UpdateBy",
-			UpdateOn:          "UpdateOn",
-			VerificationUserId:     "VerificationUserId",
-			VerificationUser:       "VerificationUser",
-			VerificationDate:       "VerificationDate",
-			AccountStatus:          "AccountStatus",
+			Id:                 "Id",
+			BillId:             "BillId",
+			AppointId:          "AppointId",
+			AppointUserId:      "AppointUserId",
+			AppointUser:        "AppointUser",
+			MainUserId:         "MainUserId",
+			MainUser:           "MainUser",
+			FeeType:            "FeeType",
+			SettleStatus:       "SettleStatus",
+			TotalPrice:         "TotalPrice",
+			SettleTime:         "SettleTime",
+			CreateUserId:       "CreateUserId",
+			CreateBy:           "CreateBy",
+			CreateOn:           "CreateOn",
+			DeletedAt:          "DeletedAt",
+			AttachUserId:       "AttachUserId",
+			AttachUser:         "AttachUser",
+			Status:             "Status",
+			AppointStartDate:   "AppointStartDate",
+			AppointEndDate:     "AppointEndDate",
+			ActualStartDate:    "ActualStartDate",
+			ActualEndDate:      "ActualEndDate",
+			ActualMachineHour:  "ActualMachineHour",
+			InstrumentId:       "InstrumentId",
+			InstrumentCode:     "InstrumentCode",
+			InstrumentName:     "InstrumentName",
+			SettleUserId:       "SettleUserId",
+			SettleUser:         "SettleUser",
+			SettleDate:         "SettleDate",
+			FeeTime:            "FeeTime",
+			Remark:             "Remark",
+			UpdateUserId:       "UpdateUserId",
+			UpdateBy:           "UpdateBy",
+			UpdateOn:           "UpdateOn",
+			VerificationUserId: "VerificationUserId",
+			VerificationUser:   "VerificationUser",
+			VerificationDate:   "VerificationDate",
+			AccountStatus:      "AccountStatus",
 		},
 	}
 	return dao

dao/equipment/internal/instrument_surcharge.go

@@ -25,25 +25,25 @@ type InstrumentSurchargeDao struct {
 
 // InstrumentSurchargeColumns defines and stores column names for table instrument_surcharge.
 type instrumentSurchargeColumns struct {
-	Id              string // 主键
-	InstrumentId    string // 仪器Id
-	InstrumentCode  string // 仪器编号
-	InstrumentName  string // 仪器名称
-	FeeType         string // 计费类型：0附加费；1样品数收费
-	PaymentType     string // 计费类型为附加费时，种类
-	Amount          string // 费用（计费标准）
-	Data1           string // 备用字段1
-	Data2           string // 备用字段2
-	Data3           string // 备用字段3
-	Data4           string // 备用字段4
-	Data5           string // 备用字段5
-	Remark          string // 备注
-	CreateUserId    string //
-	CreateBy        string //
-	CreateOn        string //
-	UpdateUserId    string // 更新者ID
-	UpdateBy        string // 更新者
-	UpdateOn        string // 更新时间
+	Id             string // 主键
+	InstrumentId   string // 仪器Id
+	InstrumentCode string // 仪器编号
+	InstrumentName string // 仪器名称
+	FeeType        string // 计费类型：0附加费；1样品数收费
+	PaymentType    string // 计费类型为附加费时，种类
+	Amount         string // 费用（计费标准）
+	Data1          string // 备用字段1
+	Data2          string // 备用字段2
+	Data3          string // 备用字段3
+	Data4          string // 备用字段4
+	Data5          string // 备用字段5
+	Remark         string // 备注
+	CreateUserId   string //
+	CreateBy       string //
+	CreateOn       string //
+	UpdateUserId   string // 更新者ID
+	UpdateBy       string // 更新者
+	UpdateOn       string // 更新时间
 }
 
 var (

handler/account.go

@@ -111,4 +111,4 @@ func (a *Account) GetBaseAccountById(ctx context.Context, req *account.SubAccoun
 	rsp.Msg = ""
 	rsp.Data = list
 	return nil
-}
+}

handler/instrument_surcharge.go

@@ -78,4 +78,4 @@ func (a *InstrumentSurchargeController) DeleteInstrumentSurcharge(ctx context.Co
 	rsp.Code = code
 	rsp.Msg = msg
 	return nil
-}
+}

handler/settle_account_bill.go

@@ -63,6 +63,7 @@ func (a *SettleAccountBillController) SettleAccountBill(ctx context.Context, req
 	rsp.Msg = msg
 	return nil
 }
+
 // 结算明细（已出账单）确认
 func (a *SettleAccountBillController) ConfirmAccountBill(ctx context.Context, req *accountModel.AccountBillConfirmReq, rsp *comm_def.CommonMsg) error {
 	tenant, err := micro_srv.GetTenant(ctx)

handler/settle_account_detail.go

@@ -34,4 +34,4 @@ func (a *SettleAccountDetailController) SettleAccountDetailList(ctx context.Cont
 	rsp.Msg = msg
 	rsp.Data = g.Map{"list": list}
 	return nil
-}
+}

handler/settle_account_main.go

@@ -114,4 +114,4 @@ func (a *SettleAccountMainController) CancelAccountMain(ctx context.Context, req
 	rsp.Code = code
 	rsp.Msg = msg
 	return nil
-}
+}

handler/system.go

@@ -151,7 +151,6 @@ func (s *System) UserBindAccount(ctx context.Context, req *user.UserBindAccountR
 	return nil
 }
 
-
 // 获取登录人信息
 func (s *System) GetLoginUser(ctx context.Context, _, rsp *comm_def.CommonMsg) error {
 	userInfo, err := micro_srv.GetUserInfo(ctx)
@@ -162,4 +161,4 @@ func (s *System) GetLoginUser(ctx context.Context, _, rsp *comm_def.CommonMsg) e
 	rsp.Code = 200
 	rsp.Data = userInfo
 	return nil
-}
+}

handler/test_test.go

@@ -7,8 +7,8 @@ import (
 )
 
 var (
-	url = "http://192.168.0.102:9981/dashoo.lims.adapter-0.1-jlw"
-	tenant = "EmGVD5szuT"
+	url      = "http://192.168.0.102:9981/dashoo.lims.adapter-0.1-jlw"
+	tenant   = "EmGVD5szuT"
 	username = "dashoo"
 	password = "Yzr0t0P4VH5HfjmIVuMQ0CRpu/zkFbJWEN7uO7qIAarMuEDSLVkcHOUEAp+HGXf+ZwxpVJM1zqzlW9br1NJDgw=="
 )

main.go

@@ -17,14 +17,13 @@ import (
 func main() {
 	// 定时任务
 	c := cron.New()
-	spec := "0 0 1 * * ?"					// 每日1点执行
+	spec := "0 0 1 * * ?" // 每日1点执行
 
 	if err := c.AddJob(spec, timers.Timer{}); err != nil {
 		glog.Error(err.Error())
 	}
 	c.Start()
 
-
 	srvAddr := g.Config().GetString("setting.bind-addr")
 	basePath := g.Config().GetString("setting.srv-name")
 	// 创建总服务包

model/account/base_account.go

@@ -14,15 +14,15 @@ type BaseAccount internal.BaseAccount
 
 // Fill with you ideas below.
 type BaseAccountResp struct {
-	Id          int    `orm:"Id,primary"             json:"id"`          // 主键
-	Account     string `orm:"Account"                json:"account"`     // 账户
-	AccountName string `orm:"AccountName"            json:"accountName"` // 账户名称
-	Surplus     float64    `orm:"Surplus"                json:"surplus"`     // 账户余额
-	Available   float64    `orm:"Available"              json:"available"`   // 可用余额
-	Limit       float64    `orm:"Limit"                  json:"limit"`       // 使用限额
-	Advance     int    `orm:"Advance"                json:"advance"`     // 优先级
-	UserId      int    `orm:"UserId"                 json:"userId"`      // 使用人Id
-	RealName    string `orm:"RealName"               json:"realName"`
+	Id          int     `orm:"Id,primary"             json:"id"`          // 主键
+	Account     string  `orm:"Account"                json:"account"`     // 账户
+	AccountName string  `orm:"AccountName"            json:"accountName"` // 账户名称
+	Surplus     float64 `orm:"Surplus"                json:"surplus"`     // 账户余额
+	Available   float64 `orm:"Available"              json:"available"`   // 可用余额
+	Limit       float64 `orm:"Limit"                  json:"limit"`       // 使用限额
+	Advance     int     `orm:"Advance"                json:"advance"`     // 优先级
+	UserId      int     `orm:"UserId"                 json:"userId"`      // 使用人Id
+	RealName    string  `orm:"RealName"               json:"realName"`
 }
 
 type AccountReq struct {
@@ -31,20 +31,20 @@ type AccountReq struct {
 	Account     string `json:"account"`
 	AccountName string `json:"accountName"`
 	RealName    string `json:"realName"`
-	IsSelf       string `json:"isSelf"`  // 1 查看全部；其他 查看自己
+	IsSelf      string `json:"isSelf"` // 1 查看全部；其他 查看自己
 }
 
 type BaseAccountRsp struct {
 	Records []BaseAccount `json:"records"`
-	Total   int               `json:"total"`
+	Total   int           `json:"total"`
 }
 
 type CalculateAmountReq struct {
-	AppointId  int `json:"appointId"`
-	SignInTime         *gtime.Time `json:"sign_in_time"`         // 签到时间
-	SignOutTime        *gtime.Time `json:"sign_out_time"`        // 签退时间
+	AppointId   int         `json:"appointId"`
+	SignInTime  *gtime.Time `json:"sign_in_time"`  // 签到时间
+	SignOutTime *gtime.Time `json:"sign_out_time"` // 签退时间
 }
 
 type SubAccountReq struct {
-	SubId     string `json:"subid"`
-}
+	SubId string `json:"subid"`
+}

model/account/internal/settle_account_detail.go

@@ -13,7 +13,7 @@ type SettleAccountDetail struct {
 	Id             int         `orm:"Id,primary"     json:"id"`              // 主键
 	Pid            int         `orm:"pid"            json:"pid"`             // 结算明细主表Id
 	UnitPrice      float64     `orm:"UnitPrice"      json:"unit_price"`      // 计费单价
-	ActualMinutes string      `orm:"ActualMinutes" json:"actual_minutes"` // 实际机时(分钟)
+	ActualMinutes  string      `orm:"ActualMinutes" json:"actual_minutes"`   // 实际机时(分钟)
 	Minutes        string      `orm:"Minutes"        json:"minutes"`         // 计费时长(分钟)
 	PaymentType    string      `orm:"PaymentType"    json:"payment_type"`    // 计费类型：0计时收费；1违约收费；2辅助收费
 	PaymentAccount float64     `orm:"PaymentAccount" json:"payment_account"` // 费用

model/account/internal/settle_account_main.go

@@ -10,42 +10,42 @@ import (
 
 // SettleAccountMain is the golang structure for table settle_account_main.
 type SettleAccountMain struct {
-	Id                int         `orm:"Id,primary"        json:"id"`                  // 主键
-	BillId            int         `orm:"BillId"            json:"bill_id"`             // 账单Id
-	AppointId         int         `orm:"AppointId"         json:"appoint_id"`          // 预约Id
-	AppointUserId     int         `orm:"AppointUserId"     json:"appoint_user_id"`     // 预约人Id
-	AppointUser       string      `orm:"AppointUser"       json:"appoint_user"`        // 预约人
-	MainUserId        int         `orm:"MainUserId"        json:"main_user_id"`        // 主用户Id
-	MainUser          string      `orm:"MainUser"          json:"main_user"`           // 主用户
-	FeeType           string      `orm:"FeeType"           json:"fee_type"`            // 计费类型：0 机时；
-	SettleStatus      string      `orm:"SettleStatus"      json:"settle_status"`       // 确认状态 0未确认 1已确认
-	TotalPrice        float64     `orm:"TotalPrice"        json:"total_price"`         // 合计费用
-	SettleTime        *gtime.Time `orm:"SettleTime"        json:"settle_time"`         // 结算时间
-	CreateUserId      int         `orm:"CreateUserId"      json:"create_user_id"`      //
-	CreateBy          string      `orm:"CreateBy"          json:"create_by"`           //
-	CreateOn          *gtime.Time `orm:"CreateOn"          json:"create_on"`           //
-	DeletedAt         *gtime.Time `orm:"DeletedAt"         json:"deleted_at"`          // 删除时间
-	AttachUserId      int         `orm:"AttachUserId"      json:"attach_user_id"`      // 从用户Id
-	AttachUser        string      `orm:"AttachUser"        json:"attach_user"`         // 从用户
-	Status            string      `orm:"Status"            json:"status"`              // 账单状态 0未汇总 1已汇总
-	AppointStartDate  *gtime.Time `orm:"AppointStartDate"  json:"appoint_start_date"`  // 预约开始时间
-	AppointEndDate    *gtime.Time `orm:"AppointEndDate"    json:"appoint_end_date"`    // 预约结束时间
-	ActualStartDate   *gtime.Time `orm:"ActualStartDate"   json:"actual_start_date"`   // 实际上机开始时间
-	ActualEndDate     *gtime.Time `orm:"ActualEndDate"     json:"actual_end_date"`     // 实际上机结束时间
-	ActualMachineHour int         `orm:"ActualMachineHour" json:"actual_machine_hour"` // 实际机时
-	InstrumentId      int         `orm:"InstrumentId"      json:"instrument_id"`       // 仪器Id
-	InstrumentCode    string      `orm:"InstrumentCode"    json:"instrument_code"`     // 仪器编号
-	InstrumentName    string      `orm:"InstrumentName"    json:"instrument_name"`     // 仪器名称
-	SettleUserId      int         `orm:"SettleUserId"      json:"settle_user_id"`      // 结算人Id
-	SettleUser        string      `orm:"SettleUser"        json:"settle_user"`         // 结算人
-	SettleDate        *gtime.Time `orm:"SettleDate"        json:"settle_date"`         // 结算时间
-	FeeTime           int         `orm:"FeeTime"           json:"fee_time"`            // 计费时间
-	Remark            string      `orm:"Remark"            json:"remark"`              // 备注
-	UpdateUserId      int         `orm:"UpdateUserId"      json:"update_user_id"`      // 更新者ID
-	UpdateBy          string      `orm:"UpdateBy"          json:"update_by"`           // 更新者
-	UpdateOn          *gtime.Time `orm:"UpdateOn"          json:"update_on"`           // 更新时间
-	VerificationUserId     int         `orm:"VerificationUserId"     json:"verification_user_id"`     // 账单确认人Id
-	VerificationUser       string      `orm:"VerificationUser"       json:"verification_user"`        // 账单确认人
-	VerificationDate       *gtime.Time `orm:"VerificationDate"       json:"verification_date"`        // 账单确认时间
-	AccountStatus      string      `orm:"AccountStatus"      json:"account_status"`       // 结算状态 0未结算 1已结算
+	Id                 int         `orm:"Id,primary"        json:"id"`                        // 主键
+	BillId             int         `orm:"BillId"            json:"bill_id"`                   // 账单Id
+	AppointId          int         `orm:"AppointId"         json:"appoint_id"`                // 预约Id
+	AppointUserId      int         `orm:"AppointUserId"     json:"appoint_user_id"`           // 预约人Id
+	AppointUser        string      `orm:"AppointUser"       json:"appoint_user"`              // 预约人
+	MainUserId         int         `orm:"MainUserId"        json:"main_user_id"`              // 主用户Id
+	MainUser           string      `orm:"MainUser"          json:"main_user"`                 // 主用户
+	FeeType            string      `orm:"FeeType"           json:"fee_type"`                  // 计费类型：0 机时；
+	SettleStatus       string      `orm:"SettleStatus"      json:"settle_status"`             // 确认状态 0未确认 1已确认
+	TotalPrice         float64     `orm:"TotalPrice"        json:"total_price"`               // 合计费用
+	SettleTime         *gtime.Time `orm:"SettleTime"        json:"settle_time"`               // 结算时间
+	CreateUserId       int         `orm:"CreateUserId"      json:"create_user_id"`            //
+	CreateBy           string      `orm:"CreateBy"          json:"create_by"`                 //
+	CreateOn           *gtime.Time `orm:"CreateOn"          json:"create_on"`                 //
+	DeletedAt          *gtime.Time `orm:"DeletedAt"         json:"deleted_at"`                // 删除时间
+	AttachUserId       int         `orm:"AttachUserId"      json:"attach_user_id"`            // 从用户Id
+	AttachUser         string      `orm:"AttachUser"        json:"attach_user"`               // 从用户
+	Status             string      `orm:"Status"            json:"status"`                    // 账单状态 0未汇总 1已汇总
+	AppointStartDate   *gtime.Time `orm:"AppointStartDate"  json:"appoint_start_date"`        // 预约开始时间
+	AppointEndDate     *gtime.Time `orm:"AppointEndDate"    json:"appoint_end_date"`          // 预约结束时间
+	ActualStartDate    *gtime.Time `orm:"ActualStartDate"   json:"actual_start_date"`         // 实际上机开始时间
+	ActualEndDate      *gtime.Time `orm:"ActualEndDate"     json:"actual_end_date"`           // 实际上机结束时间
+	ActualMachineHour  int         `orm:"ActualMachineHour" json:"actual_machine_hour"`       // 实际机时
+	InstrumentId       int         `orm:"InstrumentId"      json:"instrument_id"`             // 仪器Id
+	InstrumentCode     string      `orm:"InstrumentCode"    json:"instrument_code"`           // 仪器编号
+	InstrumentName     string      `orm:"InstrumentName"    json:"instrument_name"`           // 仪器名称
+	SettleUserId       int         `orm:"SettleUserId"      json:"settle_user_id"`            // 结算人Id
+	SettleUser         string      `orm:"SettleUser"        json:"settle_user"`               // 结算人
+	SettleDate         *gtime.Time `orm:"SettleDate"        json:"settle_date"`               // 结算时间
+	FeeTime            int         `orm:"FeeTime"           json:"fee_time"`                  // 计费时间
+	Remark             string      `orm:"Remark"            json:"remark"`                    // 备注
+	UpdateUserId       int         `orm:"UpdateUserId"      json:"update_user_id"`            // 更新者ID
+	UpdateBy           string      `orm:"UpdateBy"          json:"update_by"`                 // 更新者
+	UpdateOn           *gtime.Time `orm:"UpdateOn"          json:"update_on"`                 // 更新时间
+	VerificationUserId int         `orm:"VerificationUserId"     json:"verification_user_id"` // 账单确认人Id
+	VerificationUser   string      `orm:"VerificationUser"       json:"verification_user"`    // 账单确认人
+	VerificationDate   *gtime.Time `orm:"VerificationDate"       json:"verification_date"`    // 账单确认时间
+	AccountStatus      string      `orm:"AccountStatus"      json:"account_status"`           // 结算状态 0未结算 1已结算
 }

model/account/settle_account_bill.go

@@ -14,27 +14,27 @@ type SettleAccountBill internal.SettleAccountBill
 // Fill with you ideas below.
 
 type SettleAccountBillReq struct {
-	MainUserId  int `json:"mainUserId"`
-	Status      string `json:"status"`
-	StartDate      string `json:"startDate"`
-	EndDate      string `json:"endDate"`
-	SettleDate      string `json:"settleDate"`
-	SettleUser      string `json:"settleUser"`
-	MainUser      string `json:"mainUser"`
-	IsSelf       string `json:"isSelf"`  // 1 查看全部；其他 查看自己
+	MainUserId int    `json:"mainUserId"`
+	Status     string `json:"status"`
+	StartDate  string `json:"startDate"`
+	EndDate    string `json:"endDate"`
+	SettleDate string `json:"settleDate"`
+	SettleUser string `json:"settleUser"`
+	MainUser   string `json:"mainUser"`
+	IsSelf     string `json:"isSelf"` // 1 查看全部；其他 查看自己
 }
 
 type AccountBillSettleReq struct {
-	BillId  int `json:"billId"`
-	AccountId  int `json:"accountId"`
-	Amount  float64 `json:"amount"`
+	BillId    int     `json:"billId"`
+	AccountId int     `json:"accountId"`
+	Amount    float64 `json:"amount"`
 }
 
 type AccountBillConfirmReq struct {
-	BillId  int `json:"billId"`
+	BillId int `json:"billId"`
 }
 
 type BillInfo struct {
 	SettleAccountBill
-	TotalAmount             float64     `orm:"TotalAmount"             json:"total_amount"`              // 计费总额
-}
+	TotalAmount float64 `orm:"TotalAmount"             json:"total_amount"` // 计费总额
+}

model/account/settle_account_detail.go

@@ -64,7 +64,7 @@ type SearchUser struct {
 }
 
 type SettleAccountDetailReq struct {
-	MainUserId  int `json:"mainUserId"`
-	AttachUserId int `json:"attachUserId"`
-	Pid int32 `json:"pid"`
-}
+	MainUserId   int   `json:"mainUserId"`
+	AttachUserId int   `json:"attachUserId"`
+	Pid          int32 `json:"pid"`
+}

model/account/settle_account_main.go

@@ -15,51 +15,51 @@ type SettleAccountMain internal2.SettleAccountMain
 // Fill with you ideas below.
 
 type SettleAccountMainReq struct {
-	MainUserId  int `json:"mainUserId"`
-	BillId	string `json:"billId"`
-	MainUser  string `json:"mainUser"`
-	AttachUserId int `json:"attachUserId"`
-	AttachUser string `json:"attachUser"`
-	InstrumentId int `json:"instrumentId"`
-	InstrumentName string `json:"instrumentName"`
-	AppointUserId int `json:"appointUserId"`
+	MainUserId       int    `json:"mainUserId"`
+	BillId           string `json:"billId"`
+	MainUser         string `json:"mainUser"`
+	AttachUserId     int    `json:"attachUserId"`
+	AttachUser       string `json:"attachUser"`
+	InstrumentId     int    `json:"instrumentId"`
+	InstrumentName   string `json:"instrumentName"`
+	AppointUserId    int    `json:"appointUserId"`
 	AppointUser      string `json:"appointUser"`
-	Status      string `json:"status"`
-	SettleStatus      string `json:"settleStatus"` // 确认状态
-	AccountStatus     string `json:"accountStatus"`// 结算状态
-	SettleUser      string `json:"settleUser"` // 结算人
-	VerificationUser      string `json:"verificationUser"` // 确认人
-	FeeType   string `json:"feeType"`
+	Status           string `json:"status"`
+	SettleStatus     string `json:"settleStatus"`     // 确认状态
+	AccountStatus    string `json:"accountStatus"`    // 结算状态
+	SettleUser       string `json:"settleUser"`       // 结算人
+	VerificationUser string `json:"verificationUser"` // 确认人
+	FeeType          string `json:"feeType"`
 	AppointStartDate string `json:"appointStartDate"`
-	AppointEndDate string `json:"appointEndDate"`
+	AppointEndDate   string `json:"appointEndDate"`
 	VerificationDate string `json:"verificationDate"`
-	SettleStartDate string `json:"settleStartDate"`
-	SettleEndDate string `json:"settleEndDate"`
-	ActualStartDate string `json:"actualStartDate"`
-	ActualEndDate string `json:"actualEndDate"`
+	SettleStartDate  string `json:"settleStartDate"`
+	SettleEndDate    string `json:"settleEndDate"`
+	ActualStartDate  string `json:"actualStartDate"`
+	ActualEndDate    string `json:"actualEndDate"`
 	SearchType       string `json:"searchType"` // 1 查询全部；2 查询主用户；3或其他 查询从用户
-	NotInBill       string `json:"notInBill"`  // 1 未出账单 其他 全部
+	NotInBill        string `json:"notInBill"`  // 1 未出账单 其他 全部
 }
 
 type AccountMainConfirmReq struct {
-	MainId  int `json:"mainId"`
+	MainId int `json:"mainId"`
 }
 
 type AccountMainAddReq struct {
-	Main  SettleAccountMain  `json:"main"`
-	Details  []SettleAccountDetail  `json:"details"`
+	Main    SettleAccountMain     `json:"main"`
+	Details []SettleAccountDetail `json:"details"`
 }
 
 type AccountMainCancelReq struct {
-	AppointId  int     `json:"appointId"`
-	IsAuto     string  `json:"is_auto"` // 0 手动取消；1 自动取消；2 管理员撤销
+	AppointId int    `json:"appointId"`
+	IsAuto    string `json:"is_auto"` // 0 手动取消；1 自动取消；2 管理员撤销
 }
 
 type MainInfo struct {
 	SettleAccountMain
-	SignInTime         *gtime.Time `orm:"SignInTime"         json:"sign_in_time"`         // 签到时间
-	SignOutTime        *gtime.Time `orm:"SignOutTime"        json:"sign_out_time"`        // 签退时间
-	AppointStatus      int         `orm:"AppointStatus"      json:"appoint_status"`       // 预约状态
+	SignInTime    *gtime.Time `orm:"SignInTime"         json:"sign_in_time"`   // 签到时间
+	SignOutTime   *gtime.Time `orm:"SignOutTime"        json:"sign_out_time"`  // 签退时间
+	AppointStatus int         `orm:"AppointStatus"      json:"appoint_status"` // 预约状态
 }
 
 type Instrument struct {
@@ -110,4 +110,4 @@ type Instrument struct {
 	Terminal                string      `orm:"Terminal"                json:"terminal"`                  // 信息终端
 	RoleId                  int         `orm:"RoleId"                  json:"role_id"`                   // 自动审批角色
 	Sort                    int         `json:"sort" orm:"Sort"`                                         // 排序
-}
+}

model/consequent/internal/consequent.go

@@ -21,7 +21,7 @@ type Consequent struct {
 	Code        string      `orm:"Code"        json:"code"`        // 成果编号
 	OwnersId    string      `orm:"OwnersId"    json:"ownersId"`    // 获得者
 	OwnersName  string      `orm:"OwnersName"  json:"ownersName"`  // 获得者名称
-	MediaIds    string      `orm:"MediaIds"    json:"media_ids"`     // 成果附件Id
+	MediaIds    string      `orm:"MediaIds"    json:"media_ids"`   // 成果附件Id
 	PublishTime *gtime.Time `orm:"PublishTime" json:"publishTime"` // 获得时间
 	ProjectId   int         `orm:"ProjectId"   json:"projectId"`   // 项目ID
 	ProjectName string      `orm:"ProjectName" json:"projectName"` // 项目名称

model/equipment/instrument.go

@@ -15,9 +15,9 @@ type Instrument internal2.Instrument
 // Fill with you ideas below.
 // 设备Id、计费单价
 type InstrumentId struct {
-	InstrumentId int `json:"instrument_id"` // 设备Id
+	InstrumentId int     `json:"instrument_id"` // 设备Id
 	UnitCount    float64 `json:"unit_count"`    // 计费单价
-	Rate         int `json:"rate"`          // 优惠比例
+	Rate         int     `json:"rate"`          // 优惠比例
 }
 type InstrumentEntity struct {
 	Instrument Instrument

model/equipment/instrument_surcharge.go

@@ -12,7 +12,7 @@ import (
 type InstrumentSurcharge internal2.InstrumentSurcharge
 
 type InstrumentSurchargeReq struct {
-	InstrumentId  int `json:"instrumentId"`
+	InstrumentId int `json:"instrumentId"`
 }
 
 type InstrumentSurchargeSaveReq struct {
@@ -20,5 +20,5 @@ type InstrumentSurchargeSaveReq struct {
 }
 
 type InstrumentSurchargeDeleteReq struct {
-	Id  int `json:"id"`
-}
+	Id int `json:"id"`
+}

model/equipment/internal/instrument.go

@@ -49,7 +49,7 @@ type Instrument struct {
 	PurchaseTime            *gtime.Time `orm:"PurchaseTime"            json:"purchaseTime"`            // 采购日期
 	JoinPlan                int         `orm:"JoinPlan"                json:"joinPlan"`                // 计划
 	IsAppoint               int         `orm:"IsAppoint"               json:"isAppoint"`               // 是否需要预约
-	IsAppointAvailable      int         `orm:"IsAppointAvailable"      json:"isAppointAvailable"`     // 是否默认可预约 1是 2否
+	IsAppointAvailable      int         `orm:"IsAppointAvailable"      json:"isAppointAvailable"`      // 是否默认可预约 1是 2否
 	DeletedAt               *gtime.Time `orm:"DeletedAt"               json:"deletedAt"`               // 删除时间
 	Weekday                 string      `orm:"Weekday"                 json:"weekday"`                 // 每周可预约日
 	BeginAt                 *gtime.Time `orm:"BeginAt"                 json:"beginAt"`                 // 预约开始时段

model/user/base_user.go

@@ -32,7 +32,7 @@ type UserInfoReq struct {
 	UserName     string `json:"user_name"`
 	Mobile       string `json:"mobile"`
 	ReqType      int    `json:"req_type"` // 请求类型 设备预约（1:预约资格 2：优先预约权） 主从用户管理（1：主用户查询 2：从用户查询）
-	IsSelf       string `json:"isSelf"`  // 1 查看全部；其他 查看自己
+	IsSelf       string `json:"isSelf"`   // 1 查看全部；其他 查看自己
 }
 
 type UserInfoRsp struct {
@@ -42,7 +42,7 @@ type UserInfoRsp struct {
 
 type SearchUserInfoRsp struct {
 	Records []SearchUserInfo `json:"records"`
-	Total   int            `json:"total"'`
+	Total   int              `json:"total"'`
 }
 
 // 添加、删除主从用户
@@ -131,5 +131,5 @@ type BaseUserInfo struct {
 
 type SearchUserInfo struct {
 	BaseUserInfo
-	MasterId              int         `orm:"MasterId"              json:"master_id"`             // 主用户Id
-}
+	MasterId int `orm:"MasterId"              json:"master_id"` // 主用户Id
+}

service/account/account.go

@@ -73,13 +73,13 @@ func (s AccountService) AccountList(req *account.AccountReq, user request.UserIn
 	size := req.PageSize
 	model := s.Dao.DB.Model("base_account a")
 	if req.Account != "" {
-		model = model.WhereLike("Account", "%" + req.Account + "%")
+		model = model.WhereLike("Account", "%"+req.Account+"%")
 	}
 	if req.RealName != "" {
-		model = model.WhereLike("MainUser", "%" + req.RealName + "%")
+		model = model.WhereLike("MainUser", "%"+req.RealName+"%")
 	}
 	if req.AccountName != "" {
-		model = model.WhereLike("AccountName", "%" + req.AccountName + "%")
+		model = model.WhereLike("AccountName", "%"+req.AccountName+"%")
 	}
 	if req.IsSelf != "1" { // 1 查看全部；其他 查看自己
 		model = model.Where("MainUserId", user.Id)
@@ -146,7 +146,7 @@ func (s AccountService) Calculate(req *account.CalculateAmountReq) error {
 	discount := float64(1) // 计算折扣
 	if detail.Data5 != "" {
 		d, _ := strconv.ParseFloat(detail.Data5, 64)
-		discount = 1 - d / 100
+		discount = 1 - d/100
 	}
 
 	oldAmount := detail.PaymentAccount
@@ -192,15 +192,15 @@ func (s AccountService) Calculate(req *account.CalculateAmountReq) error {
 // 通过从账户，查询主账户 财务账号信息
 func (s AccountService) GetBaseAccountById(req *account.SubAccountReq) (infos account.BaseAccountRsp, err error) {
 	// 先判断是主用户还是从用户
-	infos.Total,err = s.Dao.DB.Model("master_user").Where(fmt.Sprintf("UserId='%v'", req.SubId)).Count()
+	infos.Total, err = s.Dao.DB.Model("master_user").Where(fmt.Sprintf("UserId='%v'", req.SubId)).Count()
 	if err != nil {
 		return infos, err
 	}
 	if infos.Total == 0 {
 		// 主用户表没有 所以是从用户 进行连表查询
-		model := s.Dao.DB.Model("base_account a").LeftJoin("base_user_relation b","a.MainUserId=b.Pid")
+		model := s.Dao.DB.Model("base_account a").LeftJoin("base_user_relation b", "a.MainUserId=b.Pid")
 		if req.SubId != "" {
-			model = model.Where(fmt.Sprintf("b.UserId='%v'",req.SubId))
+			model = model.Where(fmt.Sprintf("b.UserId='%v'", req.SubId))
 		}
 		err = model.Fields("a.*").Order("Advance ASC, a.Id ASC").Scan(&infos.Records)
 		if err != nil {
@@ -211,7 +211,7 @@ func (s AccountService) GetBaseAccountById(req *account.SubAccountReq) (infos ac
 		// 是主用户
 		model := s.Dao.DB.Model("base_account a")
 		if req.SubId != "" {
-			model = model.Where(fmt.Sprintf("a.MainUserId='%v'",req.SubId))
+			model = model.Where(fmt.Sprintf("a.MainUserId='%v'", req.SubId))
 		}
 		err = model.Fields("a.*").Order("Advance ASC, a.Id ASC").Scan(&infos.Records)
 		if err != nil {
@@ -220,4 +220,4 @@ func (s AccountService) GetBaseAccountById(req *account.SubAccountReq) (infos ac
 		return infos, nil
 	}
 	return infos, nil
-}
+}

service/equipment/equipment.go

@@ -242,7 +242,7 @@ func (s Service) SearchNoAppointment(req *equipment2.IdReq, info request.UserInf
 	s.Dao.DB.Model("base_equipment_qualification").Where("EquipmentId = " +
 		strconv.Itoa(req.EquipmentId) + " and UserId = " +
 		strconv.Itoa(gconv.Int(info.Id))).Order("Qualification").Scan(&qualificationInfo)
-	if len(qualificationInfo) >= 1 && qualificationInfo[0].Qualification == "1" && equipmentInfo.IsAppointAvailable!=1 { // 只有普通预约资格,限制周末预约时间段// 如果没有开启默认可预约 则进行时间段限制
+	if len(qualificationInfo) >= 1 && qualificationInfo[0].Qualification == "1" && equipmentInfo.IsAppointAvailable != 1 { // 只有普通预约资格,限制周末预约时间段// 如果没有开启默认可预约 则进行时间段限制
 		startTime := equipmentInfo.BeginAt
 		endTime := equipmentInfo.EndAt
 		// 设备当天预约时间总长度h

service/instrument_surcharge/instrument_surcharge.go

@@ -75,4 +75,4 @@ func (s Service) Save(req selfModel.InstrumentSurchargeSaveReq, user request.Use
 func (s Service) Delete(req selfModel.InstrumentSurchargeDeleteReq) error {
 	_, err := s.Dao.M.Delete(fmt.Sprintf("Id='%v'", req.Id))
 	return err
-}
+}

service/settle_account_bill/settle_account_bill.go

@@ -26,7 +26,7 @@ func NewService(tenant string) Service {
 }
 
 // List 会议室列表
-func (s Service)  List(req model.ListReq, user request.UserInfo) ([]accountModel.BillInfo, int, error) {
+func (s Service) List(req model.ListReq, user request.UserInfo) ([]accountModel.BillInfo, int, error) {
 	entityModel := s.Dao.M
 	where := "1=1"
 
@@ -43,9 +43,9 @@ func (s Service)  List(req model.ListReq, user request.UserInfo) ([]accountModel
 			where += fmt.Sprintf(" AND settle_account_bill.Status='%v'", entity.Status)
 		}
 		if entity.SettleDate != "" {
-			timelist := strings.Split(entity.SettleDate,",")
+			timelist := strings.Split(entity.SettleDate, ",")
 			if len(timelist) == 2 {
-				where += fmt.Sprintf(" AND settle_account_bill.SettleDate>='%v' AND settle_account_bill.SettleDate<='%v'", timelist[0],timelist[1])
+				where += fmt.Sprintf(" AND settle_account_bill.SettleDate>='%v' AND settle_account_bill.SettleDate<='%v'", timelist[0], timelist[1])
 			}
 		}
 		if entity.SettleUser != "" {
@@ -57,7 +57,7 @@ func (s Service)  List(req model.ListReq, user request.UserInfo) ([]accountModel
 		if entity.StartDate != "" && entity.EndDate != "" {
 			where += fmt.Sprintf(" AND settle_account_bill.StartDate>='%v' AND settle_account_bill.EndDate<='%v'", entity.StartDate, entity.EndDate)
 		}
-		if entity.IsSelf != "1" {  // 1 查看全部；其他 查看自己
+		if entity.IsSelf != "1" { // 1 查看全部；其他 查看自己
 			where += fmt.Sprintf(" AND settle_account_bill.MainUserId='%v'", user.Id)
 		}
 	}
@@ -105,7 +105,7 @@ func (s Service) Settle(req accountModel.AccountBillSettleReq, user request.User
 	if err != nil {
 		return err
 	}
-	
+
 	_, err = tx.Update("settle_account_bill", fmt.Sprintf("Status='2',SettleUserId='%v',SettleUser='%v',SettleDate='%v'", user.Id, user.RealName, gtime.Now()), fmt.Sprintf("Id='%v'", req.BillId))
 	if err != nil {
 		tx.Rollback()
@@ -132,7 +132,7 @@ func (s Service) Confirm(req accountModel.AccountBillConfirmReq, user request.Us
 	if req.BillId == 0 {
 		return errors.New("参数缺失")
 	}
-	total,_ := s.Dao.DB.Model("settle_account_main").Where(fmt.Sprintf("BillId='%v' And SettleStatus='0'",req.BillId)).Count()
+	total, _ := s.Dao.DB.Model("settle_account_main").Where(fmt.Sprintf("BillId='%v' And SettleStatus='0'", req.BillId)).Count()
 	if total > 0 {
 		return errors.New("实验明细有未确认项，不可确认")
 	}
@@ -359,4 +359,4 @@ type AutoConfirmRecord struct {
 	Id             int         `orm:"Id,primary"     json:"id"`               // 主键
 	BillIds        string      `orm:"BillIds"        json:"bill_ids"`         // 账单Ids
 	AutoSettleDate *gtime.Time `orm:"AutoSettleDate" json:"auto_settle_date"` // 自动确认时间
-}
+}

service/settle_account_detail/settle_account_detail.go

@@ -56,4 +56,4 @@ func (s Service) List(req model.ListReq) ([]accountModel.SettleAccountDetail, er
 	}
 
 	return list, nil
-}
+}

service/settle_account_main/settle_account_main.go

@@ -99,9 +99,9 @@ func (s Service) List(req model.ListReq, user request.UserInfo) ([]accountModel.
 			where += fmt.Sprintf(" AND SettleDate>='%v' AND SettleDate<='%v'", entity.SettleStartDate, entity.SettleEndDate)
 		}
 		if entity.VerificationDate != "" {
-			timelist := strings.Split(entity.VerificationDate,",")
+			timelist := strings.Split(entity.VerificationDate, ",")
 			if len(timelist) == 2 {
-				where += fmt.Sprintf(" AND VerificationDate>='%v' AND VerificationDate<='%v'", timelist[0],timelist[1])
+				where += fmt.Sprintf(" AND VerificationDate>='%v' AND VerificationDate<='%v'", timelist[0], timelist[1])
 			}
 		}
 		if entity.NotInBill == "1" {
@@ -178,8 +178,8 @@ func (s Service) Add(req accountModel.AccountMainAddReq, user request.UserInfo)
 	req.Main.UpdateBy = user.RealName
 	req.Main.UpdateOn = now
 
-	req.Main.ActualStartDate = nil  // 默认有信息终端
-	req.Main.ActualEndDate = nil    // 默认有信息终端
+	req.Main.ActualStartDate = nil // 默认有信息终端
+	req.Main.ActualEndDate = nil   // 默认有信息终端
 
 	span := req.Main.AppointEndDate.Sub(req.Main.AppointStartDate)
 	req.Main.FeeTime = int(math.Ceil(span.Minutes()))
@@ -231,7 +231,7 @@ func (s Service) Add(req accountModel.AccountMainAddReq, user request.UserInfo)
 	}
 
 	req.Main.TotalPrice = 0
-	id , _ := result.LastInsertId()
+	id, _ := result.LastInsertId()
 	for index := range req.Details { // 更新必要信息
 		req.Details[index].CreateUserId = int(user.Id)
 		req.Details[index].CreateBy = user.RealName
@@ -247,7 +247,7 @@ func (s Service) Add(req accountModel.AccountMainAddReq, user request.UserInfo)
 			discount := float64(1) // 计算折扣
 			if req.Details[index].Data5 != "" {
 				d, _ := strconv.ParseFloat(req.Details[index].Data5, 64)
-				discount = 1 - d / 100
+				discount = 1 - d/100
 			}
 
 			req.Details[index].PaymentAccount = float64(req.Main.ActualMachineHour) * req.Details[index].UnitPrice * discount / 60 // 计算实际费用
@@ -255,8 +255,8 @@ func (s Service) Add(req accountModel.AccountMainAddReq, user request.UserInfo)
 		req.Main.TotalPrice += req.Details[index].PaymentAccount
 	}
 	baseAccount.Available -= req.Main.TotalPrice // 账户可用金额计算
-	
-	_, err =  tx.Insert("settle_account_detail", req.Details)
+
+	_, err = tx.Insert("settle_account_detail", req.Details)
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -434,7 +434,7 @@ func (s Service) Cancel(req accountModel.AccountMainCancelReq) error {
 		return err
 	}
 
-	return  tx.Commit()
+	return tx.Commit()
 }
 
 type Param struct {
@@ -451,4 +451,4 @@ type Param struct {
 	ModifiedOn     string `protobuf:"bytes,11,opt,name=modified_on,json=modifiedOn,proto3" json:"modified_on,omitempty"`
 	ModifiedUserId int32  `protobuf:"varint,12,opt,name=modified_user_id,json=modifiedUserId,proto3" json:"modified_user_id,omitempty"`
 	ModifiedBy     string `protobuf:"bytes,13,opt,name=modified_by,json=modifiedBy,proto3" json:"modified_by,omitempty"`
-}
+}

service/timers/timers.go

@@ -21,4 +21,4 @@ func (t Timer) Run() {
 			glog.Error(err.Error())
 		}
 	}
-}
+}