feature(未出账单): 结算bug修复

service/settle_account_bill/settle_account_bill.go

@@ -70,7 +70,7 @@ func (s Service)  List(req model.ListReq, user request.UserInfo) ([]accountModel
 		return nil, 0, nil
 	}
 
-	res, err := entityModel.Page(req.Current, req.Size).Order("settle_account_bill.CreateOn DESC").Fields("settle_account_bill.*").FindAll()
+	res, err := entityModel.Page(req.Current, req.Size).Order("settle_account_bill.Id DESC").Fields("settle_account_bill.*").FindAll()
 	if err != nil {
 		return nil, 0, err
 	}
@@ -110,7 +110,7 @@ func (s Service) Settle(req accountModel.AccountBillSettleReq, user request.User
 		return err
 	}
 
-	_, err = tx.Update("base_account", fmt.Sprintf("Surplus=Surplus-%v", req.Amount), fmt.Sprintf("Id='%v'", req.Amount))
+	_, err = tx.Update("base_account", fmt.Sprintf("Surplus=Surplus-%v", req.Amount), fmt.Sprintf("Id='%v'", req.AccountId))
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -199,7 +199,7 @@ 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()
+	all, err = s.Dao.DB.Model("settle_account_main").Where(fmt.Sprintf("CreateOn>='%v' AND CreateOn<='%v' AND Status='0'", startDate, endDate)).FindAll()
 	if err != nil {
 		return err
 	}
@@ -265,6 +265,11 @@ func (s Service) GenerateBill() error {
 			tx.Rollback()
 			return err
 		}
+		_, err = tx.Update("settle_account_detail", fmt.Sprintf("BillId='%v'", id), fmt.Sprintf("pid IN (%v)", ids))
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
 	}
 
 	_, err = tx.Save("auto_confirm_record", auto) // 自动确认辅助表