From 80a0e0e8c7f9def656c0eb5d4f1dfb5cf1cae396 Mon Sep 17 00:00:00 2001
From: "pikachu1995@126.com" <pikachu1995@126.com>
Date: Sun, 7 Jul 2024 15:55:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE=E5=88=A4=E6=96=AD=EF=BC=8C=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7poi=E7=89=88=E6=9C=AC=20=E4=BC=A0=E9=80=92=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=88=99=E4=BD=BF=E7=94=A8=E5=AD=97=E6=AE=B5=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/serviceimpl/OrderServiceImpl.java      | 16 ++++++++--------
 .../mybatis/mybatisplus/MyMetaObjectHandler.java |  4 +++-
 pom.xml                                          |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
index d34e9c18..296c3045 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
@@ -1235,7 +1235,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if (StrUtil.isNotBlank(orderExportDTO.getConsigneeAddressPath())) {
                 String[] receiveAddress = orderExportDTO.getConsigneeAddressPath().split(",");
                 orderExportDetailDTO.setProvince(receiveAddress[0]);
-                orderExportDetailDTO.setCity(receiveAddress[1]);
+                orderExportDetailDTO.setCity(receiveAddress.length > 1 ?receiveAddress[1]:"");
                 orderExportDetailDTO.setDistrict(receiveAddress.length > 2 ? receiveAddress[2] : "");
                 orderExportDetailDTO.setStreet(receiveAddress.length > 3 ? receiveAddress[3] : "");
             }
@@ -1278,13 +1278,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             row.createCell(2).setCellValue(dto.getGoodsName());
             row.createCell(3).setCellValue(dto.getNum());
             row.createCell(4).setCellValue(dto.getGoodsId());
-            row.createCell(5).setCellValue(dto.getUnitPrice());
-            row.createCell(6).setCellValue(dto.getFlowPrice());
-            row.createCell(7).setCellValue(dto.getFreightPrice());
-            row.createCell(8).setCellValue(dto.getDiscountPrice());
-            row.createCell(9).setCellValue(dto.getSiteMarketingCost());
-            row.createCell(10).setCellValue(dto.getStoreMarketingCost());
-            row.createCell(11).setCellValue(dto.getUpdatePrice());
+            row.createCell(5).setCellValue(dto.getUnitPrice()!=null?dto.getUnitPrice():0);
+            row.createCell(6).setCellValue(dto.getFlowPrice()!=null?dto.getFlowPrice():0);
+            row.createCell(7).setCellValue(dto.getFreightPrice()!=null?dto.getFreightPrice():0);
+            row.createCell(8).setCellValue(dto.getDiscountPrice()!=null?dto.getDiscountPrice():0);
+            row.createCell(9).setCellValue(dto.getSiteMarketingCost()!=null?dto.getSiteMarketingCost():0);
+            row.createCell(10).setCellValue(dto.getStoreMarketingCost()!=null?dto.getStoreMarketingCost():0);
+            row.createCell(11).setCellValue(dto.getUpdatePrice()!=null?dto.getUpdatePrice():0);
             row.createCell(12).setCellValue(dto.getPaymentMethod());
             row.createCell(13).setCellValue(dto.getConsigneeName());
             row.createCell(14).setCellValue(dto.getConsigneeMobile());
diff --git a/framework/src/main/java/cn/lili/mybatis/mybatisplus/MyMetaObjectHandler.java b/framework/src/main/java/cn/lili/mybatis/mybatisplus/MyMetaObjectHandler.java
index eadaa7e3..a273f8ee 100644
--- a/framework/src/main/java/cn/lili/mybatis/mybatisplus/MyMetaObjectHandler.java
+++ b/framework/src/main/java/cn/lili/mybatis/mybatisplus/MyMetaObjectHandler.java
@@ -32,7 +32,9 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
         }
         //有值，则写入
         if (metaObject.hasGetter("deleteFlag")) {
-            this.setFieldValByName("deleteFlag", false, metaObject);
+            if (metaObject.getValue("deleteFlag") == null) {
+                this.setFieldValByName("deleteFlag", false, metaObject);
+            }
         }
         if (metaObject.hasGetter("id")) {
             //如果已经配置id，则不再写入
diff --git a/pom.xml b/pom.xml
index 7abbcb5d..af61ff3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
         <knife4j.version>2.0.9</knife4j.version>
         <de.codecentric>2.6.6</de.codecentric>
         <userAgentUtils>1.21</userAgentUtils>
-        <poi-version>5.1.0</poi-version>
+        <poi-version>5.2.3</poi-version>
         <poi-ooxml-version>5.2.3</poi-ooxml-version>
         <logstash-logback-encoder>7.1.1</logstash-logback-encoder>
         <zxing>3.5.0</zxing>