From fcc1ced7adbaf3338c1e68b0c90275dfae14b4f8 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 17 Feb 2025 10:45:57 +0800
Subject: [PATCH] test: 更新测试用例中的运单编号
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 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..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
@@ -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.*;
@@ -535,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());
@@ -546,8 +551,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 +590,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