From 2b38548ff7ebbe0502e29b1e7e59f458d6c06632 Mon Sep 17 00:00:00 2001 From: gongquanlin <1025081659@qq.com> Date: Fri, 31 Mar 2023 15:08:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E6=96=B9=E5=BC=80=E7=A5=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=BC=80=E7=A5=A8=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumer/utils/BeanTransitionUtils.java | 71 ++++++++++--------- 1 file changed, 38 insertions(+), 33 deletions(-) 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 da644225..a53f3c87 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 @@ -800,7 +800,7 @@ public class BeanTransitionUtils { * @param ddzxx * @return */ - public static CommonOrderInfo transitionCommonOrderInfoV3(DdzxxBO ddzxx) throws OrderReceiveException { + public static CommonOrderInfo transitionCommonOrderInfoV3(DdzxxBO ddzxx) throws OrderReceiveException { CommonOrderInfo commonOrderInfo = new CommonOrderInfo(); OrderInfo orderInfo = transitionOrderInfoV3(ddzxx.getDDTXX()); @@ -814,19 +814,19 @@ public class BeanTransitionUtils { commonOrderInfo.setOrderInfo(orderInfo); //如果机动车信息不为空,则进行bean转换 - if(OrderInfoEnum.ORDER_INVOICE_TYPE_12.getKey().equals(orderInfo.getFpzlDm())){ + if (OrderInfoEnum.ORDER_INVOICE_TYPE_12.getKey().equals(orderInfo.getFpzlDm())) { OrderInfoJdc orderInfoJdc = transitionJdctxx(ddzxx.getJDCTXX(), orderInfo); commonOrderInfo.setOrderInfoJdc(orderInfoJdc); } //如果二手车信息不为空,则进行bean转换 - if(OrderInfoEnum.ORDER_INVOICE_TYPE_42.getKey().equals(orderInfo.getFpzlDm())){ + if (OrderInfoEnum.ORDER_INVOICE_TYPE_42.getKey().equals(orderInfo.getFpzlDm())) { OrderInfoEsc orderInfoEsc = transitionOrderInfoEsc(ddzxx.getESCTXX(), orderInfo); commonOrderInfo.setOrderInfoEsc(orderInfoEsc); } //全电发票信息 - if(CommonUtils.judgeIsQdfp("", orderInfo.getFpzlDm()) && Objects.nonNull(ddzxx.getQDTXX())){ + if (CommonUtils.judgeIsQdfp("", orderInfo.getFpzlDm()) && Objects.nonNull(ddzxx.getQDTXX())) { OrderInfoQd orderInfoQd = transitionOrderInfoQd(ddzxx.getQDTXX()); commonOrderInfo.setOrderInfoQd(orderInfoQd); } @@ -901,7 +901,7 @@ public class BeanTransitionUtils { orderInfo.setHyMc(""); orderInfo.setKpr(ddtxx.getKPR()); - if(CommonUtils.judgeIsQdfp("", orderInfo.getFpzlDm())){ + if (CommonUtils.judgeIsQdfp("", orderInfo.getFpzlDm())) { orderInfo.setKprzjhm(ddtxx.getKPRZJHM()); orderInfo.setKprzjlx(ddtxx.getKPRZJLX()); } @@ -913,7 +913,7 @@ public class BeanTransitionUtils { orderInfo.setYfpDm(ddtxx.getYFPDM()); orderInfo.setYfpHm(ddtxx.getYFPHM()); orderInfo.setYfpFpzl(CommonUtils.transFpzldm(ddtxx.getYFPLX())); - if(StringUtils.isNotBlank(ddtxx.getYFPKPRQ())){ + if (StringUtils.isNotBlank(ddtxx.getYFPKPRQ())) { if (!ConfigureConstant.DATE_FORMAT_DATE.equals(StringUtil.checkDateFormat(ddtxx.getYFPKPRQ()))) { throw new OrderReceiveException(OrderInfoContentEnum.CHECK_ISS7PRI_107319); } @@ -990,14 +990,14 @@ public class BeanTransitionUtils { orderInfoQd.setYsxwfsd(qdtxxBO.getYSXWFSD()); //附加要素 - if(CollectionUtil.isNotEmpty(qdtxxBO.getFJYSLIST())){ + if (CollectionUtil.isNotEmpty(qdtxxBO.getFJYSLIST())) { List qdFjysList = transitionQdFjys(qdtxxBO.getFJYSLIST()); orderInfoQd.setQdFjysList(qdFjysList); } return orderInfoQd; } - public static QdTxxBO transitionQdTxxBO(OrderInfoQd orderInfoQd){ + public static QdTxxBO transitionQdTxxBO(OrderInfoQd orderInfoQd) { QdTxxBO qdTxxBO = new QdTxxBO(); qdTxxBO.setZZID(orderInfoQd.getZzid()); qdTxxBO.setTDYS(orderInfoQd.getTdys()); @@ -1014,7 +1014,7 @@ public class BeanTransitionUtils { qdTxxBO.setSKYHZH(orderInfoQd.getSkyhzh()); qdTxxBO.setYSXWFSD(orderInfoQd.getYsxwfsd()); - if(CollectionUtil.isNotEmpty(orderInfoQd.getQdFjysList())){ + if (CollectionUtil.isNotEmpty(orderInfoQd.getQdFjysList())) { List qdFjysBOList = transitionQdFjysBO(orderInfoQd.getQdFjysList()); qdTxxBO.setFJYSLIST(qdFjysBOList); } @@ -1106,7 +1106,7 @@ public class BeanTransitionUtils { /** * 全电附加要素bean转换 */ - public static List transitionQdFjys(List qdFjysBOList){ + public static List transitionQdFjys(List qdFjysBOList) { List qdFjysList = new ArrayList<>(qdFjysBOList.size()); qdFjysBOList.forEach(qdFjysBO -> { QdFjys qdFjys = new QdFjys(); @@ -1118,7 +1118,7 @@ public class BeanTransitionUtils { return qdFjysList; } - public static List transitionQdFjysBO(List qdFjysList){ + public static List transitionQdFjysBO(List qdFjysList) { List qdFjysBOList = new ArrayList<>(qdFjysList.size()); qdFjysList.forEach(qdFjys -> { QdFjysBO qdFjysBO = new QdFjysBO(); @@ -1428,7 +1428,7 @@ public class BeanTransitionUtils { orderInfo.setCzdm("10"); orderInfo.setQdBz(commonInvoiceHead.getQD_BZ()); orderInfo.setQdXmmc(commonInvoiceHead.getQDXMMC()); - if(StringUtils.isBlank(orderInfo.getQdXmmc())){ + if (StringUtils.isBlank(orderInfo.getQdXmmc())) { CommonUtils.setQdXmmc(orderInfo); } orderInfo.setKphjje(commonInvoiceHead.getJSHJ()); @@ -1789,7 +1789,7 @@ public class BeanTransitionUtils { HzsqdscRspBO hzsqdscRspBO = new HzsqdscRspBO(); hzsqdscRspBO.setSQBSCQQPCH(hzfpsqbscsRsp.getResult().getSqbscqqpch()); - hzsqdscRspBO.setZTDM(StringUtils.leftPad(hzfpsqbscsRsp.getResult().getStatusCode(),6,"0")); + hzsqdscRspBO.setZTDM(StringUtils.leftPad(hzfpsqbscsRsp.getResult().getStatusCode(), 6, "0")); hzsqdscRspBO.setZTXX(hzfpsqbscsRsp.getResult().getStatusMessage()); if (hzfpsqbscsRsp.getResult().getResponse_HZFPSQBSC() != null && hzfpsqbscsRsp.getResult().getResponse_HZFPSQBSC().size() > 0) { @@ -2064,7 +2064,7 @@ public class BeanTransitionUtils { /** * 补全销方信息 */ - public static void completeOrderSellerInfo(CommonOrderInfo commonOrderInfo, PageXfxx pageXfxx){ + public static void completeOrderSellerInfo(CommonOrderInfo commonOrderInfo, PageXfxx pageXfxx) { //如果销方地址为空则进行补全 if (StringUtils.isBlank(commonOrderInfo.getOrderInfo().getXhfDz())) { commonOrderInfo.getOrderInfo().setXhfDz(pageXfxx.getXhfDz()); @@ -2103,14 +2103,23 @@ public class BeanTransitionUtils { * 如果购方税号为空,补全税号 */ if (StringUtils.isBlank(commonOrderInfo.getOrderInfo().getGhfNsrsbh())) { - commonOrderInfo.getOrderInfo().setGhfNsrsbh(buyerEntity.getTaxpayerCode()); + if (StringUtils.isNotBlank(buyerEntity.getInvoiceTaxno())) { + commonOrderInfo.getOrderInfo().setGhfNsrsbh(buyerEntity.getInvoiceTaxno()); + } else { + commonOrderInfo.getOrderInfo().setGhfNsrsbh(buyerEntity.getTaxpayerCode()); + } } /** * 如果购方名称为空,补全名称 */ if (StringUtils.isBlank(commonOrderInfo.getOrderInfo().getGhfMc())) { - commonOrderInfo.getOrderInfo().setGhfMc(buyerEntity.getPurchaseName()); + // 如果设置了开票名称，优先使用开票名称 + if (StringUtils.isNotBlank(buyerEntity.getInvoiceName())) { + commonOrderInfo.getOrderInfo().setGhfMc(buyerEntity.getInvoiceName()); + } else { + commonOrderInfo.getOrderInfo().setGhfMc(buyerEntity.getPurchaseName()); + } } /** @@ -3234,11 +3243,6 @@ public class BeanTransitionUtils { } - - - - - /** * 查询商品信息：转换并获取商品信息公共协议bean * @@ -3384,6 +3388,7 @@ public class BeanTransitionUtils { buyerEntity.setRemarks(gmfxxtbReq.getBZ()); return buyerEntity; } + /** * 税控设备信息转换 * @@ -3450,7 +3455,7 @@ public class BeanTransitionUtils { * @Author: liufeilong * @Date: 2023-02-06 */ - public static DdpcxxReqBO transitionPoKpReq(PoCommonRequestParam poCommonRequestParam, DeptEntity deptEntity){ + public static DdpcxxReqBO transitionPoKpReq(PoCommonRequestParam poCommonRequestParam, DeptEntity deptEntity) { IsInput isinput = poCommonRequestParam.getIS_INPUT(); DdpcxxReqBO ddpcxxReqBO = new DdpcxxReqBO(); DdpcxxBO ddpcxxBO = new DdpcxxBO(); @@ -3459,7 +3464,7 @@ public class BeanTransitionUtils { DdtxxBO ddtxxBO = new DdtxxBO(); List ddmxList = new ArrayList<>(); - if(OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(isinput.getSYSID())){ + if (OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(isinput.getSYSID())) { String zdataString = isinput.getZDATA(); FpkjReqSap req = JsonUtils.getInstance().parseObject(zdataString, FpkjReqSap.class); //批次信息 @@ -3499,17 +3504,17 @@ public class BeanTransitionUtils { ddtxxBO.setQDBZ("0"); //明细信息 List ititem = req.getITITEM(); - for(int i=0;i < ititem.size();i++){ + for (int i = 0; i < ititem.size(); i++) { FpkjMxSap detail = ititem.get(i); DdmxxxBO ddmxxxBO = new DdmxxxBO(); - ddmxxxBO.setXH(i+1+""); + ddmxxxBO.setXH(i + 1 + ""); //detail.getZSFZKH() 1:普通行;2:折扣行 折扣行上一行是被折扣行 - if(ConfigureConstant.STRING_1.equals(detail.getZSFZKH())){ + if (ConfigureConstant.STRING_1.equals(detail.getZSFZKH())) { ddmxxxBO.setFPHXZ(ConfigureConstant.STRING_0); - }else if(ConfigureConstant.STRING_2.equals(detail.getZSFZKH())){ + } else if (ConfigureConstant.STRING_2.equals(detail.getZSFZKH())) { ddmxxxBO.setFPHXZ(ConfigureConstant.STRING_1); - ddmxList.get(i-1).setFPHXZ(ConfigureConstant.STRING_2); - }else { + ddmxList.get(i - 1).setFPHXZ(ConfigureConstant.STRING_2); + } else { ddmxxxBO.setFPHXZ(ConfigureConstant.STRING_0); } ddmxxxBO.setZXBM(detail.getMATNR()); @@ -3517,7 +3522,7 @@ public class BeanTransitionUtils { ddmxxxBO.setGGXH(detail.getCHARG()); ddmxxxBO.setDW(detail.getZSLDW()); ddmxxxBO.setSPSL(detail.getZZSL()); - ddmxxxBO.setSL(new BigDecimal(detail.getZTAX()).divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP).toString()); + ddmxxxBO.setSL(new BigDecimal(detail.getZTAX()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP).toString()); ddmxxxBO.setDJ(detail.getZZDJ()); ddmxxxBO.setJE(detail.getZHSJE()); ddmxxxBO.setHSBZ(ConfigureConstant.STRING_1); @@ -3544,14 +3549,14 @@ public class BeanTransitionUtils { * @Author: liufeilong * @Date: 2023-02-06 */ - public static PoCommonResponseParam transitionPoKpResp(DdpcxxRspV5 ddpcxxRspV5){ + public static PoCommonResponseParam transitionPoKpResp(DdpcxxRspV5 ddpcxxRspV5) { PoCommonResponseParam poCommonResponseParam = new PoCommonResponseParam(); EsOutput esOutput = new EsOutput(); esOutput.setBSKEY(ddpcxxRspV5.getDDQQPCH()); esOutput.setSAPKEY(ddpcxxRspV5.getDDQQPCH()); - if(OrderInfoContentEnum.INVOICE_ERROR_CODE_010000_V3.getKey().equals(ddpcxxRspV5.getZTDM())){ + if (OrderInfoContentEnum.INVOICE_ERROR_CODE_010000_V3.getKey().equals(ddpcxxRspV5.getZTDM())) { esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_S.getKey()); - }else{ + } else { esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_E.getKey()); } esOutput.setZMESSAGE(ddpcxxRspV5.getZTXX());