Browse Source

对方企业列表接口响应格式调整

tangyishan 1 tháng trước cách đây
mục cha
commit
18fc67ce81

+ 18 - 0
sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/model/dto/req/TradeEntListQueryFeignDto.java

@@ -0,0 +1,18 @@
+package com.sckw.contract.api.model.dto.req;
+
+import lombok.Data;
+
+/**
+ * 交易企业列表查询参数
+ */
+@Data
+public class TradeEntListQueryFeignDto {
+    /**
+     * 当前企业的 id
+     */
+    private Long curEntId;
+    /**
+     * 需要查询的对方企业类型 1-供应 2-采购 3-托运 4-承运
+     */
+    private Integer tradeEntType;
+}

+ 1 - 1
sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/dto/res/TradeEntInfoResVo.java → sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/model/dto/res/TradeEntInfoResVo.java

@@ -1,4 +1,4 @@
-package com.sckw.contract.model.dto.res;
+package com.sckw.contract.api.model.dto.res;
 
 import lombok.Data;
 

+ 4 - 4
sckw-modules/sckw-contract/src/main/java/com/sckw/contract/controller/KwcLogisticsContractController.java

@@ -1,7 +1,7 @@
 package com.sckw.contract.controller;
 
-import com.sckw.contract.model.dto.req.TradeEntListQueryFeignDto;
-import com.sckw.contract.model.dto.res.TradeEntInfoResVo;
+import com.sckw.contract.api.model.dto.req.TradeEntListQueryFeignDto;
+import com.sckw.contract.api.model.dto.res.TradeEntInfoResVo;
 import com.sckw.contract.model.vo.req.ContractDetailReq;
 import com.sckw.contract.model.vo.req.LogisticListReq;
 import com.sckw.contract.model.vo.req.QueryLogisticListReq;
@@ -46,8 +46,8 @@ public class KwcLogisticsContractController {
     }
 
     @PostMapping("queryTradeEntList")
-    public List<TradeEntInfoResVo> queryTradeEntList(@RequestBody TradeEntListQueryFeignDto queryFeignDto) {
-        return kwcContractLogisticsService.queryTradeEntList(queryFeignDto);
+    public BaseResult<List<TradeEntInfoResVo>> queryTradeEntList(@RequestBody TradeEntListQueryFeignDto queryFeignDto) {
+        return BaseResult.success(kwcContractLogisticsService.queryTradeEntList(queryFeignDto));
     }
 
     /**

+ 5 - 4
sckw-modules/sckw-contract/src/main/java/com/sckw/contract/controller/KwcPurchaseController.java

@@ -1,11 +1,12 @@
 package com.sckw.contract.controller;
 
-import com.sckw.contract.model.dto.req.TradeEntListQueryFeignDto;
+import com.sckw.contract.api.model.dto.req.TradeEntListQueryFeignDto;
 import com.sckw.contract.model.vo.req.IdReqVo;
 import com.sckw.contract.model.vo.req.QueryListReqVo;
-import com.sckw.contract.model.dto.res.TradeEntInfoResVo;
+import com.sckw.contract.api.model.dto.res.TradeEntInfoResVo;
 import com.sckw.contract.service.operateService.KwcContractTradeService;
 import com.sckw.core.model.enums.EntTypeEnum;
+import com.sckw.core.web.response.BaseResult;
 import com.sckw.core.web.response.HttpResult;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
@@ -44,8 +45,8 @@ public class KwcPurchaseController {
     }
 
     @PostMapping("queryTradeEntList")
-    public List<TradeEntInfoResVo> queryTradeEntList(@RequestBody TradeEntListQueryFeignDto queryFeignDto) {
-        return kwcContractTradeService.queryTradeEntList(queryFeignDto);
+    public BaseResult<List<TradeEntInfoResVo>> queryTradeEntList(@RequestBody TradeEntListQueryFeignDto queryFeignDto) {
+        return BaseResult.success(kwcContractTradeService.queryTradeEntList(queryFeignDto));
     }
 
     /**

+ 0 - 17
sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/dto/req/TradeEntListQueryFeignDto.java

@@ -1,17 +0,0 @@
-package com.sckw.contract.model.dto.req;
-
-import lombok.Data;
-
-/**
- * 交易企业列表查询参数
- *
- * @author tangyishan
- * @since 2026-02-03  10:18
- */
-@Data
-public class TradeEntListQueryFeignDto {
-    //当前企业的 id
-    private Long curEntId;
-    //需要查询的对方企业类型 1-供应 2-采购 3-托运 4-承运
-    private Integer tradeEntType;
-}