diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java index 875ab48..abe8a93 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java @@ -861,7 +861,11 @@ public class ReturnApprovalApplicationService { List articles = new ArrayList<>(); NewsArticle article = new NewsArticle(); article.setTitle("退货审核通知"); - article.setDescription("退还商品:" + orderGoods.getGoodsName()); + if (orderGoods.getMode() != null && orderGoods.getMode().equals(3)) { + article.setDescription("退还格口:" + orderGoods.getGoodsName()); + } else { + article.setDescription("退还商品:" + orderGoods.getGoodsName()); + } article.setPicurl(orderGoods.getCoverImg()); String serverHost = CacheCenter.configCache.get(ConfigKeyEnum.SERVER_HOST.getValue()); article.setUrl(serverHost + UrlConstants.WECHAT_AUTH_URL + "?corpid=" + command.getCorpid()); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/OrderApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/OrderApplicationService.java index 26278b4..04b417a 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/OrderApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/OrderApplicationService.java @@ -403,10 +403,12 @@ public class OrderApplicationService { goodsModel.setDeleted(false); CabinetCellEntity cabinetCellEntity = cabinetCellService.getById(goodsModel.getCellId()); + SmartCabinetEntity cabinetEntity = smartCabinetService.getById(cabinetCellEntity.getCabinetId()); if (orderModel.getMode() != null && orderModel.getMode().equals(3)) { goodsModel.setPrice(cabinetCellEntity.getCellPrice()); goodsModel.setTotalAmount(cabinetCellEntity.getCellPrice()); + goodsModel.setGoodsName(cabinetEntity.getCabinetName() + "格口" + cabinetCellEntity.getCellNo()); } else { // 计算商品金额并验证库存 goodsModel.calculateTotal();