From 02334df29f98dd60a811c790229e1805d7ea16b3 Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 17 Apr 2023 17:35:21 +0800 Subject: [PATCH] =?UTF-8?q?feature:=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E3=80=81?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=85=8B=E9=9A=86bug=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E3=80=81=E9=9B=86=E5=9B=A2=E7=89=A9=E6=96=99=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buyer/service/impl/BuyerServiceImpl.java | 14 ++++++++++++-- .../commodity/controller/CommodityController.java | 2 +- .../impl/CommodityCodeModifyLogServiceImpl.java | 2 +- .../controller/SdenergyTaxCodeMatchController.java | 6 ++++++ .../module/invoice/dao/OrderInfoMapper.java | 2 +- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java index a27ed8f3..6b1b1fb2 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java @@ -422,9 +422,11 @@ public class BuyerServiceImpl implements BuyerService { buyerEntity.setId(existBuyer.getId()); } // 处理MDM默认银行账户等信息 + //判断是否存在默认银行信息 + Boolean isDefaultMark = true; String buyerId = baseService.getGenerateShotKey(); if (CollectionUtil.isNotEmpty(buyerEntity.getBuyerEntityDetail())) { - buyerEntity.getBuyerEntityDetail().forEach(t -> { + for (BuyerEntityDetail t : buyerEntity.getBuyerEntityDetail()) { if(ConfigureConstant.STRING_1.equals(buyerEntity.getIsEdit())){ t.setUpdateUser(""); t.setUpdateTime(new Date()); @@ -439,8 +441,9 @@ public class BuyerServiceImpl implements BuyerService { buyerEntity.setPhone(t.getPhone()); buyerEntity.setBankNumber(t.getBankAccount()); buyerEntity.setBankOfDeposit(t.getBankName()); + isDefaultMark = false; } - }); + } } buyerMapper.deleteBuyerDetail(buyerEntity.getId()); if(buyerEntity.getBuyerEntityDetail() != null && buyerEntity.getBuyerEntityDetail().size()>0){ @@ -449,9 +452,16 @@ public class BuyerServiceImpl implements BuyerService { if(isAdd && existBuyer != null){ return r.put("message", "客户编码已存在").put(OrderManagementConstant.CODE, ConfigureConstant.STRING_9999); } + if (existBuyer != null) {//StringUtils.isNotBlank(buyerEntity.getId()) buyerEntity.setModifyTime(new Date()); + if(isDefaultMark){ + buyerEntity.setAddress(""); + buyerEntity.setPhone(""); + buyerEntity.setBankNumber(""); + buyerEntity.setBankOfDeposit(""); + } //更新明细表，最好的办法是先删除后新增 int i = buyerMapper.updateBuyer(buyerEntity, shList); diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java index 3be2c2ca..4f340522 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java @@ -619,7 +619,7 @@ public class CommodityController { public void exportCommodityExcel(@RequestBody Map map, HttpServletResponse response) { log.info("导出商品信息入参： {}", map); String xhfNsrsbh = (String) map.get("xhfNsrsbh"); - String entId = (String) map.get("entId"); // 数据权限id，对应的大B下的企业id + String entId = (String) map.get("entList"); // 数据权限id，对应的大B下的企业id if (StringUtils.isBlank(xhfNsrsbh)) { log.error("{},请求税号为空!", LOGGER_MSG); } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java index cae84b24..b7fd6a9b 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java @@ -115,7 +115,7 @@ public class CommodityCodeModifyLogServiceImpl implements CommodityCodeModifyLog originValue = "0".equals(originValue)?"否":"是"; } if(StringUtils.isNotBlank((String)newValue)){ - newValue = "0".equals(originValue)?"否":"是"; + newValue = "0".equals(newValue)?"否":"是"; } } if("yhzcbs".equals(fieldName)){ diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java index 56146f02..bbcc9c88 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java @@ -31,6 +31,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 物料分类编码表控制层 @@ -154,6 +155,11 @@ public class SdenergyTaxCodeMatchController { } List> errorMsgList = Lists.newArrayList(); int resultIndex = 2; + Map> collect = uploadList.stream().collect(Collectors.groupingBy(t -> t.getSsflbm())); + List collect1 = collect.keySet().stream().filter(t -> collect.get(t).size() > 1).collect(Collectors.toList()); + if(!collect1.isEmpty()){ + return R.error("导入物料分类编码异常，物料分类编码存在重复项，请检查"); + } for (SdenergyTaxCodeMatch taxCodeMatch : uploadList) { resultIndex++; String wlflbm = taxCodeMatch.getWlflbm(); diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/dao/OrderInfoMapper.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/dao/OrderInfoMapper.java index db915d81..c3a425ac 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/dao/OrderInfoMapper.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/dao/OrderInfoMapper.java @@ -46,7 +46,7 @@ public interface OrderInfoMapper { * @param shList * @return */ - int updateOrderInfoByOrderId(@Param("orderInfo") OrderInfo orderInfo, @Param("ent") List shList); + int updateOrderInfoByOrderId(@Param("orderInfo") OrderInfo orderInfo, @Param("shList") List shList); /** * 根据销方税号