|
|
|
@ -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()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//原始订单到最终订单的关系
|
|
|
|
|