fix_冻结记录

app/schedule/auto_task_settle.go

@@ -65,7 +65,7 @@ func AutoSelectionSettleTask() {
 func AutoProjectSettleTask() {
 	log.Println("AutoProjectSettleTask running Start, Time :", time.Now())
 	var projectInfos []*entity.Project
-	err1 := dao.Db.Model(&entity.Project{}).Where("project_status = ? and settle_flag = ? ", 8, 1).Select("project_id, enterprise_id, need_pay").Find(&projectInfos).Error
+	err1 := dao.Db.Model(&entity.Project{}).Where("project_status = ? and settle_flag = ? ", 8, 1).Select("project_id, project_type, enterprise_id, need_pay").Find(&projectInfos).Error
 	if err1 != nil {
 		return
 	}
@@ -131,7 +131,7 @@ func AutoProjectSettleTask() {
 func AutoLocalLifeSettleTask() {
 	log.Println("AutoLocalLifeSettleTask running Start, Time :", time.Now())
 	var localLifeInfos []*entity.LocalLifeInfo
-	err1 := dao.Db.Model(&entity.LocalLifeInfo{}).Where("task_status = ? and settle_flag = ? ", 8, 1).Select("local_id, enterprise_id, need_pay").Find(&localLifeInfos).Error
+	err1 := dao.Db.Model(&entity.LocalLifeInfo{}).Where("task_status = ? and settle_flag = ? ", 8, 1).Select("local_id, local_type, enterprise_id, need_pay").Find(&localLifeInfos).Error
 	if err1 != nil {
 		return
 	}

app/service/recharge_service.go

@@ -348,10 +348,10 @@ func (t RechargeService) FrozenInfoCount(param *vo.BalanceParam) map[string]int6
 	var blockReleaseNum2 int64
 	// 冻结中
 	dao.Db.Model(entity.SelectionInfo{}).Where(fmt.Sprintf("enterprise_id = ? AND (selection_status between 5 and 6) "), param.EnterpriseId).Count(&blockNum1)
-	dao.Db.Model(entity.Project{}).Where(fmt.Sprintf("enterprise_id = ? AND (project_status between 7 and 8) "), param.EnterpriseId).Count(&blockNum2)
+	dao.Db.Model(entity.Project{}).Where(fmt.Sprintf("enterprise_id = ? AND project_type = ? AND (project_status between 7 and 8) "), param.EnterpriseId, 1).Count(&blockNum2)
 	// 冻结解除
 	dao.Db.Model(entity.SelectionInfo{}).Where(fmt.Sprintf("enterprise_id = ? AND (selection_status between 7 and 8) "), param.EnterpriseId).Count(&blockReleaseNum1)
-	dao.Db.Model(entity.Project{}).Where(fmt.Sprintf("enterprise_id = ? AND (project_status between 9 and 10) "), param.EnterpriseId).Count(&blockReleaseNum2)
+	dao.Db.Model(entity.Project{}).Where(fmt.Sprintf("enterprise_id = ? AND project_type = ? AND (project_status between 9 and 10) "), param.EnterpriseId, 1).Count(&blockReleaseNum2)
 
 	res["blockNum"] = blockNum1 + blockNum2
 	res["blockReleaseNum"] = blockReleaseNum1 + blockReleaseNum2