Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
4032ec57
提交
4032ec57
authored
9月 26, 2023
作者:
liuhaiquan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
自有车辆发布货单,默认为定向单
上级
fdaa461a
显示空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
35 行增加
和
12 行删除
+35
-12
OrderGoodsPendingVehicleUsageEnum.java
.../performance/enums/OrderGoodsPendingVehicleUsageEnum.java
+30
-0
ThreeGoodsOrderStrategy.java
...lx/performance/strategy/impl/ThreeGoodsOrderStrategy.java
+3
-6
TwoGoodsOrderStrategy.java
.../clx/performance/strategy/impl/TwoGoodsOrderStrategy.java
+2
-6
没有找到文件。
performance-api/src/main/java/com/clx/performance/enums/OrderGoodsPendingVehicleUsageEnum.java
0 → 100644
浏览文件 @
4032ec57
package
com
.
clx
.
performance
.
enums
;
import
lombok.AllArgsConstructor
;
import
lombok.Getter
;
import
java.util.Arrays
;
import
java.util.Optional
;
public
enum
OrderGoodsPendingVehicleUsageEnum
{
;
@Getter
@AllArgsConstructor
public
enum
Status
{
PLATFORM_TRUCK
(
"1"
,
"平台车辆配货"
),
OWN_TRUCK
(
"2"
,
"自有车辆配货"
),
;
private
final
String
code
;
private
final
String
name
;
public
static
Optional
<
Status
>
getByCode
(
String
code
)
{
return
Arrays
.
stream
(
values
()).
filter
(
e
->
e
.
code
.
equals
(
code
)).
findFirst
();
}
}
}
performance-web/src/main/java/com/clx/performance/strategy/impl/ThreeGoodsOrderStrategy.java
浏览文件 @
4032ec57
...
@@ -11,11 +11,7 @@ import com.clx.performance.component.OrderGoodsIdGenerate;
...
@@ -11,11 +11,7 @@ import com.clx.performance.component.OrderGoodsIdGenerate;
import
com.clx.performance.constant.RabbitKeyConstants
;
import
com.clx.performance.constant.RabbitKeyConstants
;
import
com.clx.performance.dao.OrderGoodsDao
;
import
com.clx.performance.dao.OrderGoodsDao
;
import
com.clx.performance.dao.OrderGoodsTruckBindDao
;
import
com.clx.performance.dao.OrderGoodsTruckBindDao
;
import
com.clx.performance.enums.OrderGoodsStatusEnum
;
import
com.clx.performance.enums.*
;
import
com.clx.performance.enums.OrderGoodsTypeEnum
;
import
com.clx.performance.enums.PerformanceResultEnum
;
import
com.clx.performance.enums.TruckDemandEnum
;
import
com.clx.performance.mapper.OrderGoodsMapper
;
import
com.clx.performance.model.OrderGoods
;
import
com.clx.performance.model.OrderGoods
;
import
com.clx.performance.service.OrderGoodsService
;
import
com.clx.performance.service.OrderGoodsService
;
import
com.clx.performance.strategy.GoodsOrderStrategy
;
import
com.clx.performance.strategy.GoodsOrderStrategy
;
...
@@ -24,6 +20,7 @@ import com.msl.common.utils.DateUtils;
...
@@ -24,6 +20,7 @@ import com.msl.common.utils.DateUtils;
import
com.msl.user.data.UserSessionData
;
import
com.msl.user.data.UserSessionData
;
import
com.msl.user.utils.TokenUtil
;
import
com.msl.user.utils.TokenUtil
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.amqp.core.Message
;
import
org.springframework.amqp.core.Message
;
import
org.springframework.amqp.core.MessageBuilder
;
import
org.springframework.amqp.core.MessageBuilder
;
import
org.springframework.amqp.rabbit.core.RabbitTemplate
;
import
org.springframework.amqp.rabbit.core.RabbitTemplate
;
...
@@ -148,7 +145,7 @@ public class ThreeGoodsOrderStrategy implements GoodsOrderStrategy, Initializing
...
@@ -148,7 +145,7 @@ public class ThreeGoodsOrderStrategy implements GoodsOrderStrategy, Initializing
orderGoods
.
setModifiedTime
(
now
);
orderGoods
.
setModifiedTime
(
now
);
orderGoods
.
setUserName
(
loginUserInfo
.
getUserName
());
orderGoods
.
setUserName
(
loginUserInfo
.
getUserName
());
orderGoods
.
setUserNo
(
loginUserInfo
.
getUserNo
());
orderGoods
.
setUserNo
(
loginUserInfo
.
getUserNo
());
if
(
CollectionUtil
.
isNotEmpty
(
child
.
getTruckList
()))
{
if
(
StringUtils
.
equals
(
child
.
getVehicleUsage
(),
OrderGoodsPendingVehicleUsageEnum
.
Status
.
OWN_TRUCK
.
getCode
())
&&
CollectionUtil
.
isNotEmpty
(
child
.
getTruckList
()))
{
orderGoodsTruckBindDao
.
saveBatchEntity
(
orderNo
,
OrderGoodsTypeEnum
.
Status
.
PLATFORM
.
getCode
()
+
beginOrderGoodsId
,
child
.
getTruckList
(),
now
);
orderGoodsTruckBindDao
.
saveBatchEntity
(
orderNo
,
OrderGoodsTypeEnum
.
Status
.
PLATFORM
.
getCode
()
+
beginOrderGoodsId
,
child
.
getTruckList
(),
now
);
}
}
mqMap
.
put
(
OrderGoodsTypeEnum
.
Status
.
PLATFORM
.
getCode
()
+
beginOrderGoodsId
,
postedTime
);
mqMap
.
put
(
OrderGoodsTypeEnum
.
Status
.
PLATFORM
.
getCode
()
+
beginOrderGoodsId
,
postedTime
);
...
...
performance-web/src/main/java/com/clx/performance/strategy/impl/TwoGoodsOrderStrategy.java
浏览文件 @
4032ec57
...
@@ -11,11 +11,7 @@ import com.clx.performance.component.OrderGoodsIdGenerate;
...
@@ -11,11 +11,7 @@ import com.clx.performance.component.OrderGoodsIdGenerate;
import
com.clx.performance.constant.RabbitKeyConstants
;
import
com.clx.performance.constant.RabbitKeyConstants
;
import
com.clx.performance.dao.OrderGoodsDao
;
import
com.clx.performance.dao.OrderGoodsDao
;
import
com.clx.performance.dao.OrderGoodsTruckBindDao
;
import
com.clx.performance.dao.OrderGoodsTruckBindDao
;
import
com.clx.performance.enums.OrderGoodsStatusEnum
;
import
com.clx.performance.enums.*
;
import
com.clx.performance.enums.OrderGoodsTypeEnum
;
import
com.clx.performance.enums.PerformanceResultEnum
;
import
com.clx.performance.enums.TruckDemandEnum
;
import
com.clx.performance.mapper.OrderGoodsMapper
;
import
com.clx.performance.model.OrderGoods
;
import
com.clx.performance.model.OrderGoods
;
import
com.clx.performance.service.OrderGoodsService
;
import
com.clx.performance.service.OrderGoodsService
;
import
com.clx.performance.strategy.GoodsOrderStrategy
;
import
com.clx.performance.strategy.GoodsOrderStrategy
;
...
@@ -159,7 +155,7 @@ public class TwoGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
...
@@ -159,7 +155,7 @@ public class TwoGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
orderGoods
.
setModifiedTime
(
now
);
orderGoods
.
setModifiedTime
(
now
);
orderGoods
.
setUserName
(
loginUserInfo
.
getUserName
());
orderGoods
.
setUserName
(
loginUserInfo
.
getUserName
());
orderGoods
.
setUserNo
(
loginUserInfo
.
getUserNo
());
orderGoods
.
setUserNo
(
loginUserInfo
.
getUserNo
());
if
(
CollectionUtil
.
isNotEmpty
(
child
.
getTruckList
()))
{
if
(
StringUtils
.
equals
(
child
.
getVehicleUsage
(),
OrderGoodsPendingVehicleUsageEnum
.
Status
.
OWN_TRUCK
.
getCode
())
&&
CollectionUtil
.
isNotEmpty
(
child
.
getTruckList
()))
{
orderGoodsTruckBindDao
.
saveBatchEntity
(
orderNo
,
OrderGoodsTypeEnum
.
Status
.
PLATFORM
.
getCode
()
+
beginOrderGoodsId
,
child
.
getTruckList
(),
now
);
orderGoodsTruckBindDao
.
saveBatchEntity
(
orderNo
,
OrderGoodsTypeEnum
.
Status
.
PLATFORM
.
getCode
()
+
beginOrderGoodsId
,
child
.
getTruckList
(),
now
);
}
}
mqMap
.
put
(
OrderGoodsTypeEnum
.
Status
.
PLATFORM
.
getCode
()
+
beginOrderGoodsId
,
postedTime
);
mqMap
.
put
(
OrderGoodsTypeEnum
.
Status
.
PLATFORM
.
getCode
()
+
beginOrderGoodsId
,
postedTime
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论