冻结记录金额

app/dao/local_life_dao.go

@@ -735,7 +735,7 @@ func (d LocalLifeDao) GetTaskInviteToDo(enterpriseId string, subAccountId int64,
 func (d LocalLifeDao) GetLocalFrozenList(enterpriseId string) ([]*entity.LocalLifeInfo, error) {
 	var localLifes []*entity.LocalLifeInfo
 	query := Db.Debug().Model(entity.LocalLifeInfo{})
-	query.Select("local_id, store_id, enterprise_id, sub_account_id, local_platform, payment_amount, pay_at") // 冻结金额：payment_amount
+	query.Select("local_id, store_id, enterprise_id, sub_account_id, local_platform, need_pay, settlement_amount, pay_at") // 冻结金额：payment_amount
 	err := query.Where(fmt.Sprintf("enterprise_id = ? AND local_type = ? AND (task_status between 7 and 8) "), enterpriseId, 1).Find(&localLifes).Error
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -751,7 +751,7 @@ func (d LocalLifeDao) GetLocalFrozenList(enterpriseId string) ([]*entity.LocalLi
 func (d LocalLifeDao) GetLocalFrozenCancelList(enterpriseId string) ([]*entity.LocalLifeInfo, error) {
 	var localLifes []*entity.LocalLifeInfo
 	query := Db.Debug().Model(entity.LocalLifeInfo{})
-	query.Select("local_id, store_id, enterprise_id, sub_account_id, local_platform, settlement_amount, pay_at") // 解冻金额：settlement_amount
+	query.Select("local_id, store_id, enterprise_id, sub_account_id, local_platform, need_pay, settlement_amount, pay_at") // 解冻金额：settlement_amount
 	err := query.Where(fmt.Sprintf("enterprise_id = ? AND local_type = ? AND (task_status between 9 and 10) "), enterpriseId, 1).Find(&localLifes).Error
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {

app/dao/project_dao.go

@@ -320,7 +320,7 @@ func (d ProjectDAO) GetProjectTargetList(param *vo.DefaultSearchParam) ([]vo.ReT
 func (d ProjectDAO) GetProjectFrozenList(enterpriseId string) ([]*entity.Project, error) {
 	var projects []*entity.Project
 	query := Db.Debug().Model(entity.Project{})
-	query.Select("project_id, product_id, enterprise_id, sub_account_id, project_platform, payment_amount, pay_at") // 冻结金额：payment_amount
+	query.Select("project_id, product_id, enterprise_id, sub_account_id, project_platform, need_pay, settlement_amount, pay_at") // 冻结金额：payment_amount（2025.7.20决定用need_pay）
 	err := query.Where(fmt.Sprintf("enterprise_id = ? AND project_type = ? AND (project_status between 7 and 8) "), enterpriseId, 1).Find(&projects).Error
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -336,7 +336,7 @@ func (d ProjectDAO) GetProjectFrozenList(enterpriseId string) ([]*entity.Project
 func (d ProjectDAO) GetProjectFrozenCancelList(enterpriseId string) ([]*entity.Project, error) {
 	var projects []*entity.Project
 	query := Db.Debug().Model(entity.Project{})
-	query.Select("project_id, product_id, enterprise_id, sub_account_id, project_platform, settlement_amount, pay_at") // 解冻金额：settlement_amount
+	query.Select("project_id, product_id, enterprise_id, sub_account_id, project_platform, need_pay, settlement_amount, pay_at") // 解冻金额：settlement_amount
 	err := query.Where(fmt.Sprintf("enterprise_id = ? AND project_type = ? AND (project_status between 9 and 10) "), enterpriseId, 1).Find(&projects).Error
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {

app/dao/selection_info_dao.go

@@ -204,7 +204,7 @@ func (d SelectionInfoDAO) GetSelectionInfoList(value int64, fieldName string) ([
 func (d SelectionInfoDAO) GetSelectionFrozenList(enterpriseId string) ([]*entity.SelectionInfo, error) {
 	var selectionInfos []*entity.SelectionInfo
 	query := Db.Debug().Model(entity.SelectionInfo{})
-	query.Select("selection_id, product_id, enterprise_id, sub_account_id, platform, estimated_cost, pay_at") // 冻结金额：estimated_cost
+	query.Select("selection_id, product_id, enterprise_id, sub_account_id, platform, estimated_cost, settlement_amount, pay_at") // 冻结金额：estimated_cost 冻结解除金额：settlement_amount
 	err := query.Where(fmt.Sprintf("enterprise_id = ? AND (selection_status between 5 and 6) "), enterpriseId).Find(&selectionInfos).Error
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -220,7 +220,7 @@ func (d SelectionInfoDAO) GetSelectionFrozenList(enterpriseId string) ([]*entity
 func (d SelectionInfoDAO) GetSelectionFrozenCancelList(enterpriseId string) ([]*entity.SelectionInfo, error) {
 	var selectionInfos []*entity.SelectionInfo
 	query := Db.Debug().Model(entity.SelectionInfo{})
-	query.Select("selection_id, product_id, enterprise_id, sub_account_id, platform, settlement_amount, pay_at") // 解冻金额：settlement_amount
+	query.Select("selection_id, product_id, enterprise_id, sub_account_id, platform, estimated_cost, settlement_amount, pay_at") // 解冻金额：settlement_amount
 	err := query.Where(fmt.Sprintf("enterprise_id = ? AND (selection_status between 7 and 8) "), enterpriseId).Find(&selectionInfos).Error
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {

app/service/recharge_service.go

@@ -318,7 +318,7 @@ func (s RechargeService) FrozenInfoList(param *vo.BalanceParam) (vo.ResultVO, er
 		reBalanceShows = append(reBalanceShows, reBalanceShow)
 	}
 	for _, localLife := range localLifes {
-		// 获取商品详情字段
+		// 获取门店详情字段
 		var creatorName string
 		var storName string
 		var price float64
@@ -340,7 +340,7 @@ func (s RechargeService) FrozenInfoList(param *vo.BalanceParam) (vo.ResultVO, er
 			price = 0.0
 		}
 		mainImage, err = dao.ProductPhotoDAO{}.GetMainPhotoByProductID(localLife.StoreID)
-		// 品牌种草汇总
+		// 本地生活汇总
 		reBalanceShow := &vo.ReFrozenInfo{
 			ProductId:     localLife.StoreID,
 			MainImage:     mainImage,