Commit 1fc58141 by 周晓航

Merge branch 'bugfix/zxh/配送单云打印显示错误问题' into qa

parents 0165f6ca ee69ebd3
......@@ -2262,7 +2262,7 @@ public class OrderAdapter {
orderPrintDto.setAddress(orderBean.getAddress());
orderPrintDto.setGmtExpect(orderBean.getGmtExpect() == null ? "立即送出" : (DateUtil.convert2String(new Date(orderBean.getGmtExpect()),
DateUtil.FORMAT_YYYY_MM_DD_HHMMSS)));
if (orderBean.getAddInfo() != null && StringUtils.isNotBlank(orderBean.getAddInfo().getDeliveryType())) {
if (orderBean.getAddInfo() != null && Objects.equals(orderBean.getAddInfo().getDeliveryType(),StoreDeliveryMethod.THIRD.getType())) {
orderPrintDto.setDeliveryTypeDesc("第三方配送");
if (StringUtils.isNotBlank(orderBean.getAddInfo().getExpress())) {
orderPrintDto.setDeliveryTypeDesc(orderBean.getAddInfo().getExpress());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment