other

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/EntTypeEnum.java

@@ -71,27 +71,39 @@ public enum EntTypeEnum {
                 || entTypes.contains(String.valueOf(EntTypeEnum.LOGISTICS3.getCode()));
     }
 
+
+    /**
+     * @desc 获取企业是承运单位类型值（4P物流、3P物流）
+     * @author zk
+     * @date 2023/10/7
+     **/
+    public static String carrier() {
+        return EntTypeEnum.LOGISTICS3.getCode() + Global.COMMA + EntTypeEnum.LOGISTICS4.getCode();
+    }
     /**
      * @param entTypes 企业属性
-     * @desc 校验企业是否为承运单位（4P物流、3P物流）
+     * @desc 校验企业是否为托运单位（供应商、采购商、4P物流）
      * @author zk
      * @date 2023/10/7
      **/
-    public static Boolean carrier(String entTypes) {
-        if (StringUtils.isBlank(entTypes)) {
-            return null;
+    public static boolean consign(String entTypes) {
+        if(StringUtils.isBlank(entTypes)){
+            return false;
         }
-        return entTypes.contains(String.valueOf(EntTypeEnum.LOGISTICS3.getCode()))
-                || entTypes.contains(String.valueOf(EntTypeEnum.LOGISTICS4.getCode()));
+        return entTypes.contains(String.valueOf(EntTypeEnum.SUPPLIER.getCode()))
+                || entTypes.contains(String.valueOf(EntTypeEnum.PURCHASER.getCode()));
     }
-
     /**
-     * @desc 获取企业是承运单位类型值（4P物流、3P物流）
+     * @param entTypes 企业属性
+     * @desc 校验企业是否为承运单位（物流企业）
      * @author zk
      * @date 2023/10/7
      **/
-    public static String carrier() {
-        return EntTypeEnum.LOGISTICS3.getCode() + Global.COMMA + EntTypeEnum.LOGISTICS4.getCode();
+    public static boolean carrier(String entTypes) {
+        if(StringUtils.isBlank(entTypes)){
+            return false;
+        }
+        return entTypes.contains(String.valueOf(EntTypeEnum.LOGISTIC.getCode()));
     }
 
 

sckw-common/sckw-common-core/src/main/java/com/sckw/core/web/response/result/PageDataResult.java

@@ -1,6 +1,7 @@
 package com.sckw.core.web.response.result;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.pagehelper.PageInfo;
 import lombok.Data;
 
 import java.io.Serial;
@@ -77,5 +78,20 @@ public class PageDataResult<T> implements Serializable {
         return pageResult;
     }
 
+    public static <T> PageDataResult<T> of(PageInfo<T> page) {
+        PageDataResult<T> pageResult = new PageDataResult<>();
+        pageResult.setPageNum(page.getPageNum());
+        pageResult.setPageSize(page.getSize());
+        pageResult.setTotal(page.getTotal());
+        // 修正总页数计算
+        if(page.getSize()==0){
+            pageResult.setPages(0);
+        }else {
+            pageResult.setPages((int) ((page.getTotal() + page.getSize() - 1) / page.getSize()));
+        }
+        pageResult.setList(page.getList());
+        return pageResult;
+    }
+
 
 }

sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/RemoteContractService.java

@@ -1,8 +1,10 @@
 package com.sckw.contract.api;
 
 import com.sckw.contract.api.model.dto.req.ContractAuditPara;
+import com.sckw.contract.api.model.dto.req.TradeEntListQueryFeignDto;
 import com.sckw.contract.api.model.dto.res.*;
 import com.sckw.contract.api.model.vo.*;
+import com.sckw.core.web.response.BaseResult;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -197,4 +199,5 @@ public interface RemoteContractService {
 
     ProxyContractVo queryProxyContract(Long goodsId);
 
+    BaseResult<List<TradeEntInfoResVo>> queryPrepaidTradeEntIds(TradeEntListQueryFeignDto queryFeignDto);
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/controller/KwcContractLogisticsScoreController.java

@@ -2,13 +2,15 @@ package com.sckw.contract.controller;
 
 
 import com.github.pagehelper.PageInfo;
-import com.sckw.contract.model.dto.req.*;
+import com.sckw.contract.model.dto.req.LogisticsScoreApprovalDto;
+import com.sckw.contract.model.dto.req.LogisticsScoreDetailAddDto;
+import com.sckw.contract.model.dto.req.LogisticsScoreDetailQueryDto;
+import com.sckw.contract.model.dto.req.LogisticsScoreQueryDto;
 import com.sckw.contract.model.vo.res.LogisticsScoreDetailResVo;
 import com.sckw.contract.model.vo.res.LogisticsScoreResVo;
+import com.sckw.contract.service.IKwcContractLogisticsScoreService;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.controller.BaseController;
-import com.sckw.core.web.page.PageDomain;
-import com.sckw.core.web.page.TableSupport;
 import com.sckw.core.web.response.BaseResult;
 import com.sckw.core.web.response.result.PageDataResult;
 import io.swagger.v3.oas.annotations.Operation;
@@ -17,11 +19,10 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import com.sckw.contract.service.IKwcContractLogisticsScoreService;
 
 /**
  * 物流企业评分Controller
- * 
+ *
  * @author tangyishan
  * @date 2025-12-05
  */

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dubbo/RemoteContractServiceImpl.java

@@ -8,12 +8,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Sets;
 import com.sckw.contract.api.RemoteContractService;
 import com.sckw.contract.api.model.dto.req.ContractAuditPara;
+import com.sckw.contract.api.model.dto.req.TradeEntListQueryFeignDto;
 import com.sckw.contract.api.model.dto.res.*;
 import com.sckw.contract.api.model.vo.*;
 import com.sckw.contract.dao.*;
 import com.sckw.contract.model.KwcContractProxy;
 import com.sckw.contract.model.KwcContractProxyGoods;
-import com.sckw.contract.model.KwcContractProxy;
 import com.sckw.contract.model.KwcContractProxyUnit;
 import com.sckw.contract.model.dto.res.QueryContractValidCountResDto;
 import com.sckw.contract.model.entity.*;
@@ -34,7 +34,9 @@ import com.sckw.core.model.enums.EntTypeEnum;
 import com.sckw.core.model.enums.SigningWayEnum;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.web.context.LoginEntHolder;
 import com.sckw.core.web.context.LoginUserHolder;
+import com.sckw.core.web.response.BaseResult;
 import com.sckw.redis.constant.RedisConstant;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.transport.api.dubbo.TransportRemoteService;
@@ -1006,4 +1008,22 @@ public class RemoteContractServiceImpl implements RemoteContractService {
         return null;
     }
 
+    @Override
+    public BaseResult<List<TradeEntInfoResVo>> queryPrepaidTradeEntIds(TradeEntListQueryFeignDto queryFeignDto) {
+        if(queryFeignDto.getCurEntId() == null){
+            queryFeignDto.setCurEntId(LoginUserHolder.getEntId());
+        }
+        if(queryFeignDto.getTradeEntType() == null){
+            String entTypes = LoginEntHolder.get().getEntTypes();
+            if (entTypes.contains(String.valueOf(EntTypeEnum.SUPPLIER.getCode()))) {
+                queryFeignDto.setTradeEntType(EntTypeEnum.PURCHASER.getCode());
+            } else if (entTypes.contains(String.valueOf(EntTypeEnum.PURCHASER.getCode()))) {
+                queryFeignDto.setTradeEntType(EntTypeEnum.SUPPLIER.getCode());
+            } else {
+                return BaseResult.success(Collections.emptyList());
+            }
+        }
+        return BaseResult.success(kwcContractTradeService.queryTradeEntList(queryFeignDto));
+    }
+
 }