送达时间

src/main/java/com/sqx/modules/utils/fieYun/FeiYunUtils.java

@@ -37,6 +37,7 @@ import org.springframework.stereotype.Component;
 
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -662,7 +663,7 @@ public class FeiYunUtils {
                             baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbCoupon == null ? "" : tbCoupon.getCouponName()).append(end.toString()).append("<BR>");
                             break;
                         case "expect_delivery_time":
-                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbOrder.getExpectDeliveryTime()).append(end.toString()).append("<BR>");
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbOrder.getExpectDeliveryTime() == null ? "即时送达" : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tbOrder.getExpectDeliveryTime())).append(end.toString()).append("<BR>");
                             break;
                         case "activity_title"://通过订单ID去activity_part_record表中查到activity_id后再去activity表中获取活动标题
                             baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(activity == null ? "" : activity.getTitle()).append(end.toString()).append("<BR>");
@@ -849,7 +850,7 @@ public class FeiYunUtils {
                             goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbCoupon == null ? "" : tbCoupon.getCouponName()).append(end.toString()).append("<BR>");
                             break;
                         case "expect_delivery_time":
-                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getExpectDeliveryTime()).append(end.toString()).append("<BR>");
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getExpectDeliveryTime() == null ? "即时送达" : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tbOrder.getExpectDeliveryTime())).append(end.toString()).append("<BR>");
                             break;
                         case "activity_title"://通过订单ID去activity_part_record表中查到activity_id后再去activity表中获取活动标题
                             goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(activity == null ? "" : activity.getTitle()).append(end.toString()).append("<BR>");
@@ -1054,7 +1055,7 @@ public class FeiYunUtils {
                             payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbCoupon == null ? "" : tbCoupon.getCouponName()).append(end.toString()).append("<BR>");
                             break;
                         case "expect_delivery_time":
-                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getExpectDeliveryTime()).append(end.toString()).append("<BR>");
+                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getExpectDeliveryTime() == null ? "即时送达" : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tbOrder.getExpectDeliveryTime())).append(end.toString()).append("<BR>");
                             break;
                         default:
                             break;
@@ -1212,7 +1213,7 @@ public class FeiYunUtils {
                             userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbCoupon == null ? "" : tbCoupon.getCouponName()).append(end.toString()).append("<BR>");
                             break;
                         case "expect_delivery_time":
-                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getExpectDeliveryTime()).append(end.toString()).append("<BR>");
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getExpectDeliveryTime() == null ? "即时送达" : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tbOrder.getExpectDeliveryTime())).append(end.toString()).append("<BR>");
                             break;
                         case "activity_title"://通过订单ID去activity_part_record表中查到activity_id后再去activity表中获取活动标题
                             userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(activity == null ? "" : activity.getTitle()).append(end.toString()).append("<BR>");

src/main/resources/application.yml

@@ -19,7 +19,7 @@ spring:
     allow-circular-references: true
   # 环境 dev|test|prod
   profiles:
-    active: prod
+    active: dev
   # jackson时间格式化
   jackson:
     time-zone: GMT+8