补充提交

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

@@ -229,7 +229,7 @@ public class ApiOrderBackServiceImpl implements ApiOrderBackService {
                             return;
                         }*/
                         int count = iOrderDeliveryService.count(new QueryWrapper<OrderDelivery>().eq("order_sn", order.getOrderSn())
-                                .ne("delivery_status", DeliveryStatusEnum.CANCEL.status).ne("out_trade_no", -1).isNotNull("out_trade_no"));
+                                .ne("delivery_status", DeliveryStatusEnum.CANCEL.status).ne("out_trade_no", -1);
                         if (count > 0) {
                             return;
                         }

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

@@ -1,8 +1,10 @@
 package com.ydd.app.service.impl;
 
+import com.ydd.common.utils.StringUtils;
 import com.ydd.third.common.utils.DateUtils;
 import com.ydd.third.common.vo.waimai.ElemeOrderResultVo;
 import com.ydd.third.common.vo.waimai.eleme.api.entity.order.OActivity;
+import com.ydd.third.common.vo.waimai.eleme.api.entity.order.UserExtraInfo;
 import com.ydd.third.print.request.PrintOrderActDto;
 import com.ydd.third.print.request.PrintOrderDto;
 import org.apache.commons.collections4.CollectionUtils;
@@ -40,7 +42,11 @@ public class EleConvertPrint {
         dto.setBoxFee(ele.getPackageFee()+"");
         dto.setOriginalPrice(new BigDecimal(ele.getOriginalPrice()+""));
         dto.setTotalPrice(new BigDecimal(ele.getTotalPrice()+""));
+        UserExtraInfo userExtraInfo = ele.getUserExtraInfo();
         dto.setCaution(ele.getDescription());
+        if(userExtraInfo!=null&& StringUtils.isNotBlank(userExtraInfo.getGreeting())){
+            dto.setCaution("[祝福语]："+userExtraInfo.getGreeting()+ele.getDescription());
+        }
         dto.setRecipientAddress(ele.getDeliveryPoiAddress());
         dto.setRecipientName(ele.getConsignee());
         String phone = ele.getPhoneList().get(0);