ZiHangQin/electricity_bill_calc_service
1
0
Fork 0
forked from free-lancers/electricity_bill_calc_service
Code Pull Requests Activity

refactor(types):将日期时间类型提取到公共的类型定义包中。

Browse Source
This commit is contained in:
徐涛
2023-06-05 21:53:05 +08:00
parent c22e7e7dc0
commit 85f4d04a7f
11 changed files with 285 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vo/user.go
View File

@@ -3,6 +3,7 @@ package vo
import (
"electricity_bill_calc/model"
"electricity_bill_calc/tools/time"
"electricity_bill_calc/types"
st "time"
"github.com/shopspring/decimal"
@@ -29,6 +30,7 @@ func (u MGTAndOPSAccountCreationForm) IntoUser() *model.User {
func (u MGTAndOPSAccountCreationForm) IntoUserDetail() *model.UserDetail {
return &model.UserDetail{
Id: "",
Name: &u.Name,
Abbr: nil,
Region: nil,
@@ -36,7 +38,7 @@ func (u MGTAndOPSAccountCreationForm) IntoUserDetail() *model.UserDetail {
Contact: u.Contact,
Phone: u.Phone,
UnitServiceFee: decimal.Zero,
ServiceExpiration: model.SpecificDate(2099, st.December, 31),
ServiceExpiration: types.NewDate(2099, st.December, 31),
CreatedAt: time.Now(),
CreatedBy: nil,
LastModifiedAt: time.Now(),
@@ -80,7 +82,7 @@ func (u EnterpriseAccountCreationForm) IntoUserDetail() (*model.UserDetail, erro
Contact: u.Contact,
Phone: u.Phone,
UnitServiceFee: unitServiceFee,
ServiceExpiration: model.SpecificDate(2000, st.January, 1),
ServiceExpiration: types.NewDate(2000, st.January, 1),
CreatedAt: time.Now(),
CreatedBy: nil,
LastModifiedAt: time.Now(),