From 22cc583e70e20e1640fa55e1c640c3d88bd99e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Thu, 30 Nov 2023 10:35:53 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=AA=E8=83=BD?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=BC=80=E7=A5=A8=E7=BB=84=E7=BB=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/GroupManagementMapper.java | 2 + .../service/GroupManagementService.java | 2 + .../impl/GroupManagementServiceImpl.java | 5 ++ .../user/controller/UserController.java | 49 ++++++++++++++++- .../mybatis/mapper/GroupManagementMapper.xml | 52 +++++++++++++++++++ 5 files changed, 109 insertions(+), 1 deletion(-) 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 99281445..384102ab 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 @@ -46,4 +46,6 @@ public interface GroupManagementMapper { int countEntIdNumByXfnsrsbh(@Param("xfnsrsbh") String xfnsrsbh); List findAllGroupInfo(); + + int updateGroupByKey(@Param(value = "groupManagementEntity") GroupManagementEntity groupManagementEntity); } 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 1dd7d636..1ec2408f 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 @@ -55,4 +55,6 @@ public interface GroupManagementService { * 查询所有组织信息 */ List findAllGroupInfo(); + + int updateGroupByKey(GroupManagementEntity groupManagementEntity); } 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 bf4341b4..81b0f702 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 @@ -208,6 +208,11 @@ public class GroupManagementServiceImpl implements GroupManagementService { return groupManagementMapper.findAllGroupInfo(); } + @Override + public int updateGroupByKey(GroupManagementEntity groupManagementEntity) { + return groupManagementMapper.updateGroupByKey(groupManagementEntity); + } + /** * 构建组织树集合 diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java index 230cc292..ef0ac366 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java @@ -81,6 +81,7 @@ public class UserController { */ private void syncPhysicalGroupManagement(List taxplayercodeDeptList) { taxplayercodeDeptList.forEach(taxPlayerCodeDept -> { + log.debug("同步开票组织管理信息组织编码为：{}",taxPlayerCodeDept.getEnterpriseNumbers()); //查找出deptType不等于5 并且税号不为空（实体组织） 的数据 if (!ConfigureConstant.STRING_5.equals(Integer.toString(taxPlayerCodeDept.getDeptType())) && StringUtils.isNotBlank(taxPlayerCodeDept.getTaxpayerCode())) { @@ -91,6 +92,7 @@ public class UserController { String kpzzglKey = String.format(RedisConstant.REDIS_GROUP_MANAGEMENT_MESSAGE, key); String groupManagementResult = redisService.get(kpzzglKey); if(StringUtils.isNotBlank(groupManagementResult)){ + log.debug("同步开票组织管理---redis不为空"); GroupManagementEntity groupManagementEntity = JSON.parseObject(groupManagementResult, GroupManagementEntity.class); if(!StringUtils.equals(taxPlayerCodeDept.getName(), groupManagementEntity.getGroupName()) || !StringUtils.equals(taxPlayerCodeDept.getTaxpayerCode(), groupManagementEntity.getXhfNsrsbh()) @@ -115,12 +117,17 @@ public class UserController { groupManagementEntity.setEntId(taxPlayerCodeDept.getDeptId()); groupManagementEntity.setUsingEntId(taxPlayerCodeDept.getDeptId()); groupManagementEntity.setUpdateTime(new Date()); - groupManagementService.updateGroup(groupManagementEntity); + int count = groupManagementService.updateGroup(groupManagementEntity); + if (count == 0) { + log.debug("同步开票组织管理---id is not find"); + groupManagementService.updateGroupByKey(groupManagementEntity); + } //更新redis缓存 redisService.del(kpzzglKey); } } else { + log.debug("同步开票组织管理---redis is null"); //查询数据库 GroupManagementQuery groupManagementQuery = new GroupManagementQuery(); groupManagementQuery.setGroupId(taxPlayerCodeDept.getDeptId()); @@ -135,10 +142,15 @@ public class UserController { if(groupManagementEntityOptional.isPresent()){ GroupManagementEntity groupManagementEntity = groupManagementEntityOptional.get(); + boolean changed = isChanged(taxPlayerCodeDept, groupManagementEntity); + if (changed) { + updateGroup(taxPlayerCodeDept,groupManagementEntity); + } //新增redis缓存 String groupManagementStr = JSON.toJSONString(groupManagementEntity); redisService.set(kpzzglKey, groupManagementStr, RedisConstant.REDIS_EXPIRE_TIME_7DAYS); } else { + log.debug("同步开票组织管理---database is null"); GroupManagementEntity groupManagementEntity = new GroupManagementEntity(); groupManagementEntity.setId(DistributedKeyMaker.generateShotKey()); groupManagementEntity.setGroupId(taxPlayerCodeDept.getDeptId()); @@ -174,4 +186,39 @@ public class UserController { } }); } + + public boolean isChanged(TaxPlayerCodeDept taxPlayerCodeDept,GroupManagementEntity groupManagementEntity){ + + if(!StringUtils.equals(taxPlayerCodeDept.getName(), groupManagementEntity.getGroupName()) + || !StringUtils.equals(taxPlayerCodeDept.getTaxpayerCode(), groupManagementEntity.getXhfNsrsbh()) + || !StringUtils.equals(taxPlayerCodeDept.getName(), groupManagementEntity.getXhfMc()) + || !StringUtils.equals(taxPlayerCodeDept.getTaxpayerAddress(), groupManagementEntity.getXhfDz()) + || !StringUtils.equals(taxPlayerCodeDept.getTaxpayerPhone(), groupManagementEntity.getXhfDh()) + || !StringUtils.equals(taxPlayerCodeDept.getTaxpayerBank(), groupManagementEntity.getXhfYh()) + || !StringUtils.equals(taxPlayerCodeDept.getTaxpayerAccount(), groupManagementEntity.getXhfZh()) + || !StringUtils.equals(taxPlayerCodeDept.getDeptId(), groupManagementEntity.getEntId())) { + return true; + } + return false; + } + + public void updateGroup(TaxPlayerCodeDept taxPlayerCodeDept,GroupManagementEntity groupManagementEntity){ + String name = taxPlayerCodeDept.getName(); + String repl = "(" + taxPlayerCodeDept.getEnterpriseNumbers() + ")"; + String replace = taxPlayerCodeDept.getName().replace(repl, ""); + taxPlayerCodeDept.setName(replace); + groupManagementEntity.setGroupName(taxPlayerCodeDept.getName()); + groupManagementEntity.setXhfNsrsbh(taxPlayerCodeDept.getTaxpayerCode()); + groupManagementEntity.setXhfMc(taxPlayerCodeDept.getName()); + groupManagementEntity.setXhfDz(taxPlayerCodeDept.getTaxpayerAddress()); + groupManagementEntity.setXhfDh(taxPlayerCodeDept.getTaxpayerPhone()); + groupManagementEntity.setXhfYh(taxPlayerCodeDept.getTaxpayerBank()); + groupManagementEntity.setXhfZh(taxPlayerCodeDept.getTaxpayerAccount()); + groupManagementEntity.setEntId(taxPlayerCodeDept.getDeptId()); + groupManagementEntity.setUsingEntId(taxPlayerCodeDept.getDeptId()); + groupManagementEntity.setUpdateTime(new Date()); + groupManagementService.updateGroup(groupManagementEntity); + groupManagementEntity.setGroupName(name); + groupManagementEntity.setXhfMc(name); + } } 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 ed98190a..eaaf5f50 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 @@ -290,4 +290,56 @@ and del_flag='0' group by group_id + + + + UPDATE + sys_group_management + + + group_name = #{groupManagementEntity.groupName,jdbcType=VARCHAR}, + + + group_type = #{groupManagementEntity.groupType,jdbcType=CHAR}, + + + xhf_mc = #{groupManagementEntity.xhfMc,jdbcType=VARCHAR}, + + + xhf_dz = #{groupManagementEntity.xhfDz,jdbcType=VARCHAR}, + + + xhf_dh = #{groupManagementEntity.xhfDh,jdbcType=VARCHAR}, + + + xhf_yh = #{groupManagementEntity.xhfYh,jdbcType=VARCHAR}, + + + xhf_zh = #{groupManagementEntity.xhfZh,jdbcType=VARCHAR}, + + + data_source = #{groupManagementEntity.dataSource,jdbcType=CHAR}, + + + is_default = #{groupManagementEntity.defaultItem,jdbcType=CHAR}, + + + data_status = #{groupManagementEntity.dataStatus,jdbcType=CHAR}, + + + del_flag = #{groupManagementEntity.delFlag,jdbcType=CHAR}, + + + create_time = #{groupManagementEntity.createTime,jdbcType=TIMESTAMP}, + + + update_time = #{groupManagementEntity.updateTime,jdbcType=TIMESTAMP}, + + + WHERE + xhf_nsrsbh = #{groupManagementEntity.xhfNsrsbh,jdbcType=VARCHAR} + and ent_id = #{groupManagementEntity.entId,jdbcType=VARCHAR} + and del_flag = '0' + and data_source = '1' + From 203f4922eac31bed5061f8c4293146e60594343d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Thu, 30 Nov 2023 13:39:48 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=AA=E8=83=BD?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=BC=80=E7=A5=A8=E7=BB=84=E7=BB=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/controller/UserController.java | 7 +++++-- .../mybatis/mapper/GroupManagementMapper.xml | 19 ------------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java index ef0ac366..42a710d1 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java @@ -176,8 +176,11 @@ public class UserController { groupManagementEntity.setUsingEntId(taxPlayerCodeDept.getDeptId()); groupManagementEntity.setCreateTime(new Date()); groupManagementEntity.setUpdateTime(new Date()); - groupManagementService.insertGroup(groupManagementEntity); - + int count = groupManagementService.insertGroup(groupManagementEntity); + if (count == 0) { + log.debug("同步开票组织管理---未执行插入补偿"); + groupManagementService.updateGroupByKey(groupManagementEntity); + } //新增redis缓存 String groupManagementStr = JSON.toJSONString(groupManagementEntity); redisService.set(kpzzglKey, groupManagementStr, RedisConstant.REDIS_EXPIRE_TIME_7DAYS); 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 eaaf5f50..f90b88b3 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 @@ -299,9 +299,6 @@ group_name = #{groupManagementEntity.groupName,jdbcType=VARCHAR}, - - group_type = #{groupManagementEntity.groupType,jdbcType=CHAR}, - xhf_mc = #{groupManagementEntity.xhfMc,jdbcType=VARCHAR}, @@ -317,21 +314,6 @@ xhf_zh = #{groupManagementEntity.xhfZh,jdbcType=VARCHAR}, - - data_source = #{groupManagementEntity.dataSource,jdbcType=CHAR}, - - - is_default = #{groupManagementEntity.defaultItem,jdbcType=CHAR}, - - - data_status = #{groupManagementEntity.dataStatus,jdbcType=CHAR}, - - - del_flag = #{groupManagementEntity.delFlag,jdbcType=CHAR}, - - - create_time = #{groupManagementEntity.createTime,jdbcType=TIMESTAMP}, - update_time = #{groupManagementEntity.updateTime,jdbcType=TIMESTAMP}, @@ -340,6 +322,5 @@ xhf_nsrsbh = #{groupManagementEntity.xhfNsrsbh,jdbcType=VARCHAR} and ent_id = #{groupManagementEntity.entId,jdbcType=VARCHAR} and del_flag = '0' - and data_source = '1' From 3d4f9a5c5c09a39b5a0a2b04ee865aef58fa979e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Thu, 30 Nov 2023 13:59:18 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=AA=E8=83=BD?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=BC=80=E7=A5=A8=E7=BB=84=E7=BB=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/controller/UserController.java | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java index 42a710d1..51a43642 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java @@ -1,7 +1,9 @@ package com.dxhy.order.baseservice.module.thirdservice.user.controller; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.dxhy.order.constant.ConfigureConstant; import com.dxhy.order.constant.OrderInfoEnum; import com.dxhy.order.constant.OrderManagementConstant; @@ -25,9 +27,11 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; /** * 用户信息控制层 @@ -92,7 +96,7 @@ public class UserController { String kpzzglKey = String.format(RedisConstant.REDIS_GROUP_MANAGEMENT_MESSAGE, key); String groupManagementResult = redisService.get(kpzzglKey); if(StringUtils.isNotBlank(groupManagementResult)){ - log.debug("同步开票组织管理---redis不为空"); + log.debug("同步开票组织管理---redis不为空:{}", JSONObject.toJSONString(groupManagementResult)); GroupManagementEntity groupManagementEntity = JSON.parseObject(groupManagementResult, GroupManagementEntity.class); if(!StringUtils.equals(taxPlayerCodeDept.getName(), groupManagementEntity.getGroupName()) || !StringUtils.equals(taxPlayerCodeDept.getTaxpayerCode(), groupManagementEntity.getXhfNsrsbh()) @@ -154,7 +158,7 @@ public class UserController { GroupManagementEntity groupManagementEntity = new GroupManagementEntity(); groupManagementEntity.setId(DistributedKeyMaker.generateShotKey()); groupManagementEntity.setGroupId(taxPlayerCodeDept.getDeptId()); - + String name = taxPlayerCodeDept.getName(); String repl = "(" + taxPlayerCodeDept.getEnterpriseNumbers() + ")"; String replace = taxPlayerCodeDept.getName().replace(repl, ""); taxPlayerCodeDept.setName(replace); @@ -178,10 +182,26 @@ public class UserController { groupManagementEntity.setUpdateTime(new Date()); int count = groupManagementService.insertGroup(groupManagementEntity); if (count == 0) { - log.debug("同步开票组织管理---未执行插入补偿"); - groupManagementService.updateGroupByKey(groupManagementEntity); + List groupManagementEntities = groupManagementEntityList.stream().filter(groupManagementEntity1 -> StringUtils.equals(groupManagementEntity1.getGroupId(), groupManagementEntity.getGroupId()) + && StringUtils.equals(groupManagementEntity1.getXhfNsrsbh(), groupManagementEntity.getXhfNsrsbh()) + && StringUtils.equals(groupManagementEntity1.getXhfDz(), groupManagementEntity.getXhfDz()) + && StringUtils.equals(groupManagementEntity1.getXhfDh(), groupManagementEntity.getXhfDh()) + && StringUtils.equals(groupManagementEntity1.getXhfYh(), groupManagementEntity.getXhfYh()) + && StringUtils.equals(groupManagementEntity1.getXhfZh(), groupManagementEntity.getXhfZh()) + && StringUtils.equals(groupManagementEntity1.getEntId(), groupManagementEntity.getEntId()) + && StringUtils.equals(groupManagementEntity1.getGroupName(), groupManagementEntity.getGroupName()) + && StringUtils.equals(groupManagementEntity1.getXhfMc(), groupManagementEntity.getXhfMc())) + .collect(Collectors.toList()); + log.debug("同步开票组织管理---未变更信息组织{}",groupManagementEntityList.size()); + if (CollectionUtil.isEmpty(groupManagementEntities)){ + log.debug("同步开票组织管理---未执行插入补偿"); + groupManagementService.updateGroupByKey(groupManagementEntity); + } + } //新增redis缓存 + groupManagementEntity.setGroupName(name); + groupManagementEntity.setXhfMc(name); String groupManagementStr = JSON.toJSONString(groupManagementEntity); redisService.set(kpzzglKey, groupManagementStr, RedisConstant.REDIS_EXPIRE_TIME_7DAYS); } From cbd3c912e665f02b2b0db024dcec0ade9bb75a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Thu, 30 Nov 2023 14:17:05 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=AA=E8=83=BD?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=BC=80=E7=A5=A8=E7=BB=84=E7=BB=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/GroupManagementMapper.xml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) 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 f90b88b3..0a63cf98 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 @@ -302,18 +302,18 @@ xhf_mc = #{groupManagementEntity.xhfMc,jdbcType=VARCHAR}, - - xhf_dz = #{groupManagementEntity.xhfDz,jdbcType=VARCHAR}, - - - xhf_dh = #{groupManagementEntity.xhfDh,jdbcType=VARCHAR}, - - - xhf_yh = #{groupManagementEntity.xhfYh,jdbcType=VARCHAR}, - - - xhf_zh = #{groupManagementEntity.xhfZh,jdbcType=VARCHAR}, - + + + + + + + + + + + + update_time = #{groupManagementEntity.updateTime,jdbcType=TIMESTAMP}, From c3553876a38b47a4c8803b5d4a7a2c5e0af2b9c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Thu, 30 Nov 2023 16:33:12 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=8B=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdservice/user/controller/UserController.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java index 51a43642..d599c458 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java @@ -127,6 +127,7 @@ public class UserController { groupManagementService.updateGroupByKey(groupManagementEntity); } + taxPlayerCodeDept.setName(replace); //更新redis缓存 redisService.del(kpzzglKey); } @@ -147,12 +148,17 @@ public class UserController { if(groupManagementEntityOptional.isPresent()){ GroupManagementEntity groupManagementEntity = groupManagementEntityOptional.get(); boolean changed = isChanged(taxPlayerCodeDept, groupManagementEntity); + + String repl = "(" + taxPlayerCodeDept.getEnterpriseNumbers() + ")"; + String replace = taxPlayerCodeDept.getName().replace(repl, ""); + if (changed) { updateGroup(taxPlayerCodeDept,groupManagementEntity); } //新增redis缓存 String groupManagementStr = JSON.toJSONString(groupManagementEntity); redisService.set(kpzzglKey, groupManagementStr, RedisConstant.REDIS_EXPIRE_TIME_7DAYS); + taxPlayerCodeDept.setName(replace); } else { log.debug("同步开票组织管理---database is null"); GroupManagementEntity groupManagementEntity = new GroupManagementEntity(); @@ -204,6 +210,7 @@ public class UserController { groupManagementEntity.setXhfMc(name); String groupManagementStr = JSON.toJSONString(groupManagementEntity); redisService.set(kpzzglKey, groupManagementStr, RedisConstant.REDIS_EXPIRE_TIME_7DAYS); + taxPlayerCodeDept.setName(replace); } } } From e2dbab652d8695e2850cb1dec9a8a75687c866fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Thu, 30 Nov 2023 18:53:04 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdservice/user/controller/UserController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java index d599c458..a2fea546 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java @@ -126,11 +126,15 @@ public class UserController { log.debug("同步开票组织管理---id is not find"); groupManagementService.updateGroupByKey(groupManagementEntity); } - - taxPlayerCodeDept.setName(replace); //更新redis缓存 redisService.del(kpzzglKey); } + + + String repl = "(" + taxPlayerCodeDept.getEnterpriseNumbers() + ")"; + String replace = taxPlayerCodeDept.getName().replace(repl, ""); + taxPlayerCodeDept.setName(replace); + } else { log.debug("同步开票组织管理---redis is null"); //查询数据库