From 74836b0047d94ef091adf674bd4caae61d7da523 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 21 Mar 2023 09:13:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E5=AD=97=E5=85=B8=EF=BC=8C?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E9=AA=8C=E6=94=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoOrderDetailBizController.java | 2 +- .../api/controller/inout/IoOrderReviewController.java | 1 - .../glxp/api/service/basic/UdiRelevanceService.java | 2 ++ .../service/basic/impl/UdiRelevanceServiceImpl.java | 11 +++++++++++ .../mybatis/mapper/basic/UdiRelevanceDao.xml | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index d08c6625..5fc60ab2 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -137,7 +137,7 @@ public class IoOrderDetailBizController extends BaseController { datas.add(addBizProductReqeust); } for (AddBizProductReqeust item : datas) { - UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(item.getRelId()); + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(item.getRelId()); // todo 查询产品是否已经通过认证 // 1111 diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index 920a5516..b8feb25a 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -97,7 +97,6 @@ public class IoOrderReviewController extends BaseController { if (orderEntity == null) { return ResultVOUtils.error(500, "未找到该业务单据"); } - if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) { return updateReview(getUser(), orderEntity); } else if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) { diff --git a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java index 6f615060..886af28a 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java @@ -50,6 +50,8 @@ public interface UdiRelevanceService { UdiRelevanceResponse selectGroupById(Long id); + UdiRelevanceResponse selectSupGroupById(Long id); + UdiRelevanceEntity selectUpdateByUuid(String uuid); UdiRelevanceEntity selectUpdateByThirdId(String thirdId); diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java index b429a1fe..12740dc4 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java @@ -177,6 +177,17 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { return data.get(0); return null; } + @Override + public UdiRelevanceResponse selectSupGroupById(Long id) { + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + filterUdiRelRequest.setId(id); + filterUdiRelRequest.setDiType(1); + List data = udiRelevanceDao.filterUdiJoinSup(filterUdiRelRequest); + if (data != null && data.size() > 0) + return data.get(0); + return null; + } + @Override public UdiRelevanceEntity selectUpdateByUuid(String uuid) { diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 6fe51a74..016c8fe5 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -165,7 +165,7 @@ basic_products.cplx, basic_products.hchzsb, basic_products.cpdls, - basic_products.price, + company_product_relevance.price, basic_products.basicPrductRemak1, basic_products.basicPrductRemak2, basic_products.basicPrductRemak3,