Merge branch 'release' of http://10.1.1.216/xm/sdenergy/sims/sims-order-sdenergy into release

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java

@@ -894,7 +894,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
             insertOrder.stream().forEach(item->{
                 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()+";");
+                    item.setBz(StringUtils.isBlank(item.getBz())?"":item.getBz()+";销方公司代码:"+ddpcxxReq.getDDZXX().get(0).getDDTXX().getXHFBM()+",销方公司名称:"+item.getXhfMc()+";");
                 }
             });
 

order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java

@@ -3481,10 +3481,17 @@ public class BeanTransitionUtils {
             ddtxxBO.setKPLX(req.getZSFHZ());
             ddtxxBO.setXHFSBH(deptEntity.getInvoiceNsrsbh());
             ddtxxBO.setXHFMC(deptEntity.getInvoiceName());
-            ddtxxBO.setXHFDZ(deptEntity.getTaxpayerAddress());
+            if(OrderInfoEnum.ORDER_INVOICE_TYPE_001.getKey().equals(ddpcxxBO.getFPLXDM()) || OrderInfoEnum.ORDER_INVOICE_TYPE_002.getKey().equals(ddpcxxBO.getFPLXDM())){
-            ddtxxBO.setXHFDH(deptEntity.getTaxpayerPhone());
+                ddtxxBO.setXHFDZ("");
-            ddtxxBO.setXHFYH(deptEntity.getTaxpayerBank());
+                ddtxxBO.setXHFDH("");
-            ddtxxBO.setXHFZH(deptEntity.getTaxpayerAccount());
+                ddtxxBO.setXHFYH("");
+                ddtxxBO.setXHFZH("");
+            } else {
+                ddtxxBO.setXHFDZ(deptEntity.getTaxpayerAddress());
+                ddtxxBO.setXHFDH(deptEntity.getTaxpayerPhone());
+                ddtxxBO.setXHFYH(deptEntity.getTaxpayerBank());
+                ddtxxBO.setXHFZH(deptEntity.getTaxpayerAccount());
+            }
             ddtxxBO.setGMFBM(req.getZGFBH());
             ddtxxBO.setKPR(req.getZKPRXM());
             ddtxxBO.setSKR(req.getZSKRXM());