From c014190d15b41704085d2e96b3fb51d39d8c2016 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 12 Feb 2025 13:39:07 +0800
Subject: [PATCH] refactor(mall): 优化订单商品名称的显示格式
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 2f6a777..6d0db36 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
@@ -3,6 +3,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.enumerates.*;
+import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.ValidateEntityUtils;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
@@ -537,7 +538,7 @@
StringBuffer itemName = new StringBuffer();
itemName.append("商品：");
mallOrderItemList.forEach(mallOrderItem -> {
- itemName.append(mallOrderItem.getGoodsName()+"-"+mallOrderItem.getSkuName());
+ itemName.append(mallOrderItem.getGoodsName()+":"+mallOrderItem.getSkuName()+"*"+mallOrderItem.getCnt());
});
Item item = new Item();
item.setItemName(itemName.toString());
@@ -546,8 +547,18 @@
kdCreateWaybillOrderPdfNotifyReq.setItems(items);
kdCreateWaybillOrderPdfNotifyReq.setPiece(1);
- KdCreateWaybillOrderPdfNotifyRsp pdfOrder = ClientParamService.getInstance(ClientParamEnum.TEST.name()).createPdfOrder(kdCreateWaybillOrderPdfNotifyReq);
-
+ String state = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SENDER_STATE.getType(),
+ DataDictionaryEnum.SENDER_STATE.getCode()
+ ).getValue();
+ KdCreateWaybillOrderPdfNotifyRsp pdfOrder;
+ if(state.equals("0")){
+ pdfOrder = ClientParamService.getInstance(ClientParamEnum.TEST.name()).createPdfOrder(kdCreateWaybillOrderPdfNotifyReq);
+ }else if(state.equals("1")){
+ pdfOrder = ClientParamService.getInstance(ClientParamEnum.PRD.name()).createPdfOrder(kdCreateWaybillOrderPdfNotifyReq);
+ }else{
+ throw new FebsException("一键发货失败，系统配置异常");
+ }
ValidateEntityUtils.ensureEqual(pdfOrder.getResult(), true, "一键发货失败，创建PDF电子面单异常");
//更新发货状态
mallOrderInfoMapper.updateOrderStateAndDeliveryState(
@@ -575,7 +586,19 @@
KdCancelOrderNotifyReq kdCancelOrderNotifyReq = new KdCancelOrderNotifyReq();
kdCancelOrderNotifyReq.setTxLogisticId(mallOrderInfo.getOrderNo());
kdCancelOrderNotifyReq.setReason("Don't want to buy");
- KdCancelOrderNotifyRsp kdCancelOrderNotifyRsp = ClientParamService.getInstance(ClientParamEnum.TEST.name()).cancelOrder(kdCancelOrderNotifyReq);
+
+ String state = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SENDER_STATE.getType(),
+ DataDictionaryEnum.SENDER_STATE.getCode()
+ ).getValue();
+ KdCancelOrderNotifyRsp kdCancelOrderNotifyRsp;
+ if(state.equals("0")){
+ kdCancelOrderNotifyRsp = ClientParamService.getInstance(ClientParamEnum.TEST.name()).cancelOrder(kdCancelOrderNotifyReq);
+ }else if(state.equals("1")){
+ kdCancelOrderNotifyRsp = ClientParamService.getInstance(ClientParamEnum.PRD.name()).cancelOrder(kdCancelOrderNotifyReq);
+ }else{
+ throw new FebsException("取消发货失败，系统配置异常");
+ }
ValidateEntityUtils.ensureEqual(kdCancelOrderNotifyRsp.getResult(), true, "取消发货失败");
//更新发货状态
--
Gitblit v1.9.1