From 17e7cde3be486d840887de6ecb9a8b05486e19aa Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 23 Jun 2026 10:19:44 +0800
Subject: [PATCH] feat(admin): 优化国家运费配置管理功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
index 34fa13b..35c863c 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
@@ -536,9 +536,13 @@
List<MallOrderItem> mallOrderItemList = ValidateEntityUtils
.ensureColumnReturnEntityList(id, MallOrderItem::getOrderId, mallOrderItemMapper::selectList, "订单不存在");
StringBuffer itemName = new StringBuffer();
- itemName.append("商品：");
+ itemName.append("商品-");
mallOrderItemList.forEach(mallOrderItem -> {
- itemName.append(mallOrderItem.getGoodsName()+"-"+mallOrderItem.getSkuName());
+ itemName.append(mallOrderItem.getGoodsName());
+ itemName.append("-");
+ itemName.append(mallOrderItem.getSkuName());
+ itemName.append("-");
+ itemName.append(mallOrderItem.getCnt());
});
Item item = new Item();
item.setItemName(itemName.toString());
@@ -548,8 +552,8 @@
kdCreateWaybillOrderPdfNotifyReq.setPiece(1);
String state = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- DataDictionaryEnum.SENDER_ADDRESS.getType(),
- DataDictionaryEnum.SENDER_ADDRESS.getCode()
+ DataDictionaryEnum.SENDER_STATE.getType(),
+ DataDictionaryEnum.SENDER_STATE.getCode()
).getValue();
KdCreateWaybillOrderPdfNotifyRsp pdfOrder;
if(state.equals("0")){
@@ -588,8 +592,8 @@
kdCancelOrderNotifyReq.setReason("Don't want to buy");
String state = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- DataDictionaryEnum.SENDER_ADDRESS.getType(),
- DataDictionaryEnum.SENDER_ADDRESS.getCode()
+ DataDictionaryEnum.SENDER_STATE.getType(),
+ DataDictionaryEnum.SENDER_STATE.getCode()
).getValue();
KdCancelOrderNotifyRsp kdCancelOrderNotifyRsp;
if(state.equals("0")){
--
Gitblit v1.9.1