修改

winsea-haixin-platform-backend/src/main/resources/banner.txt

@@ -6,13 +6,15 @@
 (____)(_) (_)`\___/'(_) (_)`\__  |`\__)(_)`\__,_)(_) (_)(_) (_)`\__,_)`\___/'`\__, |`\___/'`\__,_)(_) (_)
                            ( )_) |                                           ( )_| |
                             \___/'                                           `\___/'
-                                 _                  _
-                                (_ )               ( )
- _   _   _    _ _   ___     __   | |  _   _    _   | |__   _   _    _    _   _  _   _   ___
-( ) ( ) ( ) /'_` )/' _ `\ /'_ `\ | | ( ) ( ) /'_`\ |  _ `\( ) ( ) /'_`\ ( ) ( )( ) ( )/' _ `\
-| \_/ \_/ |( (_| || ( ) |( (_) | | | | (_) |( (_) )| | | || (_) |( (_) )| (_) || (_) || ( ) |
-`\___x___/'`\__,_)(_) (_)`\__  |(___)`\___/'`\___/'(_) (_)`\___/'`\___/'`\__, |`\___/'(_) (_)
-                         ( )_) |                                        ( )_| |
-                          \___/'                                        `\___/'
+     _                                         _
+     | |                                       | |
+  ___| |__   __ _ _ __   __ _ _   _ _   _ _ __ | |_ ___  _ __   __ _
+ / __| '_ \ / _` | '_ \ / _` | | | | | | | '_ \| __/ _ \| '_ \ / _` |
+| (__| | | | (_| | | | | (_| | |_| | |_| | | | | || (_) | | | | (_| |
+ \___|_| |_|\__,_|_| |_|\__, |\__, |\__,_|_| |_|\__\___/|_| |_|\__, |
+                         __/ | __/ |                            __/ |
+                        |___/ |___/                            |___/
+
+
 
 ::: Project (version:${application.version}) :::             ＼(^O^)／

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java

@@ -146,33 +146,38 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 //当前时间与预计送达时间比较
                 int result = date.compareTo(now);
                 if (result < 0) {
-                    //给司机发送消息
-                    NewsInfo newsInfo = new NewsInfo();
-                    newsInfo.setReCommonId(orderInfo.getCommonId());
-                    newsInfo.setBussId(orderInfo.getId());
-                    newsInfo.setNewsTitle("超时通知！");
-                    newsInfo.setNewsContent("订单编号" + orderInfo.getOrderNo() + "未按时到达，请联系货主说明原因。");
-                    newsInfo.setNewsTypeKey("5");
-                    newsInfo.setNewsType("超时通知");
-                    newsInfoService.addNewsInfo(newsInfo);
-                    //给平台发送消息
-                    NewsInfo newsInfo1 = new NewsInfo();
-                    newsInfo1.setReCommonId("84f62127b7384dcdbaeaddfe460329fc");
-                    newsInfo1.setBussId(orderInfo.getId());
-                    newsInfo1.setNewsTitle("超时通知！");
-                    newsInfo1.setNewsContent("订单编号" + orderInfo.getOrderNo() + "未按时送达。");
-                    newsInfo1.setNewsTypeKey("5");
-                    newsInfo1.setNewsType("超时通知");
-                    newsInfoService.addNewsInfo(newsInfo1);
-                    //给货主发送消息
-                    NewsInfo newsInfo2 = new NewsInfo();
-                    newsInfo2.setReCommonId(orderInfo.getCargoCommonId());
-                    newsInfo2.setBussId(orderInfo.getId());
-                    newsInfo2.setNewsTitle("超时通知！");
-                    newsInfo2.setNewsContent("订单编号" + orderInfo.getOrderNo() + "未按时到达，请联系司机了解原因，或联系客服介入。");
-                    newsInfo2.setNewsTypeKey("5");
-                    newsInfo2.setNewsType("超时通知");
-                    newsInfoService.addNewsInfo(newsInfo2);
+                    //查询是否已给司机发送过通知
+                    NewsInfo newsInfo4 = newsInfoService.selectOne(new EntityWrapper<NewsInfo>().eq("re_common_id",orderInfo.getCommonId())
+                    .eq("news_type_key","5").eq("buss_id",orderInfo.getId()));
+                    if (newsInfo4 == null) {
+                        //给司机发送消息
+                        NewsInfo newsInfo = new NewsInfo();
+                        newsInfo.setReCommonId(orderInfo.getCommonId());
+                        newsInfo.setBussId(orderInfo.getId());
+                        newsInfo.setNewsTitle("超时通知！");
+                        newsInfo.setNewsContent("订单编号" + orderInfo.getOrderNo() + "未按时到达，请联系货主说明原因。");
+                        newsInfo.setNewsTypeKey("5");
+                        newsInfo.setNewsType("超时通知");
+                        newsInfoService.addNewsInfo(newsInfo);
+                        //给平台发送消息
+                        NewsInfo newsInfo1 = new NewsInfo();
+                        newsInfo1.setReCommonId("84f62127b7384dcdbaeaddfe460329fc");
+                        newsInfo1.setBussId(orderInfo.getId());
+                        newsInfo1.setNewsTitle("超时通知！");
+                        newsInfo1.setNewsContent("订单编号" + orderInfo.getOrderNo() + "未按时送达。");
+                        newsInfo1.setNewsTypeKey("5");
+                        newsInfo1.setNewsType("超时通知");
+                        newsInfoService.addNewsInfo(newsInfo1);
+                        //给货主发送消息
+                        NewsInfo newsInfo2 = new NewsInfo();
+                        newsInfo2.setReCommonId(orderInfo.getCargoCommonId());
+                        newsInfo2.setBussId(orderInfo.getId());
+                        newsInfo2.setNewsTitle("超时通知！");
+                        newsInfo2.setNewsContent("订单编号" + orderInfo.getOrderNo() + "未按时到达，请联系司机了解原因，或联系客服介入。");
+                        newsInfo2.setNewsTypeKey("5");
+                        newsInfo2.setNewsType("超时通知");
+                        newsInfoService.addNewsInfo(newsInfo2);
+                    }
                 }
             });
         }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/MonitoringSystemReporting.java

@@ -477,8 +477,12 @@ public class MonitoringSystemReporting {
         goodsInfo1.setCargoTypeClassificationCode(orderInfo.getGoodsTypeKey());
         goodsInfo1.setGoodsItemGrossWeight(df.format(orderInfo.getGrossWeight() * 1000));
         //todo 体积，件数
-        goodsInfo1.setCube(df1.format(orderInfo.getVolume() != null ? orderInfo.getVolume() : "0"));
-        goodsInfo1.setTotalNumberOfPackages(String.valueOf(orderInfo.getPackageNumber() != null ? orderInfo.getPackageNumber() : "0"));
+        if (orderInfo.getVolume() != null){
+            goodsInfo1.setCube(df1.format(orderInfo.getVolume()));
+        }
+        if (orderInfo.getPackageNumber() != null) {
+            goodsInfo1.setTotalNumberOfPackages(String.valueOf(orderInfo.getPackageNumber()));
+        }
         goodsInfos.add(goodsInfo1);
         vehicleInfo.setGoodsInfo(goodsInfos);
         vehicleInfos.add(vehicleInfo);