From e68d45d31b05852f14c8a6aa5debaee5c643615f Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 25 Apr 2023 21:00:49 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feature=EF=BC=9A=E5=90=8C=E6=AD=A5mdm?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E5=8F=96=E5=80=BC=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../openapi/service/impl/SDEnregyServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java index f7b06470..00dc696d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java @@ -211,7 +211,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { private static void structureBuyerEntity(BuyerEntity buyerEntity,MdmGmfxxtbReqBO tempMdmGmfxxtbReqBO){ buyerEntity.setTaxpayerCode(tempMdmGmfxxtbReqBO.getDESC14()); buyerEntity.setPurchaseName(tempMdmGmfxxtbReqBO.getDESC1()); - buyerEntity.setPhone(tempMdmGmfxxtbReqBO.getDESC27()); + buyerEntity.setPhone(tempMdmGmfxxtbReqBO.getDESC26()); buyerEntity.setSjh(tempMdmGmfxxtbReqBO.getDESC27()); buyerEntity.setEmail(tempMdmGmfxxtbReqBO.getDESC29()); @@ -220,10 +220,10 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { buyerEntity.setModifyTime(new Date()); // 处理开户行银行 List buyerEntityDetails = new ArrayList<>(); - String buyerAddress = ""; - buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC22()) ? "" : tempMdmGmfxxtbReqBO.getDESC22()); - buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC23()) ? "" : tempMdmGmfxxtbReqBO.getDESC23()); - buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC24()) ? "" : tempMdmGmfxxtbReqBO.getDESC24()); + String buyerAddress = StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC24()) ? "" : tempMdmGmfxxtbReqBO.getDESC24(); +// buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC22()) ? "" : tempMdmGmfxxtbReqBO.getDESC22()); +// buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC23()) ? "" : tempMdmGmfxxtbReqBO.getDESC23()); +// buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC24()) ? "" : tempMdmGmfxxtbReqBO.getDESC24()); buyerEntity.setAddress(buyerAddress); if (tempMdmGmfxxtbReqBO.getMULTICODE() != null && !CollectionUtils.isEmpty(tempMdmGmfxxtbReqBO.getMULTICODE().getVALUELIST())) { @@ -244,7 +244,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { } buyerEntityDetail.setBankAccount(valuelistBO.getDESC4()); buyerEntityDetail.setBankName(valuelistBO.getDESC3()); - buyerEntityDetail.setPhone(tempMdmGmfxxtbReqBO.getDESC27()); + buyerEntityDetail.setPhone(StringUtils.isNotBlank(buyerEntity.getPhone())?buyerEntity.getPhone():""); buyerEntityDetail.setAddress(finalBuyerAddress); buyerEntityDetail.setBuyerManageId(buyerEntity.getId()); buyerEntityDetails.add(buyerEntityDetail); From b1bd23227828298040349907e5fd4f3846f7388c Mon Sep 17 00:00:00 2001 From: liufeilong Date: Wed, 26 Apr 2023 10:04:40 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E6=8E=A8=E9=80=81=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/service/impl/PushInvoiceServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index 97fc0a9d..0047e89f 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -1365,7 +1365,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { detail.setZBHSJEY(f.getJE()); detail.setZZSEY(f.getSE()); detail.setZHSJEY(new BigDecimal(f.getJE()).add(new BigDecimal(f.getSE())).toString()); - detail.setZZDJFP((new BigDecimal(f.getJE()).add(new BigDecimal(f.getSE())).divide(new BigDecimal(f.getSPSL()),8, BigDecimal.ROUND_HALF_EVEN).toString())); + detail.setZZDJFP(new BigDecimal(f.getDJ()).multiply(new BigDecimal(f.getSL()).add(BigDecimal.ONE)).setScale(ConfigureConstant.INT_8,BigDecimal.ROUND_HALF_EVEN).toString()); detail.setINVOICEDATE(ddfpxx.getKPRQ()); detail.setINVOICETYPE(ddfpxx.getFPLXDM()); detail.setZHWMC(f.getXMMC()); @@ -1400,8 +1400,11 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { fpzftsReqSap.setZFPHM(zffptsV5.getFPHM()); //0 是正常 1是作废 fpzftsReqSap.setZFPZT(ConfigureConstant.STRING_1); - //fpzftsReqSap.setZJSDH(orderInvoiceInfo.getDdh()); - fpzftsReqSap.setZBZDH(orderProcessInfo.getBzdh()); + if(OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(orderProcessInfo.getXtly())){ + fpzftsReqSap.setZJSDH(orderProcessInfo.getOriginDdh()); + }else { + fpzftsReqSap.setZBZDH(orderProcessInfo.getBzdh()); + } IsInput isInput = new IsInput(); isInput.setSYSID(OrderInfoEnum.SYS_SIGN_FP.getKey()); isInput.setIFYWID(OrderInfoEnum.INTERFACE_BUSINESS_ID_FPZFTS.getKey()); From 141622e88866dac044829cc426ad0766c3229e00 Mon Sep 17 00:00:00 2001 From: liufeilong Date: Wed, 26 Apr 2023 10:20:42 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E6=8E=A8=E9=80=81=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/service/impl/PushInvoiceServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index 0047e89f..445f58fa 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -1365,7 +1365,11 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { detail.setZBHSJEY(f.getJE()); detail.setZZSEY(f.getSE()); detail.setZHSJEY(new BigDecimal(f.getJE()).add(new BigDecimal(f.getSE())).toString()); - detail.setZZDJFP(new BigDecimal(f.getDJ()).multiply(new BigDecimal(f.getSL()).add(BigDecimal.ONE)).setScale(ConfigureConstant.INT_8,BigDecimal.ROUND_HALF_EVEN).toString()); + if(StrUtil.isBlank(f.getDJ())){ + detail.setZZDJFP(""); + }else { + detail.setZZDJFP(new BigDecimal(f.getDJ()).multiply(new BigDecimal(f.getSL()).add(BigDecimal.ONE)).setScale(ConfigureConstant.INT_8,BigDecimal.ROUND_HALF_EVEN).toString()); + } detail.setINVOICEDATE(ddfpxx.getKPRQ()); detail.setINVOICETYPE(ddfpxx.getFPLXDM()); detail.setZHWMC(f.getXMMC()); From a72bf3cede6c048990bbbc9ddc42ef239a162cf0 Mon Sep 17 00:00:00 2001 From: gaorl Date: Wed, 26 Apr 2023 11:29:06 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feature=EF=BC=9A=E5=8F=91=E7=A5=A8=E5=BC=80?= =?UTF-8?q?=E5=85=B7=E5=90=8E=E4=BF=9D=E5=AD=98=E7=89=A9=E6=96=99=E7=BC=96?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E4=B8=94=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=99=BA=E8=83=BD=E8=B5=8B=E7=A0=81=E4=B8=BA=E9=9D=9E=E6=99=BA?= =?UTF-8?q?=E8=83=BD=E8=B5=8B=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commodity/service/impl/CommodityServiceImpl.java | 2 +- .../config/rabbitmq/OrderSaveSpxxHandler.java | 11 ++++++++++- .../modules/order/service/OrderItemInfoService.java | 3 +++ .../order/service/impl/OrderItemInfoServiceImpl.java | 6 ++++++ .../resources/mybatis/mapper/OrderItemInfoMapper.xml | 3 +++ 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java index d280b604..a29213f3 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java @@ -622,7 +622,7 @@ public class CommodityServiceImpl implements CommodityService { Map map = new HashMap<>(); // map.put("productName", xmmc); map.put("zxbm", receiveSpxxReq.getZxbm()); - map.put("entId",commodityCodeCheckQuery.getDeptId()); + map.put("entId",receiveSpxxReq.getEntId()); log.debug("{}校验名称是否存在 参数:{}", LOGGER_MSG, map); List commodityCodeEntityList = commodityMapper.queryProductList(map, null); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java index c366fbdb..dcec492d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java @@ -111,7 +111,7 @@ public class OrderSaveSpxxHandler implements BaseListener { List shList = NsrsbhUtils.transShListByNsrsbh(orderInvoiceInfo.getXhfNsrsbh()); List orderItemInfoList = orderItemInfoService.selectOrderItemInfoByOrderId(orderInvoiceInfo.getOrderInfoId(), shList); - + List updateZnfmList = new ArrayList<>(); if (ObjectUtil.isNotEmpty(orderItemInfoList)) { List receiveSpxxReqList = new ArrayList<>(); for (OrderItemInfo orderItemInfo : orderItemInfoList) { @@ -120,8 +120,17 @@ public class OrderSaveSpxxHandler implements BaseListener { receiveSpxxReq.setXhfMc(orderInvoiceInfo.getXhfMc()); receiveSpxxReq.setEntId(userInfoService.getUser() != null ? userInfoService.getUser().getDeptId():orderInvoiceInfo.getEntId()); receiveSpxxReqList.add(receiveSpxxReq); + //更新是否为只能赋码 + if("1".equals(orderItemInfo.getZnfm())){ + OrderItemInfo orderItemInfo1 = new OrderItemInfo(); + orderItemInfo1.setId(orderItemInfo.getId()); + orderItemInfo1.setZnfm("0"); + updateZnfmList.add(orderItemInfo1); + } } + //事务控制 commodityService.saveCommodityCodeEntity(receiveSpxxReqList); + orderItemInfoService.updateOrderItemId(updateZnfmList); } } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderItemInfoService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderItemInfoService.java index 4e323139..5428abf0 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderItemInfoService.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderItemInfoService.java @@ -1,6 +1,7 @@ package com.dxhy.order.consumer.modules.order.service; import com.dxhy.order.model.OrderItemInfo; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -38,4 +39,6 @@ public interface OrderItemInfoService { */ int insertOrderItemByList(List orderItemInfos); + int updateOrderItemId(List resultOrderItemList); + } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderItemInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderItemInfoServiceImpl.java index bc51528c..cb4a097e 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderItemInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderItemInfoServiceImpl.java @@ -3,6 +3,7 @@ package com.dxhy.order.consumer.modules.order.service.impl; import com.dxhy.order.model.OrderItemInfo; import com.dxhy.order.consumer.modules.order.service.OrderItemInfoService; import com.dxhy.order.invoice.module.invoice.dao.OrderItemInfoMapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -35,4 +36,9 @@ public class OrderItemInfoServiceImpl implements OrderItemInfoService { return orderItemInfoMapper.insertOrderItemByList(orderItemInfos); } + @Override + public int updateOrderItemId(@Param("list") List resultOrderItemList){ + return orderItemInfoMapper.updateOrderItemId(resultOrderItemList); + } + } diff --git a/order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml b/order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml index 8a683178..3f582aad 100644 --- a/order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml +++ b/order-management-invoice/src/main/resources/mybatis/mapper/OrderItemInfoMapper.xml @@ -283,6 +283,9 @@ xmdw = #{item.xmdw,jdbcType=VARCHAR}, + + znfm = #{item.znfm,jdbcType=VARCHAR}, + id = #{item.id,jdbcType=VARCHAR} From 2cdb25106dca9f5fbf9b61bbb701d17e509a1798 Mon Sep 17 00:00:00 2001 From: gaorl Date: Wed, 26 Apr 2023 14:21:21 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feature=EF=BC=9A=E5=AE=A2=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=96=B0=E5=A2=9E=E5=88=97=E8=A1=A8=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E7=94=B5=E8=AF=9D=E7=BD=AE=E7=A9=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buyer/service/impl/BuyerServiceImpl.java | 27 ++++----- .../resources/mybatis/mapper/BuyerMapper.xml | 59 ++++++++++++------- 2 files changed, 50 insertions(+), 36 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 53101889..661d652b 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 @@ -413,6 +413,11 @@ public class BuyerServiceImpl implements BuyerService { /** * 根据入参进行判断是新增还是修改 */ + buyerEntity.setAddress(""); + buyerEntity.setPhone(""); + buyerEntity.setBankNumber(""); + buyerEntity.setBankOfDeposit(""); + Boolean isAdd = false; if(StringUtils.isBlank(buyerEntity.getId())){ isAdd = true; @@ -433,7 +438,9 @@ public class BuyerServiceImpl implements BuyerService { } // 处理MDM默认银行账户等信息 //判断是否存在默认银行信息 - Boolean isDefaultMark = true; + if(isAdd && existBuyer != null){ + return r.put("message", "客户编码已存在").put(OrderManagementConstant.CODE, ConfigureConstant.STRING_9999); + } String buyerId = baseService.getGenerateShotKey(); if (CollectionUtil.isNotEmpty(buyerEntity.getBuyerEntityDetail())) { for (BuyerEntityDetail t : buyerEntity.getBuyerEntityDetail()) { @@ -451,27 +458,19 @@ 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){ buyerMapper.batchInsertBuyerDetail(buyerEntity.getBuyerEntityDetail()); } - if(isAdd && existBuyer != null){ - return r.put("message", "客户编码已存在").put(OrderManagementConstant.CODE, ConfigureConstant.STRING_9999); - } - if (existBuyer != null) {//StringUtils.isNotBlank(buyerEntity.getId()) + 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); @@ -479,8 +478,7 @@ public class BuyerServiceImpl implements BuyerService { r.put("message", "修改失败").put(OrderManagementConstant.CODE, ConfigureConstant.STRING_9999); } - } else { - //新增购方信息 + } else { //新增购方信息 if (StringUtils.isBlank(buyerEntity.getBuyerCode())) { buyerEntity.setBuyerCode(baseService.getGenerateShotKey()); } @@ -621,6 +619,7 @@ public class BuyerServiceImpl implements BuyerService { queryBuyerEntity.setTaxpayerCode(buyerEntity.getTaxpayerCode()); queryBuyerEntity.setPurchaseName(buyerEntity.getPurchaseName()); } + queryBuyerEntity.setEntId(buyerEntity.getDeptId()); List shList = new ArrayList<>(); shList.add(buyerEntity.getXhfNsrsbh()); diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml index e8e5faa5..153a9d7f 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml @@ -906,33 +906,45 @@