Skip to content

J
jiedao-api-boot-master
Commit 05135566 authored by 332784038@qq.com's avatar 332784038@qq.com
Browse files
Options

删除订单业务实现中得测试日志记录

parent 4929f083
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 151 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderBusinessServiceImpl.java
View file @ 05135566
......@@ -2659,21 +2659,6 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
this.createNoCanShipmentChannelException(orderDO,
event, item, warehouseInInfoVO,
type, orderNoCanShipmentChannelExceptionDOList);
} else {
String s = orderDO.getOrderNo() +
"不可出渠道异常逻辑点 noQuoteOrAutomaticNoQuote:" +
noQuoteOrAutomaticNoQuote;
if (Objects.isNull(warehouseInInfoVO)) {
s += " warehouseInInfoVO 为空，";
}
if (Objects.isNull(warehouseInInfoVO) == false) {
s += "getCartonsNum:" +
warehouseInInfoVO.getCartonsNum();
}
zTest m = new zTest();
m.setTestname(s);
m.setCreatedate(new Date());
zTestMapper.insert(m);
}
} else {
//海运也需要判断单询价异常逻辑
......@@ -2758,29 +2743,11 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
OrderDO newOrder = orderMapper.selectById(orderDO.getOrderId());
// 判断空运已入仓订单状态如果是默认出货状态0，且无异常、无审批，那么标记为可出
this.airShipmentStateUpdate(type, newFeeDtoList, newOrder);
//setWareHouseIsZero(orderDO);
}
}
//处理订单入仓数为0的单价
//先判断订单项入仓记录是否为空，为空就改为不为空的单机
private void setWareHouseIsZero(OrderDO orderDO) {
if (orderDO == null) return;
LambdaUpdateWrapper q1 =
new LambdaUpdateWrapper<OrderItemDO>().eq(OrderItemDO::getOrderId,
orderDO.getOrderId());
List<OrderItemDO> listItem = orderItemMapper.selectList(q1);
if (CollectionUtil.isEmpty(listItem) == true) return;
for (OrderItemDO o : listItem
) {
}
}
private void airShipmentStateUpdate(Integer type,
List<FeeDto> newFeeDtoList,
......@@ -2863,23 +2830,10 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
int noQuoteOrAutomaticNoQuote,
OrderItemDO orderItemDO,
Integer type) {
zTest z22 = new zTest();
z22.setTestname("处理25 createOrderNoQuoteException");
z22.setCreatedate(new Date());
zTestMapper.insert(z22);
if (orderDO == null) {
zTest z = new zTest();
z.setTestname("orderDO 为空");
z.setCreatedate(new Date());
zTestMapper.insert(z);
return noQuoteOrAutomaticNoQuote;
}
if (orderItemDO == null) {
zTest z = new zTest();
z.setTestname("orderItemDO 为空");
z.setCreatedate(new Date());
zTestMapper.insert(z);
return noQuoteOrAutomaticNoQuote;
}
......@@ -2892,14 +2846,6 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
OrderExceptionEnum.ORDER_NO_QUOTE_EXCEPTION.getKey());
if (orderItemDO.getNeedOrderInquiry() != null) {
String sNo = "";
if (orderDO.getOrderNo() != null) sNo = orderDO.getOrderNo();
String s = sNo + "未报价日志24，type=" + type.toString() +
"getTransportId=" + orderDO.getTransportId().toString() +
"getNeedOrderInquiry=" + orderItemDO.getNeedOrderInquiry();
// 添加的逻辑点 海运和空运只要是单询价都按同一套逻辑来处理
if (orderItemDO.getNeedOrderInquiry() == 1) {
//处理未报价异常，且是空运,且是单询价
......@@ -2912,30 +2858,10 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
noQuoteOrAutomaticNoQuote = 2;
return noQuoteOrAutomaticNoQuote;
}
zTest z = new zTest();
z.setTestname(s);
z.setCreatedate(new Date());
zTestMapper.insert(z);
noQuoteOrAutomaticNoQuote = 2;
return noQuoteOrAutomaticNoQuote;
} else {
zTest z = new zTest();
z.setTestname(s);
z.setCreatedate(new Date());
zTestMapper.insert(z);
}
} else {
zTest z = new zTest();
z.setTestname("单询价为空 createOrderNoQuoteException");
z.setCreatedate(new Date());
zTestMapper.insert(z);
}
zTest z2 = new zTest();
z2.setTestname("处理24");
z2.setCreatedate(new Date());
zTestMapper.insert(z2);
//
if (orderItemDO.getItemStatus() == -1 && !orderItemDO.getIsProd()) {
......@@ -2955,13 +2881,9 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
// TODO 同一个订单相同品名有相同未报价异常时,不重复产生
orderExceptionService.createOrderException(orderExceptionCreateReqVO);
}
//noQuoteOrAutomaticNoQuote = 1;
noQuoteOrAutomaticNoQuote = 1;
} else {
if (CollectionUtil.isNotEmpty(orderNoQuoteExceptionDOList)) {
zTest z = new zTest();
z.setTestname("autoProcessException 执行");
z.setCreatedate(new Date());
zTestMapper.insert(z);
// TODO 当其他业务补充了品名价格后，如果还有待处理的未报价异常，需要同步处理掉
orderExceptionService.autoProcessException(orderDO.getOrderId(),
orderItemDO.getOrderItemId(),
......@@ -2969,70 +2891,11 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
"设置价格自动处理",
OrderExceptionResult.ORDER_NO_QUOTE_EXCEPTION_RESULT.PROCESSED);
noQuoteOrAutomaticNoQuote = 2;
} else {
zTest z = new zTest();
z.setTestname("orderNoQuoteExceptionDOList 为空");
z.setCreatedate(new Date());
zTestMapper.insert(z);
}
}
return noQuoteOrAutomaticNoQuote;
}
private void saveLog(OrderDO orderDO,
OrderItemDO orderItemDO,
WarehouseInInfoVO warehouseInInfoVO,
Integer type) {
zTest z = new zTest();
z.setCreatedate(new Date());
if (orderDO == null) {
//订单信息为空
z.setTestname("orderDO为空");
zTestMapper.insert(z);
return;
}
if (orderItemDO == null) {
//订单明细为空
z.setTestname("orderItemDO为空");
zTestMapper.insert(z);
return;
}
if (warehouseInInfoVO == null) {
//入仓信息为空
z.setTestname("warehouseInInfoVO为空");
zTestMapper.insert(z);
return;
}
String s = "单询价日志，type=" + type.toString() + "Status=" +
orderDO.getStatus().toString();
if (Objects.nonNull(orderItemDO.getNeedOrderInquiry())) {
s += "NeedOrderInquiry为空";
} else {
//单询价
s += "NeedOrderInquiry=" + orderItemDO.getNeedOrderInquiry();
}
if (Objects.nonNull(warehouseInInfoVO)) {
s += "warehouseInInfo为空";
} else {
s += "CartonsNum="
+ warehouseInInfoVO.getCartonsNum().toString();
}
if (Objects.nonNull(orderItemDO.getIsHandlerOrderInquiryException())) {
s += "处理过单询价为空";
} else {
s += "处理过单询价为空=" + orderItemDO.getIsHandlerOrderInquiryException();
}
z.setTestname(s);
zTestMapper.insert(z);
}
/*
生成单询价异常
*/
......@@ -3045,9 +2908,6 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
orderExceptionService.getPendingOrderExceptionByOrderIdAndOrderItemIdAndExceptionKey(orderDO.getOrderId(),
orderItemDO.getOrderItemId(),
OrderExceptionEnum.LINE_LOOP_EXCEPTION.getKey());
saveLog(orderDO, orderItemDO, warehouseInInfoVO, type);
// 避免在前面自动处理未报价异常和清关费未报价异常时的回调，
// 优先创建了单询异常，造成并发的重复创建
if (CollectionUtil.isEmpty(orderInquiryExceptionDOList)) {
......@@ -3080,17 +2940,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
set(OrderItemDO::getIsHandlerOrderInquiryException, true).
eq(OrderItemDO::getOrderItemId,
orderItemDO.getOrderItemId()));
} else {
zTest z = new zTest();
z.setTestname("不符合产生单询价条件");
z.setCreatedate(new Date());
zTestMapper.insert(z);
}
} else {
zTest z = new zTest();
z.setTestname("orderInquiryExceptionDOList 为空");
z.setCreatedate(new Date());
zTestMapper.insert(z);
}
}
......
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