Selaa lähdekoodia

fix(账单): 时间格式化bug

likai 4 vuotta sitten
vanhempi
commit
9d91b93ae8

+ 2 - 2
service/settle_account_bill/settle_account_bill.go

@@ -289,7 +289,7 @@ func (s Service) GenerateBill() error {
 // 自动确认
 func (s Service) AutoConfirm() error {
 	now := gtime.Now()
-	fmt.Println(now.Format("Y-m-d H:m:s"))
+	fmt.Println(now.Format("Y-m-d H:i:s"))
 	endDate := now.Format("Y-m-d 23:59:59")
 	startDate := now.Format("Y-m-d 00:00:00")
 	var autos []AutoConfirmRecord
@@ -316,7 +316,7 @@ func (s Service) AutoConfirm() error {
 	ids := "-1"
 	for _, item := range autos {
 		ids += fmt.Sprintf(",%v", item.Id)
-		_, err = tx.Update("settle_account_main", fmt.Sprintf("VerificationUserId=0,VerificationUser='系统自动确认',VerificationDate='%v',SettleStatus='1'", now.Format("Y-m-d H:m:s")), fmt.Sprintf("BillId IN (%v) AND (VerificationUserId IS NULL OR VerificationUser='')", item.BillIds))
+		_, err = tx.Update("settle_account_main", fmt.Sprintf("VerificationUserId=0,VerificationUser='系统自动确认',VerificationDate='%v',SettleStatus='1'", now.Format("Y-m-d H:i:s")), fmt.Sprintf("BillId IN (%v) AND (VerificationUserId IS NULL OR VerificationUser='')", item.BillIds))
 		if err != nil {
 			tx.Rollback()
 			return err

+ 3 - 3
service/settle_account_main/settle_account_main.go

@@ -289,9 +289,9 @@ func (s Service) Cancel(req accountModel.AccountMainCancelReq) error {
 	var detail accountModel.SettleAccountDetail
 	detail.PaymentType = "1"
 	detail.PaymentAccount = 0
-	detail.Data1 = main.AppointStartDate.Format("Y-m-d H:m:s")
-	detail.Data2 = main.AppointEndDate.Format("Y-m-d H:m:s")
-	detail.Data3 = now.Format("Y-m-d H:m:s") // 取消时间
+	detail.Data1 = main.AppointStartDate.Format("Y-m-d H:i:s")
+	detail.Data2 = main.AppointEndDate.Format("Y-m-d H:i:s")
+	detail.Data3 = now.Format("Y-m-d H:i:s") // 取消时间
 	detail.Pid = main.Id
 
 	mins := main.AppointStartDate.Sub(now).Minutes()