Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
4fae1d5e
提交
4fae1d5e
authored
10月 24, 2024
作者:
刘海泉
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
新增抢单限制逻辑
上级
26961528
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
69 行增加
和
1 行删除
+69
-1
OrderChildFeignController.java
...rformance/controller/feign/OrderChildFeignController.java
+6
-0
OrderChildDao.java
.../src/main/java/com/clx/performance/dao/OrderChildDao.java
+2
-0
OrderChildDaoImpl.java
.../java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
+8
-0
FeignOrderService.java
...ain/java/com/clx/performance/feign/FeignOrderService.java
+16
-0
OrderChildService.java
...n/java/com/clx/performance/service/OrderChildService.java
+2
-0
OrderChildServiceImpl.java
...m/clx/performance/service/impl/OrderChildServiceImpl.java
+28
-1
PerformanceResultEnum.java
...java/com/clx/performance/enums/PerformanceResultEnum.java
+2
-0
OrderChildFeign.java
.../main/java/com/clx/performance/feign/OrderChildFeign.java
+5
-0
没有找到文件。
clx-performance-web/src/main/java/com/clx/performance/controller/feign/OrderChildFeignController.java
浏览文件 @
4fae1d5e
...
...
@@ -96,4 +96,10 @@ public class OrderChildFeignController {
return
Result
.
ok
();
}
@Operation
(
summary
=
"查询老马上来车辆下的进行中的运单"
,
description
=
"<br>By:刘海泉"
)
@GetMapping
(
"/queryTruckProcessingOrderChild"
)
public
Result
<
Long
>
queryTruckProcessingOrderChild
(
@RequestParam
(
"truckNo"
)
@NotBlank
(
message
=
"车牌号不能为空"
)
String
truckNo
)
{
return
Result
.
ok
(
orderChildService
.
queryTruckProcessingOrderChild
(
truckNo
));
}
}
clx-performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
浏览文件 @
4fae1d5e
...
...
@@ -221,4 +221,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
Long
countNotCancelOrderChild
(
List
<
String
>
cancelOrderGoodsNo
);
Long
queryNoCancelChildByOrderGoodsNo
(
String
orderGoodsNo
,
Integer
code
);
Long
queryTruckProcessingOrderChild
(
String
truckNo
);
}
clx-performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
浏览文件 @
4fae1d5e
...
...
@@ -736,4 +736,12 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
.
lt
(
ObjectUtil
.
isNotEmpty
(
status
),
OrderChild:
:
getStatus
,
status
)
);
}
@Override
public
Long
queryTruckProcessingOrderChild
(
String
truckNo
)
{
LambdaQueryWrapper
<
OrderChild
>
query
=
new
LambdaQueryWrapper
<>();
query
.
eq
(
OrderChild
::
getTruckNo
,
truckNo
);
query
.
le
(
OrderChild:
:
getStatus
,
OrderChildEnum
.
Status
.
UNLOAD
.
getCode
());
return
baseMapper
.
selectCount
(
query
);
}
}
clx-performance-web/src/main/java/com/clx/performance/feign/FeignOrderService.java
0 → 100644
浏览文件 @
4fae1d5e
package
com
.
clx
.
performance
.
feign
;
import
com.msl.common.result.Result
;
import
jakarta.validation.constraints.NotBlank
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
@FeignClient
(
name
=
"order-service"
)
public
interface
FeignOrderService
{
@GetMapping
(
value
=
"/order-service/feign/getGoingOrderChildByTruckNo"
)
Result
<
Integer
>
getGoingOrderChildByTruckNo
(
@RequestParam
(
"truckNo"
)
@NotBlank
(
message
=
"车牌号不能为空"
)
String
truckNo
);
}
clx-performance-web/src/main/java/com/clx/performance/service/OrderChildService.java
浏览文件 @
4fae1d5e
...
...
@@ -122,4 +122,6 @@ public interface OrderChildService {
WeightChildSignatureDto
getWeighingSignature
(
String
childNo
,
Integer
type
);
Long
queryTruckProcessingOrderChild
(
String
truckNo
);
}
clx-performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
浏览文件 @
4fae1d5e
...
...
@@ -41,6 +41,7 @@ import com.clx.performance.enums.settle.SettlementWayEnum;
import
com.clx.performance.extranal.order.InvoicingCompanyService
;
import
com.clx.performance.extranal.order.QuotationService
;
import
com.clx.performance.extranal.user.*
;
import
com.clx.performance.feign.FeignOrderService
;
import
com.clx.performance.feign.FeignPaymentService
;
import
com.clx.performance.model.*
;
import
com.clx.performance.model.breakcontract.BreakContractDriverRecord
;
...
...
@@ -289,6 +290,9 @@ public class OrderChildServiceImpl implements OrderChildService {
@Autowired
private
PerformanceSmartCompanyNoConfig
companyNoConfig
;
@Autowired
FeignOrderService
feignOrderService
;
@PostConstruct
public
void
init
(){
String
[]
activeProfiles
=
environment
.
getActiveProfiles
();
...
...
@@ -2029,6 +2033,20 @@ public class OrderChildServiceImpl implements OrderChildService {
return
checkBankCard
.
getCode
();
}
//查询该车辆是否在老马上来系统存在进行中的运单
log
.
info
(
"开始查询车辆在老马上来系统是否存在进行中的运单,车牌号:{}"
,
param
.
getTruckNo
());
Result
<
Integer
>
truckGoingChildResult
=
feignOrderService
.
getGoingOrderChildByTruckNo
(
param
.
getTruckNo
());
log
.
info
(
"开始查询车辆在老马上来系统是否存在进行中的运单,车牌号:{},响应结果:{}"
,
param
.
getTruckNo
(),
truckGoingChildResult
);
if
(
truckGoingChildResult
.
succeed
()){
//车辆存在进行中的运单
if
(
truckGoingChildResult
.
getData
()
>
0
){
return
CheckResult
.
HAS_GOING_CHILD
.
code
;
}
}
else
{
throw
new
ServiceSystemException
(
com
.
clx
.
performance
.
enums
.
ResultEnum
.
FEIGN_ERROR
,
"查询车辆是否存在进行中的运单失败"
);
}
OrderGoods
orderGoods
=
orderGoodsDao
.
getByOrderGoodsNo
(
param
.
getOrderGoodsNo
()).
get
();
BigDecimal
sendLatitude
=
orderGoods
.
getSendLatitude
();
BigDecimal
sendLongitude
=
orderGoods
.
getSendLongitude
();
...
...
@@ -2078,6 +2096,8 @@ public class OrderChildServiceImpl implements OrderChildService {
return
CheckResult
.
FAIL
.
code
;
}
}
return
CheckResult
.
OK
.
code
;
}
...
...
@@ -2130,7 +2150,9 @@ public class OrderChildServiceImpl implements OrderChildService {
DRIVER_WALLET_NOT_EXIST
(
APP_POP_UP_DRIVER_WALLET_NULL_NOT_EXIST_ERROR
.
getCode
(),
"司机未绑卡"
),
OWNER_WALLET_NOT_EXIST
(
APP_POP_UP_OWNER_WALLET_NULL_NOT_EXIST_ERROR
.
getCode
(),
"车主未绑卡"
),
DRIVER_NO_BANKCARD
(
APP_POP_UP_DRIVER_NO_BANKCARD_ERROR
.
getCode
(),
"司机未绑卡"
),
OWNER_NO_BANKCARD
(
APP_POP_UP_OWNER_NO_BANKCARD_ERROR
.
getCode
(),
"车主未绑卡"
);
OWNER_NO_BANKCARD
(
APP_POP_UP_OWNER_NO_BANKCARD_ERROR
.
getCode
(),
"车主未绑卡"
),
HAS_GOING_CHILD
(
APP_TRUCK_HAVE_GOING_CHILD
.
getCode
(),
"车辆存在进行中的运单"
);
private
final
int
code
;
private
final
String
msg
;
}
...
...
@@ -3884,4 +3906,9 @@ public class OrderChildServiceImpl implements OrderChildService {
}
return
new
WeightChildSignatureDto
();
}
@Override
public
Long
queryTruckProcessingOrderChild
(
String
truckNo
)
{
return
orderChildDao
.
queryTruckProcessingOrderChild
(
truckNo
);
}
}
performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java
浏览文件 @
4fae1d5e
...
...
@@ -116,6 +116,8 @@ public enum PerformanceResultEnum implements ResultEnum {
APP_POP_UP_DRIVER_NOT_AUTH
(-
496
,
"司机钱包不存在"
),
/**车主未实名 **/
APP_POP_UP_OWNER_NOT_AUTH
(-
495
,
"车主钱包不存在"
),
/**车主未实名 **/
APP_TRUCK_HAVE_GOING_CHILD
(-
494
,
"车辆存在进行中的运单"
),
WALLET_CODE_IS_NULL
(
1704
,
"用户钱包不存在"
),
...
...
performance-api/src/main/java/com/clx/performance/feign/OrderChildFeign.java
浏览文件 @
4fae1d5e
...
...
@@ -33,4 +33,9 @@ public interface OrderChildFeign {
Result
<
Object
>
cancelOrderChild
(
@RequestBody
@Validated
CancelOrderGoodsParam
param
);
@GetMapping
(
value
=
{
"clx-performance/feign/orderChild/queryTruckProcessingOrderChild"
})
Result
<
Long
>
queryTruckProcessingOrderChild
(
@RequestParam
(
"truckNo"
)
@NotBlank
(
message
=
"车牌号不能为空"
)
String
truckNo
);
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论