From 5c43c3852df24be7c0f5fba72a98050ae0cc616d Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Tue, 16 May 2023 10:52:22 +0800 Subject: [PATCH 01/11] task:4173 --- .../dao/GroupManagementMapper.java | 2 ++ .../service/GroupManagementService.java | 8 +++++++ .../impl/GroupManagementServiceImpl.java | 21 +++++++++++++++++++ .../mybatis/mapper/GroupManagementMapper.xml | 5 +++++ .../openapi/protocol/v4/order/DdtxxBO.java | 5 +++++ ...AllocateInvoiceInterfaceServiceImplV3.java | 7 +++++++ .../consumer/utils/BeanTransitionUtils.java | 2 ++ 7 files changed, 50 insertions(+) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java index 462581f9..dce49143 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java @@ -41,4 +41,6 @@ public interface GroupManagementMapper { * 删除组织信息 */ int deleteGroup(@Param(value = "id") String id); + + int countEntIdNumByXfnsrsbh(@Param("xfnsrsbh") String xfnsrsbh); } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java index 81300c51..76b7e2bd 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java @@ -53,4 +53,12 @@ public interface GroupManagementService { * 根据组织id集合查询组织信息 */ List queryByGroupIdList(List groupIdList); + + /** + * 判断是不是内部关联交易且是一个税号对应多个公司代码的填上备注 + * @param entId + * @param ghfId + * @return + */ + Boolean checkInvoiceRemarksFlag(String entId,String ghfId); } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java index d590e3e0..1c7501d7 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java @@ -206,6 +206,27 @@ public class GroupManagementServiceImpl implements GroupManagementService { return groupManagementMapper.queryByGroupIdList(groupIdList, OrderInfoEnum.ORDER_KPZZGL_CXLX_1.getKey()); } + @Override + @Transactional(readOnly = true) + public Boolean checkInvoiceRemarksFlag(String xfnsrsbh, String ghfId) { + if (StringUtils.isBlank(xfnsrsbh)) { + return Boolean.FALSE; + } + if (StringUtils.isBlank(ghfId)) { + return Boolean.FALSE; + } + if (groupManagementMapper.countEntIdNumByXfnsrsbh(xfnsrsbh) <= 1) { + return Boolean.FALSE; + } + if (ghfId.length()<=6) { + return Boolean.FALSE; + } + if (!"000006".equals(ghfId.substring(0,6))) { + return Boolean.FALSE; + } + return Boolean.TRUE; + } + /** * 构建组织树集合 */ diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml index 106165a1..e95e0529 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml @@ -82,6 +82,11 @@ ORDER BY update_time DESC + INSERT INTO diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdtxxBO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdtxxBO.java index 0d35f90f..32e56c77 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdtxxBO.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdtxxBO.java @@ -368,5 +368,10 @@ public class DdtxxBO implements Serializable { */ private String KB; + /** + * 销方公司编码 + */ + private String XHFBM; + } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java index a64dbab0..5735a4c7 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java @@ -885,6 +885,13 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt } } } + // 拼接公司代码备注信息 + insertOrder.stream().forEach(item->{ + if (groupManagementService.checkInvoiceRemarksFlag(item.getEntId(), item.getGhfId())) { + item.setBz(item.getBz()+";销方公司代码:"+ddpcxxReq.getDDZXX().get(0).getDDTXX().getXHFBM()+",销方公司名称:"+item.getXhfMc()+";"); + } + }); + /* * 手动导入判断 diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 9cca1e03..c6ee2f5c 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3508,6 +3508,8 @@ public class BeanTransitionUtils { if(ConfigureConstant.STRING_1.equals(req.getZSFHZ())){ ddtxxBO.setTSCHBZ(ConfigureConstant.STRING_0); } + // 销方公司代码 + ddtxxBO.setXHFBM(deptEntity.getEnterpriseNumbers()); //明细信息 List ititem = req.getITITEM(); for (int i = 0; i < ititem.size(); i++) { From 480016ca779976920c7a6f35d76a37a124bcd873 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Tue, 16 May 2023 10:58:04 +0800 Subject: [PATCH 02/11] task:4173 --- .../service/impl/AllocateInvoiceInterfaceServiceImplV3.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java index 5735a4c7..7e017376 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java @@ -887,7 +887,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt } // 拼接公司代码备注信息 insertOrder.stream().forEach(item->{ - if (groupManagementService.checkInvoiceRemarksFlag(item.getEntId(), item.getGhfId())) { + if (groupManagementService.checkInvoiceRemarksFlag(item.getXhfNsrsbh(), item.getGhfId())) { item.setBz(item.getBz()+";销方公司代码:"+ddpcxxReq.getDDZXX().get(0).getDDTXX().getXHFBM()+",销方公司名称:"+item.getXhfMc()+";"); } }); From a6c53f04d02c5470c68ccdc5e359bbf9c5aa54d4 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Wed, 17 May 2023 16:54:22 +0800 Subject: [PATCH 03/11] task:4173 --- .../service/impl/AllocateInvoiceInterfaceServiceImplV3.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java index 1afbe2d6..75c5f927 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java @@ -6,6 +6,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONObject; import com.dxhy.base.constant.OrderSeparationException; import com.dxhy.base.constant.TaxSeparateConfig; import com.dxhy.base.utils.PriceTaxSeparationUtilNew; @@ -887,6 +888,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt // 拼接公司代码备注信息 insertOrder.stream().forEach(item->{ if (groupManagementService.checkInvoiceRemarksFlag(item.getXhfNsrsbh(), item.getGhfId())) { + log.info("ddpcxxReq:{}", JSONObject.toJSONString(ddpcxxReq)); item.setBz(item.getBz()+";销方公司代码:"+ddpcxxReq.getDDZXX().get(0).getDDTXX().getXHFBM()+",销方公司名称:"+item.getXhfMc()+";"); } }); From 54f77bb255bcac4807d4fc094ff4f8a7b9741742 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Wed, 17 May 2023 17:08:45 +0800 Subject: [PATCH 04/11] task:4173 test --- .../java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 159797b9..f66209ad 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; +import com.alibaba.fastjson.JSONObject; import com.dxhy.order.baseservice.module.buyer.model.BuyerEntity; import com.dxhy.order.baseservice.module.buyer.protocol.GmfxxCommonBO; import com.dxhy.order.baseservice.module.buyer.protocol.GmfxxtbReqBO; @@ -3581,6 +3582,7 @@ public class BeanTransitionUtils { ddzxxList.add(ddzxxBO); ddpcxxReqBO.setDDPCXX(ddpcxxBO); ddpcxxReqBO.setDDZXX(ddzxxList); + log.info("转换后的DdpcxxReqBO:{}", JSONObject.toJSONString(ddpcxxReqBO)); return ddpcxxReqBO; } From deb27e7ef6c09c24626dcb066d0db715a375e81d Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Wed, 17 May 2023 17:10:05 +0800 Subject: [PATCH 05/11] task:4173 test --- .../java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java | 1 + 1 file changed, 1 insertion(+) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index f66209ad..d52a6713 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3510,6 +3510,7 @@ public class BeanTransitionUtils { ddtxxBO.setTSCHBZ(ConfigureConstant.STRING_0); } // 销方公司代码 + log.info("传入的deptEntity:{}",JSONObject.toJSONString(deptEntity)); ddtxxBO.setXHFBM(deptEntity.getEnterpriseNumbers()); //明细信息 List ititem = req.getITITEM(); From e93491b628f2d3e2e0d78ffad9d3b6b91daf3c88 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Wed, 17 May 2023 17:32:44 +0800 Subject: [PATCH 06/11] task:4173 test --- .../thirdservice/user/service/impl/UserInfoServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java index a0d4fa7b..7be19d2a 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java @@ -389,7 +389,9 @@ public class UserInfoServiceImpl implements UserInfoService { if (StringUtils.isNotBlank(result)) { JSONObject jsonObject = JSON.parseObject(result); if (!jsonObject.isEmpty() && ConfigureConstant.STRING_0000.equals(jsonObject.get(OrderManagementConstant.CODE))) { - return JsonUtils.getInstance().parseObject(jsonObject.getString(OrderManagementConstant.DATA), DeptEntity.class); + DeptEntity deptEntity = JsonUtils.getInstance().parseObject(jsonObject.getString(OrderManagementConstant.DATA), DeptEntity.class); + deptEntity.setEnterpriseNumbers(jsonObject.getJSONObject(OrderManagementConstant.DATA).getString("enterpriseNumbers")); + return deptEntity; } } } catch (Exception e) { From e40595313c8e556eabcc38e62eb2ad7abe20178b Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Thu, 18 May 2023 08:17:56 +0800 Subject: [PATCH 07/11] task:4173 test --- .../thirdservice/user/service/impl/UserInfoServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java index 7be19d2a..d08e80b9 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java @@ -389,6 +389,8 @@ public class UserInfoServiceImpl implements UserInfoService { if (StringUtils.isNotBlank(result)) { JSONObject jsonObject = JSON.parseObject(result); if (!jsonObject.isEmpty() && ConfigureConstant.STRING_0000.equals(jsonObject.get(OrderManagementConstant.CODE))) { + log.info("用户信息json:{}", jsonObject.toJSONString()); + log.info("用户信息json enterpriseNumbers:{}", jsonObject.getJSONObject(OrderManagementConstant.DATA).getString("enterpriseNumbers")); DeptEntity deptEntity = JsonUtils.getInstance().parseObject(jsonObject.getString(OrderManagementConstant.DATA), DeptEntity.class); deptEntity.setEnterpriseNumbers(jsonObject.getJSONObject(OrderManagementConstant.DATA).getString("enterpriseNumbers")); return deptEntity; From 6a89e194f159523ac0e8e50331b733ac15a1af53 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Thu, 18 May 2023 08:28:52 +0800 Subject: [PATCH 08/11] task:4173 test --- .../module/thirdservice/user/model/DeptEntity.java | 4 ++-- .../thirdservice/user/service/impl/UserInfoServiceImpl.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/model/DeptEntity.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/model/DeptEntity.java index 237d55eb..c69564ce 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/model/DeptEntity.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/model/DeptEntity.java @@ -1,5 +1,6 @@ package com.dxhy.order.baseservice.module.thirdservice.user.model; +import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -12,8 +13,7 @@ import java.util.Date; * @author: yaoxuguang * @createDate: Created in 2020/4/8 18:22 */ -@Setter -@Getter +@Data public class DeptEntity implements Serializable { /** diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java index d08e80b9..7eef6ee3 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java @@ -392,6 +392,7 @@ public class UserInfoServiceImpl implements UserInfoService { log.info("用户信息json:{}", jsonObject.toJSONString()); log.info("用户信息json enterpriseNumbers:{}", jsonObject.getJSONObject(OrderManagementConstant.DATA).getString("enterpriseNumbers")); DeptEntity deptEntity = JsonUtils.getInstance().parseObject(jsonObject.getString(OrderManagementConstant.DATA), DeptEntity.class); + log.info("用户信息deptEntity:{}", JSONObject.toJSONString(deptEntity)); deptEntity.setEnterpriseNumbers(jsonObject.getJSONObject(OrderManagementConstant.DATA).getString("enterpriseNumbers")); return deptEntity; } From 4d8c1756c6618f31a98f5e2cd5eae2c94f86c026 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Thu, 18 May 2023 08:38:58 +0800 Subject: [PATCH 09/11] task:4173 test --- .../user/service/impl/UserInfoServiceImpl.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java index 7eef6ee3..db567091 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java @@ -389,12 +389,7 @@ public class UserInfoServiceImpl implements UserInfoService { if (StringUtils.isNotBlank(result)) { JSONObject jsonObject = JSON.parseObject(result); if (!jsonObject.isEmpty() && ConfigureConstant.STRING_0000.equals(jsonObject.get(OrderManagementConstant.CODE))) { - log.info("用户信息json:{}", jsonObject.toJSONString()); - log.info("用户信息json enterpriseNumbers:{}", jsonObject.getJSONObject(OrderManagementConstant.DATA).getString("enterpriseNumbers")); - DeptEntity deptEntity = JsonUtils.getInstance().parseObject(jsonObject.getString(OrderManagementConstant.DATA), DeptEntity.class); - log.info("用户信息deptEntity:{}", JSONObject.toJSONString(deptEntity)); - deptEntity.setEnterpriseNumbers(jsonObject.getJSONObject(OrderManagementConstant.DATA).getString("enterpriseNumbers")); - return deptEntity; + return JsonUtils.getInstance().parseObject(jsonObject.getString(OrderManagementConstant.DATA), DeptEntity.class); } } } catch (Exception e) { @@ -468,6 +463,7 @@ public class UserInfoServiceImpl implements UserInfoService { deptEntityNew.setTaxpayerAccount(groupManagementEntity.getXhfZh()); deptEntityNew.setInvoiceName(groupManagementEntity.getXhfMc()); deptEntityNew.setInvoiceNsrsbh(groupManagementEntity.getXhfNsrsbh()); + deptEntityNew.setEnterpriseNumbers(deptEntity.getEnterpriseNumbers()); } } return deptEntityNew; From 02a953fe0e5cb6e9ce7014e86725e9269cdd9785 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Thu, 18 May 2023 09:13:56 +0800 Subject: [PATCH 10/11] task:4173 test --- .../service/GroupManagementService.java | 7 ---- .../impl/GroupManagementServiceImpl.java | 20 ------------ .../order/consumer/dao/GsClientMapper.java | 2 ++ .../order/service/OrderInfoService.java | 9 ++++++ .../service/impl/OrderInfoServiceImpl.java | 32 +++++++++++++++++++ ...AllocateInvoiceInterfaceServiceImplV3.java | 5 ++- .../mybatis/mapper/GsClientMapper.xml | 6 ++++ 7 files changed, 53 insertions(+), 28 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java index 76b7e2bd..03ccdd05 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java @@ -54,11 +54,4 @@ public interface GroupManagementService { */ List queryByGroupIdList(List groupIdList); - /** - * 判断是不是内部关联交易且是一个税号对应多个公司代码的填上备注 - * @param entId - * @param ghfId - * @return - */ - Boolean checkInvoiceRemarksFlag(String entId,String ghfId); } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java index 1c7501d7..3253db74 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java @@ -206,26 +206,6 @@ public class GroupManagementServiceImpl implements GroupManagementService { return groupManagementMapper.queryByGroupIdList(groupIdList, OrderInfoEnum.ORDER_KPZZGL_CXLX_1.getKey()); } - @Override - @Transactional(readOnly = true) - public Boolean checkInvoiceRemarksFlag(String xfnsrsbh, String ghfId) { - if (StringUtils.isBlank(xfnsrsbh)) { - return Boolean.FALSE; - } - if (StringUtils.isBlank(ghfId)) { - return Boolean.FALSE; - } - if (groupManagementMapper.countEntIdNumByXfnsrsbh(xfnsrsbh) <= 1) { - return Boolean.FALSE; - } - if (ghfId.length()<=6) { - return Boolean.FALSE; - } - if (!"000006".equals(ghfId.substring(0,6))) { - return Boolean.FALSE; - } - return Boolean.TRUE; - } /** * 构建组织树集合 diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/GsClientMapper.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/GsClientMapper.java index bf7b5868..5af00c41 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/GsClientMapper.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/GsClientMapper.java @@ -24,4 +24,6 @@ public interface GsClientMapper { int updateByPrimaryKeySelective(GsClient record); int updateByPrimaryKey(GsClient record); + + int countGsdm(@Param("gsdm") String gsdm); } \ No newline at end of file diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java index 3c710b11..b0d8c314 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java @@ -220,4 +220,13 @@ public interface OrderInfoService { @Transactional R mergeOrderItem(String entId,String orderInfoId,List itemList); + + + /** + * 判断是不是内部关联交易且是一个税号对应多个公司代码的填上备注 + * @param entId + * @param ghfId + * @return + */ + Boolean checkInvoiceRemarksFlag(String entId,String ghfId); } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 5da67c2f..b80a8040 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -12,6 +12,7 @@ import com.dxhy.order.baseservice.config.BaseServiceConfig; import com.dxhy.order.baseservice.module.buyer.model.BuyerEntity; import com.dxhy.order.baseservice.module.buyer.service.BuyerService; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; +import com.dxhy.order.baseservice.module.groupmanagement.dao.GroupManagementMapper; import com.dxhy.order.baseservice.module.taxclass.dao.TaxClassCodeMapper; import com.dxhy.order.baseservice.module.thirdservice.simsback.service.SimsBackService; import com.dxhy.order.baseservice.module.thirdservice.user.model.DeptEntity; @@ -21,6 +22,7 @@ import com.dxhy.order.constant.OrderInfoContentEnum; import com.dxhy.order.constant.OrderInfoEnum; import com.dxhy.order.constant.OrderManagementConstant; import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper; +import com.dxhy.order.consumer.dao.GsClientMapper; import com.dxhy.order.consumer.dao.OrderBatchRequestMapper; import com.dxhy.order.consumer.dao.OrderProcessInfoMapper; import com.dxhy.order.consumer.model.OderDetailInfo; @@ -164,6 +166,12 @@ public class OrderInfoServiceImpl implements OrderInfoService { @Resource private OrderBatchRequestMapper orderBatchRequestMapper; + @Resource + private GroupManagementMapper groupManagementMapper; + + @Resource + private GsClientMapper gsClientMapper; + @Override public PageUtils selectOrderInfo(Map map, List shList, List entList) { return orderProcessService.selectOrderInfo(map, shList, entList); @@ -1916,6 +1924,30 @@ public class OrderInfoServiceImpl implements OrderInfoService { return R.ok(); } + @Override + @Transactional(readOnly = true) + public Boolean checkInvoiceRemarksFlag(String xfnsrsbh, String ghfId) { + if (StringUtils.isBlank(xfnsrsbh)) { + return Boolean.FALSE; + } + if (StringUtils.isBlank(ghfId)) { + return Boolean.FALSE; + } + if (groupManagementMapper.countEntIdNumByXfnsrsbh(xfnsrsbh) <= 1) { + return Boolean.FALSE; + } + if (ghfId.length()<=6) { + return Boolean.FALSE; + } + if (!"000060".equals(ghfId.substring(0,6))) { + return Boolean.FALSE; + } + if (gsClientMapper.countGsdm(ghfId.replace("000060","")) == 0) { + return Boolean.FALSE; + } + return Boolean.TRUE; + } + private void completeCommodityMessageBySpid(OrderItemInfo item, CommodityCodeEntity commodity) { //商品编码 item.setSpbm(commodity.getSpbm()); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java index 75c5f927..d98a8700 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java @@ -132,6 +132,9 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt private GroupManagementService groupManagementService; @Resource private InvoiceRemarkSetService invoiceRemarkSetService; + + @Resource + private OrderInfoService orderInfoService; /** * 发票开具接口 * @@ -887,7 +890,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt } // 拼接公司代码备注信息 insertOrder.stream().forEach(item->{ - if (groupManagementService.checkInvoiceRemarksFlag(item.getXhfNsrsbh(), item.getGhfId())) { + if (orderInfoService.checkInvoiceRemarksFlag(item.getXhfNsrsbh(), item.getGhfId())) { log.info("ddpcxxReq:{}", JSONObject.toJSONString(ddpcxxReq)); item.setBz(item.getBz()+";销方公司代码:"+ddpcxxReq.getDDZXX().get(0).getDDTXX().getXHFBM()+",销方公司名称:"+item.getXhfMc()+";"); } diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/GsClientMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/GsClientMapper.xml index 1fb3487b..438e27e7 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/GsClientMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/GsClientMapper.xml @@ -22,6 +22,12 @@ from gs_client where gsdm = #{gsdm,jdbcType=VARCHAR} + + delete from gs_client From 57278aeca34ca406c68b5c3014b8ba7dd3f1e309 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Mon, 22 May 2023 09:14:52 +0800 Subject: [PATCH 11/11] =?UTF-8?q?task:4173=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index b80a8040..0a1199b1 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -1927,6 +1927,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { @Override @Transactional(readOnly = true) public Boolean checkInvoiceRemarksFlag(String xfnsrsbh, String ghfId) { + log.info("判断内部关联交易填写备注，xfnsrsbh:{},ghfId:{}",xfnsrsbh, ghfId); if (StringUtils.isBlank(xfnsrsbh)) { return Boolean.FALSE; }