|
@@ -24,6 +24,7 @@ public class EleConvertPrint {
|
|
|
dto.setIsBook(ele.getBook()?1:0);
|
|
|
dto.setDeliveryTime(ele.getBook()?DateUtils.format(ele.getDeliverTime(),DateUtils.DATE_TIME_PATTERN):"");
|
|
|
dto.setOutOrderId(ele.getId());
|
|
|
+
|
|
|
//优惠信息
|
|
|
List<PrintOrderActDto> actDtos = new ArrayList<>();
|
|
|
List<OActivity> list = ele.getOrderActivities();
|
|
@@ -42,6 +43,7 @@ public class EleConvertPrint {
|
|
|
dto.setBoxFee(ele.getPackageFee()+"");
|
|
|
dto.setOriginalPrice(new BigDecimal(ele.getOriginalPrice()+""));
|
|
|
dto.setTotalPrice(new BigDecimal(ele.getTotalPrice()+""));
|
|
|
+// dto.setCaution(ele.getDescription());
|
|
|
UserExtraInfo userExtraInfo = ele.getUserExtraInfo();
|
|
|
dto.setCaution(ele.getDescription());
|
|
|
if(userExtraInfo!=null&& StringUtils.isNotBlank(userExtraInfo.getGreeting())){
|