From f1ad20e5504ceb482d97be7af8e6bef36a5c0dc3 Mon Sep 17 00:00:00 2001 From: liufeilong Date: Mon, 17 Apr 2023 09:10:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GenerateReadyOpenOrderServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java index d1a36dd7..86e4bdb2 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java @@ -3,6 +3,7 @@ package com.dxhy.order.consumer.modules.order.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; +import cn.hutool.core.util.StrUtil; import com.dxhy.base.constant.*; import com.dxhy.base.utils.OrderSplitUtilsNew; import com.dxhy.base.utils.PriceTaxSeparationUtilNew; @@ -194,6 +195,7 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder orderProcessInfo.setDdly(OrderInfoEnum.ORDER_SOURCE_1.getKey()); orderProcessInfo.setDdlx(OrderInfoEnum.ORDER_TYPE_3.getKey()); orderProcessInfo.setDdzt(OrderInfoEnum.ORDER_STATUS_0.getKey()); + orderProcessInfo.setYzfp(ConfigureConstant.STRING_1); commonOrderInfo.setProcessInfo(orderProcessInfo); commonOrderInfo.getOrderInfo().setCreateTime(new Date()); commonOrderInfo.getOrderInfo().setUpdateTime(new Date()); @@ -631,6 +633,9 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder orderProcessInfo.setKb(orderItemInfos.get(0).getKb()); orderProcessInfo.setOriginOrderId(orderInfo.getId()); orderProcessInfo.setOriginDdh(orderInfo.getDdh()); + if(ObjectUtil.isNull(orderProcessInfo.getGsdm()) || StrUtil.isBlank(orderProcessInfo.getGsdm())){ + orderProcessInfo.setGsdm(orderInfo.getGsdm()); + } //原始订单到最终订单的关系