平台协议和私有协议应收订单，新增显示结算状态

commons/src/main/java/com/jzg/commons/entity/finance/po/InsPlyIncome.java

@@ -4,10 +4,16 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.jzg.commons.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+import java.io.Serial;
+
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Schema(description = "财务应收表")
 public class InsPlyIncome  extends BaseModel {
+    @Serial
+    private static final long serialVersionUID = 6161862008963938376L;
     private String id;
 
     @Schema(description = "订单号")
@@ -162,9 +168,12 @@ public class InsPlyIncome  extends BaseModel {
     @Schema(description = "业务来源")
     private String businessSource;
 
-    @Schema(description = "结算状态")
+    @Schema(description = "结算状态（编码）")
     private String settlementStatus;
 
+    @Schema(description = "结算状态(转义后)")
+    private String settlementStatusName;
+
     @Schema(description = "增加类型")
     private String addType;
 

tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -206,7 +206,7 @@ public class ReceivableController {
 
     @PostMapping("/getPlatFormReceivableList")
     @Operation(summary = "获取平台协议列表")
-    public HttpResult getPlatFormReceivableList(@RequestBody ReceivableQueryVo receivableQueryVo){
+    public HttpResult<Page<InsPlyIncome>> getPlatFormReceivableList(@RequestBody ReceivableQueryVo receivableQueryVo){
         if (StrUtil.isBlank(receivableQueryVo.getQueryType())){
             receivableQueryVo.setQueryType("1");
         }

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -171,7 +171,34 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     @Override
     public Page<InsPlyIncome> getReceivablePage(ReceivableQueryVo receivableQueryVo) {
         log.info("获取私有协议手续费列表。receivableQueryVo=[{}]", JSONUtil.toJsonStr(receivableQueryVo));
-        return baseMapper.getReceivablePage(receivableQueryVo.getPage(), receivableQueryVo);
+        Page<InsPlyIncome> page = baseMapper.getReceivablePage(receivableQueryVo.getPage(), receivableQueryVo);
+        List<InsPlyIncome> records = page.getRecords();
+        records = this.fillOtherInfo(records);
+        page.setRecords(records);
+        return page;
+    }
+
+
+    /**
+     * 填充必要的字段
+     *      进行转移等操作
+     * @author lipf
+     * @date 2026/5/11 11:37
+     */
+    List<InsPlyIncome> fillOtherInfo(List<InsPlyIncome> records){
+        if(CollUtil.isNotEmpty(records)){
+            records.forEach(insPlyIncome -> {
+                if("0".equals(insPlyIncome.getSettlementStatus())){
+                    insPlyIncome.setSettlementStatusName("未结算");
+                }else if("1".equals(insPlyIncome.getSettlementStatus())){
+                    insPlyIncome.setSettlementStatusName("已结算");
+                }else{
+                    insPlyIncome.setSettlementStatusName(insPlyIncome.getSettlementStatus());
+                }
+            });
+
+        }
+        return records;
     }
 
     @Override
@@ -919,7 +946,11 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
     @Override
     public Page<InsPlyIncome> getPlatFormReceivableList(ReceivableQueryVo receivableQueryVo) {
+        log.info("获取平台协议列表. receivableQueryVo=[{}]", JSONUtil.toJsonStr(receivableQueryVo));
         Page<InsPlyIncome> page = baseMapper.getReceivablePage(receivableQueryVo.getPage(), receivableQueryVo);
+        List<InsPlyIncome> records = page.getRecords();
+        records = this.fillOtherInfo(records);
+        page.setRecords(records);
         return page;
     }