From 3a49521a9cd1df69d989148d1a3abf4a355dc6dd Mon Sep 17 00:00:00 2001
From: "zhenghaiyang@ele-cloud.com" <zhenghaiyang@ele-cloud.com>
Date: Sun, 16 Apr 2023 17:46:55 +0800
Subject: [PATCH] =?UTF-8?q?feature=201.=E4=BF=AE=E6=94=B9=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/order/baseservice/job/YpyjTask.java     | 12 +-----------
 .../commodity/controller/CommodityController.java    |  6 +++++-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/job/YpyjTask.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/job/YpyjTask.java
index 3a06af0c..78cb38c7 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/job/YpyjTask.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/job/YpyjTask.java
@@ -151,34 +151,28 @@ public class YpyjTask extends IJobHandler {
                                                     fpfs, invoiceWarningInfo.getYjfs());
                                             String mc = CommonUtils.getFpzlDmMc(fpzldm);
                                             String message = "";
-
                                             message = String.format(RedisConstant.ERROR_MESSAGE_INVOICE, invoiceWarningInfo.getXhfNsrsbh(), invoiceWarningInfo.getSbbh(), fpfs, mc, invoiceWarningInfo.getYjfs()) + "\n" + message;
-
                                             log.info("向i-tax系统推送消息开始了。。。");
                                             if (emailNum < 1) {
                                                 itaxMsgService.sessMessageToTax("余票预警", message, "2",
                                                         invoiceWarningInfo.getUserId(), invoiceWarningInfo.getEntId());
                                             }
                                             if (OrderInfoEnum.ORDER_WARNING_OPEN.getKey().equals(invoiceWarningInfo.getSfyj())) {
-
                                                 log.info("邮件预警次数{}", emailNum);
                                                 if (emailNum < 1) {
                                                     emailService.sendInvoiceWarningInfoEmail(invoiceWarningInfo.getSbMc(), invoiceWarningInfo.getSfyj(), invoiceWarningInfo.getSbbh(), invoiceWarningInfo.getEMail(), fpfs.toString(), mc);
-                                                    emailNum = 1;
+                                                    emailNum = 0;
                                                 }
                                             }
-
                                         } else {
                                             if (ConfigureConstant.INT_1 == emailNum) {
                                                 emailNum = ConfigureConstant.INT_0;
                                             }
                                         }
-
                                         invoiceWarningInfo.setYjcs(String.valueOf(emailNum));
                                         log.info("更新发票预警信息。。。");
                                         int reslut = ypWarningService.updateYpWarnInfo(invoiceWarningInfo, NsrsbhUtils.transShListByNsrsbh(invoiceWarningInfo.getXhfNsrsbh()));
                                         log.info("更新发票预警信息结果    {}", reslut > 0);
-
                                     }
                                 });
                             }
@@ -187,7 +181,6 @@ public class YpyjTask extends IJobHandler {
                         }
                     } catch (Exception e) {
                         log.error("{}ypyjTask 余票预警 业务处理异常 异常信息:{}", LOGGER_MSG, e);
-
                     }
                 }
             } else {
@@ -198,8 +191,5 @@ public class YpyjTask extends IJobHandler {
             return FAIL;
         }
         return ReturnT.SUCCESS;
-
-
     }
-
 }
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 6747dde9..3be2c2ca 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
@@ -679,6 +679,8 @@ public class CommodityController {
                 commodityExcel.setYhzcbs(ConfigureConstant.STRING_YHZCBS_S);
             } else if (OrderInfoEnum.YHZCBS_0.getKey().equals(commodityCodeEntity.getYhzcbs())) {
                 commodityExcel.setYhzcbs(ConfigureConstant.STRING_YHZCBS_F);
+            } else {
+                commodityExcel.setYhzcbs("");
             }
 
             commodityExcel.setZzstsgl(nullToEmptyString(commodityCodeEntity.getZzstsgl()));
@@ -687,6 +689,8 @@ public class CommodityController {
                 commodityExcel.setHsbz(ConfigureConstant.STRING_YHZCBS_S);
             } else if (OrderInfoEnum.HSBZ_0.getKey().equals(commodityCodeEntity.getHsbz())) {
                 commodityExcel.setHsbz(ConfigureConstant.STRING_YHZCBS_F);
+            }else {
+                commodityExcel.setHsbz("");
             }
             commodityExcel.setTswl("否");
             if(ConfigureConstant.STRING_1.equals(commodityCodeEntity.getTswl())){
@@ -699,7 +703,7 @@ public class CommodityController {
                 commodityExcel.setDataSource(codeValue.getValue());
             }
 
-            commodityExcel.setSl(commodityCodeEntity.getSl());
+            commodityExcel.setSl(StringUtils.isNotBlank(commodityCodeEntity.getSl())?commodityCodeEntity.getSl():"");
             commodityExcelList.add(commodityExcel);
         });
         return commodityExcelList;