代码同步

lb-app/src/main/java/com/ydd/app/OrderEntityUtils.java

@@ -264,6 +264,9 @@ public class OrderEntityUtils {
                 }else if (orderReq.getOrderSource().equals("102")||orderReq.getOrderSource().equals("103")){
                     orderVo.setOriginMark("elm");
                     orderVo.setOriginMarkNo(orderReq.getPoiSeq());
+                } else if (orderReq.getOrderSource().equals("104")){
+                    orderVo.setOriginMark("jdhome");
+                    orderVo.setOriginMarkNo(orderReq.getPoiSeq());
                 }
             }
             /**
@@ -357,6 +360,9 @@ public class OrderEntityUtils {
                 }else if (orderReq.getOrderSource().equals("102")||orderReq.getOrderSource().equals("103")){
                     orderVo.setOriginMark("elm");
                     orderVo.setOriginMarkNo(orderReq.getPoiSeq());
+                }   else if (orderReq.getOrderSource().equals("104")){
+                    orderVo.setOriginMark("jdhome");
+                    orderVo.setOriginMarkNo(orderReq.getPoiSeq());
                 }
             }
             /**
@@ -435,6 +441,9 @@ public class OrderEntityUtils {
                 }else if (orderReq.getOrderSource().equals("102")||orderReq.getOrderSource().equals("103")){
                     orderVo.setOrderingSourceType(3);
                     orderVo.setOrderingSourceNo(orderReq.getPoiSeq());
+                } else if (orderReq.getOrderSource().equals("104")){
+                    orderVo.setOrderingSourceType(6);
+                    orderVo.setOrderingSourceNo(orderReq.getPoiSeq());
                 }
             }
             /**
@@ -568,6 +577,10 @@ public class OrderEntityUtils {
                     orderVo.setOrderSource("2");
                     orderVo.setOrderSequence(orderReq.getPoiSeq());
                 }
+                else if (orderReq.getOrderSource().equals("104")){
+                    orderVo.setOrderSource("京东到家");
+                    orderVo.setOrderSequence(orderReq.getPoiSeq());
+                }
             }else {
                 orderVo.setOrderSource("商家APP");
             }
@@ -621,25 +634,7 @@ public class OrderEntityUtils {
              * 是否是预约单	0：非预约单；1：预约单
              */
             orderVo.setIsAppoint(0);
-//            if (TakeTypeEnum.APPOINTMENT.type.equals(orderReq.getTakeType())) {
-//                orderVo.setIsAppoint(1);
-//                /**
-//                 * 用户期望上门时间
-//                 * 顺丰
-//                 * expect_pickup_time 不必传
-//                 * 预约单，期望取货时间
-//                 */
-//                orderVo.setExpectedPickupTime(DateUtils.parseDate(orderReq.getTakeTime()));
-//
-//                /**
-//                 * 预约单类型
-//                 * 顺丰
-//                 * appoint_type 不必传
-//                 * 预约单类型
-//                 * 顺丰：预约单的时候传入,1：预约单送达单；2：预约单上门单
-//                 */
-//                orderVo.setAppointType(2);
-//            }
+
 
             /**
              * 预约单，期望送达时间
@@ -879,6 +874,9 @@ public class OrderEntityUtils {
                 }else if (orderReq.getOrderSource().equals("102")||orderReq.getOrderSource().equals("103")){
                     orderVo.setOrderSource("2");
                     orderVo.setOrderingSourceNo(orderReq.getPoiSeq());
+                } else if (orderReq.getOrderSource().equals("104")){
+                    orderVo.setOrderSource("3");
+                    orderVo.setOrderingSourceNo(orderReq.getPoiSeq());
                 }
             }else {
                 orderVo.setOrderSource("3");
@@ -1010,6 +1008,8 @@ public class OrderEntityUtils {
                     orderVo.setOrderSource("6");
                 }else if (orderReq.getOrderSource().equals("103")){
                     orderVo.setOrderSource("8");
+                }else if (orderReq.getOrderSource().equals("104")){
+                    orderVo.setOrderSource("0");
                 }
             } else {
                 orderVo.setOrderSource("0");
@@ -1085,6 +1085,8 @@ public class OrderEntityUtils {
             } else {
                 if(orderReq.getOrderSource().equals("103")){
                     orderReq.setOrderSource("102");
+                }else if (orderReq.getOrderSource().equals("104")){
+                    orderVo.setOrderSource("103");
                 }
                 orderVo.setOrderSource(orderReq.getOrderSource());
             }
@@ -1137,23 +1139,6 @@ public class OrderEntityUtils {
              */
             orderVo.setIsAppoint(0);
 
