feature：物料引用、购房信息从税号改为entid、推送影像截取日志

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/BuyerService.java

@@ -63,7 +63,7 @@ public interface BuyerService {
      * @param buyerCode
      * @return
      */
-    BuyerEntity queryBuyerInfoByxhfNsrsbhAndBuyerCode(String xhfNsrsbh, String buyerCode);
+    BuyerEntity queryBuyerInfoByxhfNsrsbhAndBuyerCode(String xhfNsrsbh, String buyerCode,String entId);
 
     /**
      * 同步购货方信息

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java

@@ -296,12 +296,15 @@ public class BuyerServiceImpl implements BuyerService {
 
 
     @Override
-    public BuyerEntity queryBuyerInfoByxhfNsrsbhAndBuyerCode(String xhfNsrsbh, String buyerCode) {
+    public BuyerEntity queryBuyerInfoByxhfNsrsbhAndBuyerCode(String xhfNsrsbh, String buyerCode,String entId) {
         log.info("{}根据销方税号:{}和自编ID查询购方信息{}", LOGGER_MSG, xhfNsrsbh, buyerCode);
         List<String> shList = new ArrayList<>();
-        shList.add(xhfNsrsbh);
+        if(StringUtils.isBlank(entId)){
+            shList.add(xhfNsrsbh);
+        }
         BuyerEntity buyerEntity = new BuyerEntity();
         buyerEntity.setBuyerCode(buyerCode);
+        buyerEntity.setEntId(entId);
         List<BuyerEntity> buyerEntities = buyerMapper.selectBuyerByBuyerEntity(buyerEntity, shList);
         log.info("{}根据销方税号和自编ID查询购方信息结果{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(buyerEntity));
 
@@ -327,7 +330,7 @@ public class BuyerServiceImpl implements BuyerService {
             //查询数据库中是否有当前请求信息
             List<String> shList = new ArrayList<>();
             shList.add(buyerEntity.getXhfNsrsbh());
-            BuyerEntity buyerEntityOld = queryBuyerInfoByxhfNsrsbhAndBuyerCode(buyerEntity.getXhfNsrsbh(), buyerEntity.getBuyerCode());
+            BuyerEntity buyerEntityOld = queryBuyerInfoByxhfNsrsbhAndBuyerCode(buyerEntity.getXhfNsrsbh(), buyerEntity.getBuyerCode(),null);
             switch (operationType) {
                 case "0":
                     if (Objects.isNull(buyerEntityOld)) {

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java

@@ -129,6 +129,7 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService
             CommodityCodeEntity newCommodityCodeEntity = new CommodityCodeEntity();
             try {
                 BeanUtils.copyProperties(newCommodityCodeEntity, commodityCodeEntity);
+                newCommodityCodeEntity.setEntId(quoteGroupCommodityDTO.getDeptId());
             } catch (IllegalAccessException e) {
                 log.error("{}引用物料异常", LOGGER_MSG, e);
             } catch (InvocationTargetException e) {
@@ -143,7 +144,6 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService
             }else{
                 newCommodityCodeEntity.setId(baseService.getGenerateShotKey());
                 newCommodityCodeEntity.setXhfNsrsbh(quoteGroupCommodityDTO.getXhfNsrsbh());
-                newCommodityCodeEntity.setEntId(quoteGroupCommodityDTO.getDeptId());
                 newCommodityCodeEntity.setDataState("0");
                 newCommodityCodeEntity.setXhfMc(quoteGroupCommodityDTO.getXhfMc());
                 newCommodityCodeEntity.setHsbz("1");

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java

@@ -173,9 +173,9 @@ public class InvoiceServiceImpl implements InvoiceService {
             List<OrderItemInfo> orderItemInfoList = commonOrderInfo.getOrderItemInfo();
             BuyerEntity buyerEntity = null;
             if (StrUtil.isNotBlank(orderInfo.getGhfId())) {
-                buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(orderInfo.getXhfNsrsbh(), orderInfo.getGhfId());
+                buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(orderInfo.getXhfNsrsbh(), orderInfo.getGhfId(),commonOrderInfo.getEntId());
                 if (ObjectUtil.isNull(buyerEntity)) {
-                    buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ConfigureConstant.STRING_1_, orderInfo.getGhfId());
+                    buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ConfigureConstant.STRING_1_, orderInfo.getGhfId(),null);
                 }
             }
             if (ObjectUtil.isNotNull(buyerEntity) && ConfigureConstant.STRING_0.equals(buyerEntity.getStatus())) {

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java

@@ -601,7 +601,11 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
             String md5Encode = MD5.getMd5Encode(outputInvoiceRequest.getBillNum() + invoiceConfig.getSapSalt() );
             Map<String, String> headerMap = Maps.newHashMap();
             headerMap.put("Authorization",md5Encode);
-            log.info("call image check request url：{}，header：{}，parameter：{}",invoiceConfig.getSnYxUrl(),JSONObject.toJSONString(headerMap),JSONObject.toJSONString(outputInvoiceRequest));
+            String param = JSONObject.toJSONString(outputInvoiceRequest);
+            if(StringUtils.isNotBlank(param) && param.length() > 400){
+                param = param.substring(400);
+            }
+            log.info("call image check request url：{}，header：{}，parameter：{}",invoiceConfig.getSnYxUrl(),JSONObject.toJSONString(headerMap),param);
             String body = HttpRequest.post(invoiceConfig.getSnYxUrl()).addHeaders(headerMap).body(JSONObject.toJSONString(outputInvoiceRequest)).timeout(300000).execute().body();
             log.info("call image check return parameter：{}",body);
             JSONObject jsonObject = JSONObject.parseObject(body);

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java

@@ -359,7 +359,7 @@ public class ReceiveOrderController {
 
             long t3 = System.currentTimeMillis();
             log.debug("excel校验开始,当前时间{}", t3);
-            Map<String, Object> examinByMap = orderExcelReadService.examinByMap(orderExcelMap, xhfNsrsbh, userId, terminalCode, qdfwlx);
+            Map<String, Object> examinByMap = orderExcelReadService.examinByMap(orderExcelMap, xhfNsrsbh, userId, terminalCode, qdfwlx,entId);
             long t4 = System.currentTimeMillis();
             log.debug("excel校验结束,当前时间{},耗时:{}", t4, t4 - t3);
             if (!(boolean) examinByMap.get(ConfigureConstant.STRING_IS_PASS)) {

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderExcelReadService.java

@@ -44,7 +44,7 @@ public interface OrderExcelReadService {
      * @return
      */
     Map<String, Object> examinByMap(Map<String, List<NewOrderExcel>> readOrderInfoFromExcelxls, String xhfNsrsbh,
-                                    String userId, String terminalCode, String qdfwlx);
+                                    String userId, String terminalCode, String qdfwlx,String entId);
 
     /**
      * 导出订单数据

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java

@@ -142,7 +142,7 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService {
      * Map<String,Object> @exception
      */
     private Map<String, Object> examinData(NewOrderExcel orderExcel, NewOrderExcel lastOrderExcel, String xhfNsrsbh,
-                                           Set<String> ggxhSet, int itemCount, String userId, String terminalCode) {
+                                           Set<String> ggxhSet, int itemCount, String userId, String terminalCode,String entId) {
         Map<String, Object> resultMap = new HashMap<>(10);
         boolean isValid = false;
         List<String> shList = new ArrayList<>();
@@ -259,7 +259,7 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService {
         //购方编码不为空时，根据购方编码查询购方信息，校验查询的购方信息是否存在
         BuyerEntity buyer = null;
         if (StringUtils.isNotBlank(orderExcel.getGhfId())) {
-            buyer = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(xhfNsrsbh, orderExcel.getGhfId());
+            buyer = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(xhfNsrsbh, orderExcel.getGhfId(),entId);
             if (Objects.isNull(buyer)) {
                 isValid = true;
                 resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDER_GHFNSRSBH.getCellName(),
@@ -1588,7 +1588,7 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService {
      */
     @Override
     public Map<String, Object> examinByMap(Map<String, List<NewOrderExcel>> readOrderInfoFromExcelxls, String xhfNsrsbh,
-                                           String userId, String terminalCode, String qdfwlx) {
+                                           String userId, String terminalCode, String qdfwlx,String entId) {
         Map<String, Object> resultMap = new HashMap<>(5);
         List<Map<String, Object>> errorList = new ArrayList<>();
         boolean isPass = true;
@@ -1649,7 +1649,7 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService {
                         }
                     } else {
                         Map<String, Object> examinData = examinData(newOrderExcel, lastOrderExcel, xhfNsrsbh,
-                                ggxhSet, (i + 1), userId, terminalCode);
+                                ggxhSet, (i + 1), userId, terminalCode,entId);
                         List<Object> resultList = (List<Object>) examinData.get("resultList");
                         //验证扣除额是否合法
                         if (ObjectUtil.isNotNull(newOrderExcel) && StringUtils.isNotBlank(newOrderExcel.getKce())) {
@@ -1872,7 +1872,7 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService {
             if (checkIsBuyerEmpty(orderExcel2CommonOrderInfo)) {
 
                 if (StringUtils.isNotBlank(value.get(0).getGhfId())) {
-                    BuyerEntity buyer = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(paramMap.get("xhfNsrsbh"), value.get(0).getGhfId());
+                    BuyerEntity buyer = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(paramMap.get("xhfNsrsbh"), value.get(0).getGhfId(),paramMap.get("entId"));
                     if (buyer != null) {
                         orderExcel2CommonOrderInfo.getOrderInfo().setGhfMc(buyer.getPurchaseName());
                         orderExcel2CommonOrderInfo.getOrderInfo().setGhfNsrsbh(buyer.getTaxpayerCode());

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

@@ -344,9 +344,9 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         oderDetailInfo.setGhfZh(orderInfo.getGhfZh());
         BuyerEntity buyerEntity = null;
         if (StrUtil.isNotBlank(orderInfo.getGhfId())) {
-            buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(orderInfo.getXhfNsrsbh(), orderInfo.getGhfId());
+            buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(orderInfo.getXhfNsrsbh(), orderInfo.getGhfId(),orderProcessInfo.getEntId());
             if (ObjectUtil.isNull(buyerEntity)) {
-                buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ConfigureConstant.STRING_1_, orderInfo.getGhfId());
+                buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ConfigureConstant.STRING_1_, orderInfo.getGhfId(),null);
             }
         }
         if (ObjectUtil.isNotNull(buyerEntity) && ConfigureConstant.STRING_0.equals(buyerEntity.getStatus())) {
@@ -998,7 +998,9 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         List<CommonOrderInfo> commonOrderInfoList = new ArrayList<>();
 
         for (PageInvoiceItem pageInvoiceItem : pageInvoiceItems) {
-            commonOrderInfoList.add(getCommonOrderInfoAll(pageInvoiceItem.getOrderId(), NsrsbhUtils.transShListByNsrsbh(pageInvoiceItem.getXhfNsrsbh())));
+            CommonOrderInfo commonOrderInfoAll = getCommonOrderInfoAll(pageInvoiceItem.getOrderId(), NsrsbhUtils.transShListByNsrsbh(pageInvoiceItem.getXhfNsrsbh()));
+            commonOrderInfoAll.setEntId(pageInvoiceItem.getEntId());
+            commonOrderInfoList.add(commonOrderInfoAll);
         }
 
         return commonOrderInfoList;

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java

@@ -4207,7 +4207,7 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder
          * 购买方编码
          */
         if (StringUtils.isNotBlank(ddfpxx.getGMFBM())) {
-            BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ddfpxx.getXHFSBH(), ddfpxx.getGMFBM());
+            BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ddfpxx.getXHFSBH(), ddfpxx.getGMFBM(),ddfpzxx.getDDFPXX().getENTID());
                 //购方税号
                 ddfpxx.setGMFSBH(buyerEntity.getTaxpayerCode());
                 //购方名称
@@ -4652,7 +4652,7 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder
             if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) {
                 return checkResultMap;
             }
-            BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ddfpxx.getXHFSBH(), ddfpxx.getGMFBM());
+            BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ddfpxx.getXHFSBH(), ddfpxx.getGMFBM(),ddfpxx.getENTID());
             if (Objects.isNull(buyerEntity)) {
                 //如果按购买方识别号在数据库中未查询到信息则返回提示信息
                 return CheckParamUtil.generateErrorMap("", "", OrderInfoContentEnum.INVOICE_HEAD_INFO_GMFMC_ERROR_144136);
@@ -4716,7 +4716,7 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder
             if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) {
                 return checkResultMap;
             }
-            BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ddfpxx.getXHFSBH(), ddfpxx.getGMFBM());
+            BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ddfpxx.getXHFSBH(), ddfpxx.getGMFBM(),ddfpxx.getENTID());
             if (Objects.isNull(buyerEntity)) {
                 //如果按购买方识别号在数据库中未查询到信息则返回提示信息
                 return CheckParamUtil.generateErrorMap("", "", OrderInfoContentEnum.INVOICE_HEAD_INFO_GMFMC_ERROR_144136);
@@ -4917,7 +4917,7 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder
             if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) {
                 return checkResultMap;
             }
-            BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ddfpxx.getXHFSBH(), ddfpxx.getGMFBM());
+            BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ddfpxx.getXHFSBH(), ddfpxx.getGMFBM(),ddfpxx.getENTID());
             if (Objects.isNull(buyerEntity)) {
                 //如果按购买方识别号在数据库中未查询到信息则返回提示信息
                 return CheckParamUtil.generateErrorMap("", "", OrderInfoContentEnum.INVOICE_HEAD_INFO_GMFMC_ERROR_144136);

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

@@ -1148,8 +1148,8 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
 //            zxbm = StringUtils.right(zxbm, 6); // 见下dealOrderItem中 line:550左右注释
             commonOrderInfo.getOrderInfo().setGhfId(zxbm);
             //TODO 这儿最好是使用entid查购方
-            BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(commonOrderInfo.getOrderInfo().getXhfNsrsbh(), zxbm);
+            BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(commonOrderInfo.getOrderInfo().getXhfNsrsbh(), zxbm,commonOrderInfo.getOrderInfo().getEntId());
-            if (buyerEntity != null && StringUtils.isNotBlank(buyerEntity.getTaxpayerCode())) {
+            if (buyerEntity != null ) { //&& StringUtils.isNotBlank(buyerEntity.getTaxpayerCode())
                 BeanTransitionUtils.transitionOrderBuyerInfo(commonOrderInfo, buyerEntity);
             }else {
                 log.error("{}补全购方信息异常,根据购方编号未查询到购方或者购方税号为空", LOGGER_MSG);

order-management-consumer/src/test/java/com/dxhy/order/consumer/CreatePDF.java

@@ -0,0 +1,21 @@
+package com.dxhy.order.consumer;
+
+import org.springframework.util.Base64Utils;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+
+public class CreatePDF {
+    public static void main(String[] args) {
+        String context = "";
+        byte[] decode = Base64Utils.decode(context.getBytes());
+        try {
+            FileOutputStream fos = new FileOutputStream(new File("D:\\test\\bb.pdf"));
+            fos.write(decode);
+            fos.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java

@@ -205,8 +205,8 @@ public class InvoiceConfig {
     @Value("${order.opentext.tempPath}")
     public String openTextTempPath;
 
-    @Value("${order.sys.url}")
+//    @Value("${order.sys.url}")
-    public String sysUrl;
+//    public String sysUrl;
 
 //    @Value("${order.sap.userName}")
 //    private String sapUserName;