fix(账单): 财务账号隐藏优先级，默认按照Id正序

service/account/account.go

@@ -108,7 +108,7 @@ func (s AccountService) Calculate(req *account.CalculateAmountReq) error {
 	}
 
 	// 获取账号信息
-	result, err = s.Dao.DB.Model("base_account").Where(fmt.Sprintf("MainUserId='%v'", main.MainUserId)).Order("Advance ASC").FindOne()
+	result, err = s.Dao.DB.Model("base_account").Where(fmt.Sprintf("MainUserId='%v'", main.MainUserId)).Order("Advance ASC, Id ASC").FindOne()
 	if err != nil {
 		return err
 	}
@@ -177,7 +177,7 @@ func (s AccountService) GetBaseAccountById(req *account.SubAccountReq) (infos ac
 		if req.SubId != "" {
 			model = model.Where(fmt.Sprintf("b.UserId='%v'",req.SubId))
 		}
-		err = model.Fields("a.*").Order("Advance ASC").Scan(&infos.Records)
+		err = model.Fields("a.*").Order("Advance ASC, a.Id ASC").Scan(&infos.Records)
 		if err != nil {
 			return infos, err
 		}
@@ -188,7 +188,7 @@ func (s AccountService) GetBaseAccountById(req *account.SubAccountReq) (infos ac
 		if req.SubId != "" {
 			model = model.Where(fmt.Sprintf("a.MainUserId='%v'",req.SubId))
 		}
-		err = model.Fields("a.*").Order("Advance ASC").Scan(&infos.Records)
+		err = model.Fields("a.*").Order("Advance ASC, a.Id ASC").Scan(&infos.Records)
 		if err != nil {
 			return infos, err
 		}

service/settle_account_bill/settle_account_bill.go

@@ -188,7 +188,7 @@ func (s Service) GenerateBill() error {
 	for _, item := range accounts {
 		if accountMap[item.MainUserId].Id == 0 {
 			accountMap[item.MainUserId] = item
-		} else if accountMap[item.MainUserId].Advance > item.Advance {
+		} else if accountMap[item.MainUserId].MainUserId == item.MainUserId && (accountMap[item.MainUserId].Advance > item.Advance || (accountMap[item.MainUserId].Advance == item.Advance && accountMap[item.MainUserId].Id > item.Id)) {
 			accountMap[item.MainUserId] = item
 		}
 	}

service/settle_account_main/settle_account_main.go

@@ -153,7 +153,7 @@ func (s Service) Add(req accountModel.AccountMainAddReq, user request.UserInfo)
 	req.Main.AccountStatus = "0"
 
 	// 获取账户
-	result1, err := s.Dao.DB.Model("base_account").Where(fmt.Sprintf("MainUserId='%v'", req.Main.MainUserId)).Order("Advance ASC").FindOne()
+	result1, err := s.Dao.DB.Model("base_account").Where(fmt.Sprintf("MainUserId='%v'", req.Main.MainUserId)).Order("Advance ASC, Id ASC").FindOne()
 	if err != nil {
 		return err
 	}
@@ -277,7 +277,7 @@ func (s Service) Cancel(req accountModel.AccountMainCancelReq) error {
 	}
 
 	// 获取账户
-	result1, err := s.Dao.DB.Model("base_account").Where(fmt.Sprintf("MainUserId='%v'", main.MainUserId)).Order("Advance ASC").FindOne()
+	result1, err := s.Dao.DB.Model("base_account").Where(fmt.Sprintf("MainUserId='%v'", main.MainUserId)).Order("Advance ASC, Id ASC").FindOne()
 	if err != nil {
 		return err
 	}