Skip to content

J
jiedao-api-boot-master
Commit 223f7574 authored by Smile's avatar Smile
Browse files
Options

Merge remote-tracking branch 'origin/jd_dev' into jd_dev

parents 11eec742 42310b42
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 12 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInServiceImpl.java
View file @ 223f7574
......@@ -2669,8 +2669,13 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
// 查询仓库
LogisticsInfoDto logisticsInfoDto = warehouseLineMapper.getStartInfoAndDestInfoByLineId(orderDO.getLineId());
String startWarehouseName = I18nMessage.getLang() == 0 ? logisticsInfoDto.getStartTitleZh() : logisticsInfoDto.getStartTitleEn();
String destWearehouseName = I18nMessage.getLang() == 0 ? logisticsInfoDto.getDestTitleZh() : logisticsInfoDto.getDestTitleEn();
String startWarehouseName = logisticsInfoDto.getStartTitleZh();
String startWarehouseNameEn = logisticsInfoDto.getStartTitleEn();
String startWarehouseNameFr = logisticsInfoDto.getStartTitleFr();
String destWearehouseName = logisticsInfoDto.getDestTitleZh() ;
String destWearehouseNameEn = logisticsInfoDto.getDestTitleEn();
String destWearehouseNameFr = logisticsInfoDto.getDestTitleFr();
DateTime ruchang = DateTime.of(orderDO.getRucangTime());
String marks = orderDO.getMarks();
......@@ -2719,16 +2724,16 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
// 尊敬的 %s（先生/女士），捷道货运通知您：您的唛头为%s，%s箱, %sCBM, %sKg, 入仓号为%s的货物已于%s 送到%s（起运港仓库），如有疑问请于工作时间内（9:00--18:00）与我司客服联系：400-900-9962
content = String.format(I18nMessage.getMessage("app.message.air.warehousein.content", LangEnum.ZH.getLang()),
user.getNickname(), orderDO.getMarks(), orderDO.getSumNum(), orderDO.getSumVolume().toPlainString(),
orderDO.getSumWeight().toPlainString(), orderDO.getOrderNo(), DateUtil.format(ruchang, "yyyy年MM月dd日"),
orderDO.getSumWeight().toPlainString(), orderDO.getOrderNo(), DateUtil.format(ruchang, "yyyy-MM-dd"),
startWarehouseName);
contentEn = String.format(I18nMessage.getMessage("app.message.air.warehousein.content", LangEnum.EN.getLang()),
user.getNickname(), orderDO.getMarks(), orderDO.getSumNum(), orderDO.getSumVolume().toPlainString(),
orderDO.getSumWeight().toPlainString(), orderDO.getOrderNo(), DateUtil.format(ruchang, "yyyy年MM月dd日"),
startWarehouseName);
orderDO.getSumWeight().toPlainString(), orderDO.getOrderNo(), DateUtil.format(ruchang, "yyyy-MM-dd"),
startWarehouseNameEn);
contentFr = String.format(I18nMessage.getMessage("app.message.air.warehousein.content", LangEnum.FR.getLang()),
user.getNickname(), orderDO.getMarks(), orderDO.getSumNum(), orderDO.getSumVolume().toPlainString(),
orderDO.getSumWeight().toPlainString(), orderDO.getOrderNo(), DateUtil.format(ruchang, "yyyy年MM月dd日"),
startWarehouseName);
orderDO.getSumWeight().toPlainString(), orderDO.getOrderNo(), DateUtil.format(ruchang, "yyyy-MM-dd"),
startWarehouseNameFr);
}
} else {
title = String.format(I18nMessage.getMessage("app.message.warehousein.title", LangEnum.ZH.getLang()), orderDO.getOrderNo());
......@@ -2736,16 +2741,16 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
titleFr = String.format(I18nMessage.getMessage("app.message.warehousein.title", LangEnum.FR.getLang()), orderDO.getOrderNo());
content = String.format(I18nMessage.getMessage("app.message.warehousein.content", LangEnum.ZH.getLang()),
user.getNickname(), orderDO.getMarks(), orderDO.getSumNum(), orderDO.getSumVolume().toPlainString(),
orderDO.getSumWeight().toPlainString(), orderDO.getOrderNo(), DateUtil.format(ruchang, "yyyy年MM月dd日"),
orderDO.getSumWeight().toPlainString(), orderDO.getOrderNo(), DateUtil.format(ruchang, "yyyy-MM-dd"),
startWarehouseName);
contentEn = String.format(I18nMessage.getMessage("app.message.warehousein.content", LangEnum.EN.getLang()),
user.getNickname(), orderDO.getMarks(), orderDO.getSumNum(), orderDO.getSumVolume().toPlainString(),
orderDO.getSumWeight().toPlainString(), orderDO.getOrderNo(), DateUtil.format(ruchang, "yyyy年MM月dd日"),
startWarehouseName);
orderDO.getSumWeight().toPlainString(), orderDO.getOrderNo(), DateUtil.format(ruchang, "yyyy-MM-dd"),
startWarehouseNameEn);
contentFr = String.format(I18nMessage.getMessage("app.message.warehousein.content", LangEnum.FR.getLang()),
user.getNickname(), orderDO.getMarks(), orderDO.getSumNum(), orderDO.getSumVolume().toPlainString(),
orderDO.getSumWeight().toPlainString(), orderDO.getOrderNo(), DateUtil.format(ruchang, "yyyy年MM月dd日"),
startWarehouseName);
orderDO.getSumWeight().toPlainString(), orderDO.getOrderNo(), DateUtil.format(ruchang, "yyyy-MM-dd"),
startWarehouseNameFr);
}
// 发送站内信
InternalMessageCreateDto dto = InternalMessageCreateDto.builder().toIdList(Arrays.asList(userId))
......
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