-//            if (TakeTypeEnum.APPOINTMENT.type.equals(orderReq.getTakeType())) {
-//                /**
-//                 * 美团
-//                 * 是否是预约单
-//                 * 美团：order_type，不必传，订单类型，默认为0 0: 即时单(尽快送达，限当日订单) 1: 预约单
-//                 */
-//                orderVo.setIsAppoint(1);
-//
-//                /**
-//                 * 美团
-//                 * 预约单，期望取货时间
-//                 * 美团：expected_pickup_time, 不必传，期望取货时间
-//                 */
-//                orderVo.setExpectedDeliveryTime(DateUtils.parseDate(orderReq.getTakeTime()));
-//                // 普通订单是取件时间，外卖是送达时间
-//                orderVo.setExpectedPickupTime(DateUtils.parseDate(orderReq.getTakeTime()));
-//            }
 
             /**
              * 美团
@@ -1221,6 +1206,8 @@ public class OrderEntityUtils {
                     orderVo.setOrderSource("饿了么");
                 }else if (orderReq.getOrderSource().equals("103")){
                     orderVo.setOrderSource("饿百");
+                }else if (orderReq.getOrderSource().equals("104")){
+                    orderVo.setOrderSource("京东到家");
                 }
             }
             if (orderReq.getTotalMoney() != null) {
@@ -1366,6 +1353,8 @@ public class OrderEntityUtils {
                     orderVo.setOrderSource("6");
                 }else if (orderReq.getOrderSource().equals("103")){
                     orderVo.setOrderSource("8");
+                }else if (orderReq.getOrderSource().equals("104")){
+                    orderVo.setOrderSource("0");
                 }
             } else {
                 orderVo.setOrderSource("0");

lb-app/src/main/java/com/ydd/app/callback/controller/MeituanWaiMaiSgCallback.java

@@ -57,7 +57,7 @@ public class MeituanWaiMaiSgCallback {
     public String doStoreMap(@RequestParam Map<String, String> params) throws UnsupportedEncodingException {
         JSONObject res = new JSONObject();
         if (null == params||params.size()==0) {
-            res.put("data", "OK");
+            res.put("data", "ok");
             return res.toJSONString();
         }
         res.put("data", "ok");
@@ -93,10 +93,10 @@ public class MeituanWaiMaiSgCallback {
     public String doNewOrder(@RequestParam Map<String, String> params) {
         JSONObject res = new JSONObject();
         if (null == params||params.size()==0) {
-            res.put("data", "OK");
+            res.put("data", "ok");
             return res.toJSONString();
         }
-        res.put("data", "OK");
+        res.put("data", "ok");
         log.info("美团闪购推送新订单回调："+JSONUtil.toJson(params));
         ResObject<MeituanSgOrderResultVo> callbackRes = callback.doNewOrder(params);
         // JSONObject json = callBack.doNewOrder(params);
@@ -104,8 +104,8 @@ public class MeituanWaiMaiSgCallback {
             MeituanSgOrderResultVo orderVo = callbackRes.getData();
 
             apiWaimaiService.sgDoNewOrder(orderVo);
-            //服务商接收后需立即返回{“data”.“OK”}
-            // res.put("data", "OK");
+            //服务商接收后需立即返回{“data”.“ok”}
+            // res.put("data", "ok");
             return res.toJSONString();
         } else {
             log.error(callbackRes.getMsg());
@@ -123,17 +123,17 @@ public class MeituanWaiMaiSgCallback {
     public String doConfirmOrder(@RequestParam Map<String, String> params) {
         JSONObject res = new JSONObject();
         if (null == params||params.size()==0) {
-            res.put("data", "OK");
+            res.put("data", "ok");
             return res.toJSONString();
         }
-        res.put("data", "OK");
+        res.put("data", "ok");
         log.info("美团闪购商家已确认订单的回调："+JSONUtil.toJson(params));
         ResObject<MeituanSgOrderResultVo> callbackRes = callback.doNewOrder(params);
         if (callbackRes.getCode() == 0) {
             MeituanSgOrderResultVo orderVo = callbackRes.getData();
             apiWaimaiService.sgConfirmOrder(orderVo);
-            //服务商接收后需立即返回{“data”.“OK”}
-            // res.put("data", "OK");
+            //服务商接收后需立即返回{“data”.“ok”}
+            // res.put("data", "ok");
             return res.toJSONString();
         } else {
             log.error(callbackRes.getMsg());
@@ -151,10 +151,10 @@ public class MeituanWaiMaiSgCallback {
     public String doFinishOrder(@RequestParam Map<String, String> params) {
         JSONObject res = new JSONObject();
         if (null == params||params.size()==0) {
-            res.put("data", "OK");
+            res.put("data", "ok");
             return res.toJSONString();
         }
-        res.put("data", "OK");
+        res.put("data", "ok");
         log.info("美团闪购订单完成后的回调："+JSONUtil.toJson(params));
         ResObject<MeituanSgOrderResultVo> callbackRes = callback.doFinishOrder(params);
         if (callbackRes.getCode() == 0) {
@@ -163,8 +163,8 @@ public class MeituanWaiMaiSgCallback {
             /**
              * 此时对返回的订单完成数据作处理
              */
-            //服务商接收后需立即返回{“data”.“OK”}
-            // res.put("data", "OK");
+            //服务商接收后需立即返回{“data”.“ok”}
+            // res.put("data", "ok");
             return res.toJSONString();
         } else {
             log.error(callbackRes.getMsg());
@@ -182,7 +182,7 @@ public class MeituanWaiMaiSgCallback {
     public String doCancelOrder(@RequestParam Map<String, String> params) {
         JSONObject res = new JSONObject();
         if (null == params||params.size()==0) {
-            res.put("data", "OK");
+            res.put("data", "ok");
             return res.toJSONString();
         }
         res.put("data", "ok");
@@ -192,7 +192,7 @@ public class MeituanWaiMaiSgCallback {
             MeituanSgOrderCancelResultVo orderVo = callbackRes.getData();
 
             apiWaimaiService.sgDoCancelOrder(orderVo);
-            // res.put("data", "OK");
+            // res.put("data", "ok");
             return res.toJSONString();
         } else {
             log.error(callbackRes.getMsg());
@@ -210,10 +210,10 @@ public class MeituanWaiMaiSgCallback {
     public String doOrderRefund(@RequestParam Map<String, String> params) {
         JSONObject res = new JSONObject();
         if (null == params||params.size()==0) {
-            res.put("data", "OK");
+            res.put("data", "ok");
             return res.toJSONString();
         }
-        res.put("data", "OK");
+        res.put("data", "ok");
         log.info("美团闪购订单退款回调："+JSONUtil.toJson(params));
         ResObject<MeituanSgOrderRefundResultVo> callbackRes = callback.doOrderRefund(params);
         // JSONObject json = callBack.doNewOrder(params);
@@ -241,8 +241,8 @@ public class MeituanWaiMaiSgCallback {
                     //取消退款申诉，对返回的数据作处理
                 }
             }
-            //服务商接收后需立即返回{“data”.“OK”}
-            // res.put("data", "OK");
+            //服务商接收后需立即返回{“data”.“ok”}
+            // res.put("data", "ok");
             return res.toJSONString();
         }
         return res.toJSONString();
@@ -258,10 +258,10 @@ public class MeituanWaiMaiSgCallback {
     public String doOrderPartRefund(@RequestParam Map<String, String> params) throws UnsupportedEncodingException {
         JSONObject res = new JSONObject();
         if (null == params||params.size()==0) {
-            res.put("data", "OK");
+            res.put("data", "ok");
             return res.toJSONString();
         }
-        res.put("data", "OK");
+        res.put("data", "ok");
         log.info("美团闪购订单部分退款的回调："+JSONUtil.toJson(params));
         ResObject<MeituanSgOrderPartRefundResultVo> callbackRes = callback.doOrderPartRefund(params);
         // JSONObject json = callBack.doNewOrder(params);
@@ -282,8 +282,8 @@ public class MeituanWaiMaiSgCallback {
                     //商家拒绝部分退款，对返回的数据作处理
                 }
             }
-            //服务商接收后需立即返回{“data”.“OK”}
-            // res.put("data", "OK");
+            //服务商接收后需立即返回{“data”.“ok”}
+            // res.put("data", "ok");
             return res.toJSONString();
         }
         return res.toJSONString();
@@ -299,10 +299,10 @@ public class MeituanWaiMaiSgCallback {
     public String doPrivacyNoDecline(@RequestParam Map<String, String> params) {
         JSONObject res = new JSONObject();
         if (null == params||params.size()==0) {
-            res.put("data", "OK");
+            res.put("data", "ok");
             return res.toJSONString();
         }
-        res.put("data", "OK");
+        res.put("data", "ok");
         log.info("美团闪购隐私号-降级回调："+JSONUtil.toJson(params));
         ResObject callbackRes = callback.doPrivacyNoDecline(params);
         // JSONObject json = callBack.doPrivacyNoDecline(params);
@@ -310,8 +310,8 @@ public class MeituanWaiMaiSgCallback {
             /**
              * 此时异步调用拉取订单并通知客户
              */
-            //{“data”.“OK”}
-            // res.put("data", "OK");
+            //{“data”.“ok”}
+            // res.put("data", "ok");
             return res.toJSONString();
         } else {
             log.error(callbackRes.getMsg());
@@ -329,11 +329,11 @@ public class MeituanWaiMaiSgCallback {
     public String doRemindOrder(@RequestParam Map<String, String> params) {
         JSONObject res = new JSONObject();
         if (null == params||params.size()==0) {
-            res.put("data", "OK");
+            res.put("data", "ok");
             return res.toJSONString();
         }
 
-        res.put("data", "OK");
+        res.put("data", "ok");
         log.info("美团闪购用户催单后的回调："+JSONUtil.toJson(params));
         ResObject<MeituanSgRemindOrderResultVo> callbackRes = callback.doRemindOrder(params);
         // JSONObject json = callBack.doNewOrder(params);
@@ -342,8 +342,8 @@ public class MeituanWaiMaiSgCallback {
             /**
              * 此时对催单的处理
              */
-            //服务商接收后需立即返回{“data”.“OK”}
-            // res.put("data", "OK");
+            //服务商接收后需立即返回{“data”.“ok”}
+            // res.put("data", "ok");
             return res.toJSONString();
         }
         return res.toJSONString();
@@ -359,10 +359,10 @@ public class MeituanWaiMaiSgCallback {
     public String doWmOrderStatus(@RequestParam Map<String, String> params) {
         JSONObject res = new JSONObject();
         if (null == params||params.size()==0) {
-            res.put("data", "OK");
+            res.put("data", "ok");
             return res.toJSONString();
         }
-        res.put("data", "OK");
+        res.put("data", "ok");
         log.info("美团闪购外卖非接单推送订单配送状态通知："+JSONUtil.toJson(params));
         return res.toJSONString();
     }

lb-app/src/main/java/com/ydd/app/dto/OrderReq.java

@@ -200,7 +200,7 @@ public class OrderReq implements Serializable {
     private String shopName;
 
     /**
-     * 平台类型(0-猎豹 1-美团 2-饿了么 3-饿百零售 5-美团闪购)
+     * 平台类型(0-猎豹 1-美团 2-饿了么 3-饿百零售 5-美团闪购 6-京东到家)
      */
     private Integer platformType;
 

lb-app/src/main/java/com/ydd/app/service/impl/ApiCallBackDaDa.java

@@ -84,7 +84,7 @@ public class ApiCallBackDaDa extends ApiCallBack {
                 dto.setOrderStatus(OrderStatusEnum.TO_BE_DELIVERED.status);
                 dto.setOrderMtStatus(15);
                 dto.setOrderEleStatus("DELIVERY_KNIGHT_REACH_SHOP");
-
+                dto.setOrderEleRetaiStatus("7");
                 break;
             case 1000:
                 dto.setOrderStatus(OrderStatusEnum.CANCEL.status);

lb-app/src/main/java/com/ydd/app/service/impl/ApiOrderNewServiceImpl.java

@@ -456,6 +456,10 @@ public class ApiOrderNewServiceImpl implements ApiOrderNewService {
                 // 饿百零售
                 order.setOrderSource("103");
             }
+            else if (platformType == 6) {
+                // 京东到家
+                order.setOrderSource("104");
+            }
         }
     }
 

lb-app/src/main/java/com/ydd/app/service/impl/ApiOrderValuationServiceImpl.java

@@ -211,6 +211,9 @@ public class ApiOrderValuationServiceImpl implements ApiOrderValuationService {
             } else if (platformType == 3) {
                 // 饿百零售
                 orderReq.setOrderSource("103");
+            }else if (platformType == 6) {
+            // 京东到家
+            orderReq.setOrderSource("104");
             }
         }
     }
@@ -521,6 +524,8 @@ public class ApiOrderValuationServiceImpl implements ApiOrderValuationService {
             orderReq.setOrderSource("103");
         }else if (waimaiOrder.getOrderType().equals(WaimaiOrderTypeEnum.MEI_TUAN_SG.getType())) {
             orderReq.setOrderSource("101");
+        }else if (waimaiOrder.getOrderType().equals(WaimaiOrderTypeEnum.JD_HOME.getType())) {
+            orderReq.setOrderSource("104");
         }
         orderReq.setTakeRemark(takeRemark);
         orderReq.setWaiMaiRemark(waimaiOrder.getCaution());

lb-app/src/main/java/com/ydd/app/service/impl/ApiRiderLocationServiceImpl.java

@@ -69,6 +69,8 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
                 if (resObject.getCode().intValue() == 0) {
                     dto.setShipperLat(resObject.getData().getRiderLat());
                     dto.setShipperLng(resObject.getData().getRiderLng());
+                    dto.setShipperName(resObject.getData().getRiderName());
+                    dto.setShipperPhone(resObject.getData().getRiderPhone());
                 }
             } else if (DeliveryTypeEnums.DADA_YZ.getType().equals(delivery.getType())&&orderDelivery!=null) {
                 OrderQueryVo orderQueryVo = new OrderQueryVo();
@@ -86,6 +88,8 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
                 if (resObject.getCode().intValue() == 0) {
                     dto.setShipperLat(resObject.getData().getRiderLat());
                     dto.setShipperLng(resObject.getData().getRiderLng());
+                    dto.setShipperName(resObject.getData().getRiderName());
+                    dto.setShipperPhone(resObject.getData().getRiderPhone());
                 }
             } else if (DeliveryTypeEnums.UUPT.getType().equals(delivery.getType())) {
                 OrderQueryVo orderQueryVo = new OrderQueryVo();
@@ -98,6 +102,8 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
                         double[] receiverGps = CoordinateUtils.bd09_To_Gcj02(resObject.getData().getRiderLat().doubleValue(), resObject.getData().getRiderLng().doubleValue());
                         dto.setShipperLat(new BigDecimal(receiverGps[0] + ""));
                         dto.setShipperLng(new BigDecimal(receiverGps[1] + ""));
+                        dto.setShipperName(resObject.getData().getRiderName());
+                        dto.setShipperPhone(resObject.getData().getRiderPhone());
                         dto.setEstimateArriveTimeStr(resObject.getData().getEstimateArriveTimeStr());
                     }
                     //订单距离
@@ -115,6 +121,8 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
                             double[] receiverGps = CoordinateUtils.bd09_To_Gcj02(resObject.getData().getRiderLat().doubleValue(), resObject.getData().getRiderLng().doubleValue());
                             dto.setShipperLat(new BigDecimal(receiverGps[0] + ""));
                             dto.setShipperLng(new BigDecimal(receiverGps[1] + ""));
+                            dto.setShipperName(resObject.getData().getRiderName());
+                            dto.setShipperPhone(resObject.getData().getRiderPhone());
                             dto.setEstimateArriveTimeStr(resObject.getData().getEstimateArriveTimeStr());
                         }
 //                        dto.setShipperLat(resObject.getData().getRiderLat());
@@ -143,6 +151,8 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
                     if (res.getCode().intValue() == 0) {
                         dto.setShipperLat(res.getData().getLat());
                         dto.setShipperLng(res.getData().getLng());
+                        dto.setShipperName(resObject.getData().getRiderName());
+                        dto.setShipperPhone(resObject.getData().getRiderPhone());
                       //  dto.setEstimateArriveTimeStr(resObject.getData().getEstimateArriveTimeStr());
                     }
                 }
@@ -167,6 +177,8 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
                     orderQuery.setDeliveryId(order.getId());
                     ResObject<OrderQueryResultVo> resObject1 = client.queryOrderInfo(orderQuery);
                     if (resObject1.getCode().intValue() == 0) {
+                        dto.setShipperName(resObject1.getData().getRiderName());
+                        dto.setShipperPhone(resObject1.getData().getRiderPhone());
                         dto.setEstimateArriveTimeStr(resObject1.getData().getEstimateArriveTimeStr());
                     }
                 }
@@ -205,6 +217,8 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
                             double[] receiverGps = CoordinateUtils.bd09_To_Gcj02(resObject.getData().getRiderLat().doubleValue(), resObject.getData().getRiderLng().doubleValue());
                             dto.setShipperLat(new BigDecimal(receiverGps[0] + ""));
                             dto.setShipperLng(new BigDecimal(receiverGps[1] + ""));
+                            dto.setShipperName(resObject.getData().getRiderName());
+                            dto.setShipperPhone(resObject.getData().getRiderPhone());
                         }
 //                        dto.setShipperLat(resObject.getData().getRiderLat());
 //                        dto.setShipperLng(resObject.getData().getRiderLng());
@@ -229,6 +243,8 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
                             double[] receiverGps = CoordinateUtils.bd09_To_Gcj02(resObject.getData().getRiderLat().doubleValue(), resObject.getData().getRiderLng().doubleValue());
                             dto.setShipperLat(new BigDecimal(receiverGps[0] + ""));
                             dto.setShipperLng(new BigDecimal(receiverGps[1] + ""));
+                            dto.setShipperName(resObject.getData().getRiderName());
+                            dto.setShipperPhone(resObject.getData().getRiderPhone());
                             dto.setEstimateArriveTimeStr(resObject.getData().getEstimateArriveTimeStr());
                         }
 //                        dto.setShipperLat(resObject.getData().getRiderLat());
@@ -269,8 +285,8 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
                     if(resObject.getData().getLat()!=null){
                         dto.setShipperLat(new BigDecimal(resObject.getData().getLat() + ""));
                         dto.setShipperLng(new BigDecimal(resObject.getData().getLng()+ ""));
-//                        dto.setShipperName(resObject.getData().getName());
-//                        dto.setShipperPhone(resObject.getData().getPhone());
+                        dto.setShipperName(resObject.getData().getName());
+                        dto.setShipperPhone(resObject.getData().getPhone());
                     }
                     //订单距离
 //                    dto.setOrderDistance(new BigDecimal(resObject.getData().getDistance()));
@@ -304,6 +320,8 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
 //                        dto.setShipperLat(resObject.getData().getRiderLat());
 //                        dto.setShipperLng(resObject.getData().getRiderLng());
                         dto.setEstimateArriveTimeStr(resObject.getData().getEstimateArriveTimeStr());
+                        dto.setShipperName(resObject.getData().getRiderName());
+                        dto.setShipperPhone(resObject.getData().getRiderPhone());
                     }
                     RiderLocationVo riderLocationVo = new RiderLocationVo();
                     riderLocationVo.setLbClient(DeliveryTypeEnums.FENG_NIAO_PT.getName());

lb-app/src/main/java/com/ydd/app/service/impl/ApiWaimaiServiceImpl.java

@@ -834,7 +834,7 @@ public class ApiWaimaiServiceImpl implements ApiWaimaiService {
             UserExtraInfo userExtraInfo = orderVo.getUserExtraInfo();
             waimaiOrder.setCaution(orderVo.getDescription());
             if(userExtraInfo!=null&&StringUtils.isNotBlank(userExtraInfo.getGreeting())){
-                waimaiOrder.setCaution("[祝福语]："+userExtraInfo.getGreeting()+orderVo.getDescription());
+                waimaiOrder.setCaution("[祝福语]："+userExtraInfo.getGreeting()+" "+orderVo.getDescription());
             }
             waimaiOrder.setOrderTime(orderVo.getCreatedAt());
             waimaiOrder.setDaySeq(String.valueOf(orderVo.getDaySn()));

lb-app/src/main/java/com/ydd/app/service/impl/EleConvertPrint.java

@@ -47,7 +47,7 @@ public class EleConvertPrint {
         UserExtraInfo userExtraInfo = ele.getUserExtraInfo();
         dto.setCaution(ele.getDescription());
         if(userExtraInfo!=null&& StringUtils.isNotBlank(userExtraInfo.getGreeting())){
-            dto.setCaution("[祝福语]："+userExtraInfo.getGreeting()+ele.getDescription());
+            dto.setCaution("[祝福语]："+userExtraInfo.getGreeting()+" "+ele.getDescription());
         }
         dto.setRecipientAddress(ele.getDeliveryPoiAddress());
         dto.setRecipientName(ele.getConsignee());

lb-module/src/main/java/com/ydd/module/service/impl/ShopWaimaiServiceImpl.java

@@ -194,7 +194,7 @@ public class ShopWaimaiServiceImpl extends ServiceImpl<ShopWaimaiMapper, ShopWai
          */
         if(CollectionUtils.isNotEmpty(list)){
             for(ShopWaimai shopWaimai :list){
-                if(shopWaimai.getUpdateTime().getTime()/1000-shopWaimai.getExpiresIn()<86400){
+                if((System.currentTimeMillis()-shopWaimai.getUpdateTime().getTime())/1000-86400>=shopWaimai.getExpiresIn()){
                     OAuthTokenParam tokenParam = MtSgAuthRequest.refreshOauthToken(waimaiConfig.getMeituansgAppid(), waimaiConfig.getMeituansgAppScert(), shopWaimai.getRefreshToken());
                     shopWaimai.setAuthToken(tokenParam.getAccess_token());
                     shopWaimai.setRefreshToken(tokenParam.getRefresh_token());