Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
447715a2
提交
447715a2
authored
2月 04, 2024
作者:
huyufan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
接单借款判断
上级
90e6271a
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
10 行增加
和
16 行删除
+10
-16
OrderChildLoanComponent.java
...om/clx/performance/component/OrderChildLoanComponent.java
+0
-0
OwnerLoanAccountDaoImpl.java
...lx/performance/dao/impl/loan/OwnerLoanAccountDaoImpl.java
+1
-2
OwnerLoanRecordDaoImpl.java
...clx/performance/dao/impl/loan/OwnerLoanRecordDaoImpl.java
+5
-0
OrderChildServiceImpl.java
...m/clx/performance/service/impl/OrderChildServiceImpl.java
+4
-14
没有找到文件。
performance-web/src/main/java/com/clx/performance/component/OrderChildLoanComponent.java
浏览文件 @
447715a2
差异被折叠。
点击展开。
performance-web/src/main/java/com/clx/performance/dao/impl/loan/OwnerLoanAccountDaoImpl.java
浏览文件 @
447715a2
...
@@ -27,8 +27,7 @@ public class OwnerLoanAccountDaoImpl extends BaseDaoImpl<OwnerLoanAccountMapper,
...
@@ -27,8 +27,7 @@ public class OwnerLoanAccountDaoImpl extends BaseDaoImpl<OwnerLoanAccountMapper,
if
(
flag
)
{
if
(
flag
)
{
return
baseMapper
.
addAccount
(
account
,
nowStr
);
return
baseMapper
.
addAccount
(
account
,
nowStr
);
}
else
{
}
else
{
return
null
;
return
baseMapper
.
subAccount
(
account
,
nowStr
);
// return baseMapper.subAccount(account, nowStr);
}
}
}
}
...
...
performance-web/src/main/java/com/clx/performance/dao/impl/loan/OwnerLoanRecordDaoImpl.java
浏览文件 @
447715a2
...
@@ -55,6 +55,11 @@ public class OwnerLoanRecordDaoImpl extends BaseDaoImpl<OwnerLoanRecordMapper, O
...
@@ -55,6 +55,11 @@ public class OwnerLoanRecordDaoImpl extends BaseDaoImpl<OwnerLoanRecordMapper, O
return
baseMapper
.
pageByParam
(
page
,
param
);
return
baseMapper
.
pageByParam
(
page
,
param
);
}
}
/**
* 查询审批通过并且未用完的借款
* @param userNo
* @return
*/
@Override
@Override
public
List
<
OwnerLoanRecord
>
selectLoanBalance
(
Long
userNo
)
{
public
List
<
OwnerLoanRecord
>
selectLoanBalance
(
Long
userNo
)
{
return
baseMapper
.
selectList
(
return
baseMapper
.
selectList
(
...
...
performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
浏览文件 @
447715a2
...
@@ -8,6 +8,7 @@ import com.clx.order.feign.OrderFeign;
...
@@ -8,6 +8,7 @@ import com.clx.order.feign.OrderFeign;
import
com.clx.order.vo.feign.FeignAddressVO
;
import
com.clx.order.vo.feign.FeignAddressVO
;
import
com.clx.order.vo.feign.FeignOrderInfoVO
;
import
com.clx.order.vo.feign.FeignOrderInfoVO
;
import
com.clx.performance.component.GoodsOrderTruckRecordComponent
;
import
com.clx.performance.component.GoodsOrderTruckRecordComponent
;
import
com.clx.performance.component.OrderChildLoanComponent
;
import
com.clx.performance.constant.RedisConstants
;
import
com.clx.performance.constant.RedisConstants
;
import
com.clx.performance.constant.RedissonConstants
;
import
com.clx.performance.constant.RedissonConstants
;
import
com.clx.performance.dao.*
;
import
com.clx.performance.dao.*
;
...
@@ -153,17 +154,7 @@ public class OrderChildServiceImpl implements OrderChildService {
...
@@ -153,17 +154,7 @@ public class OrderChildServiceImpl implements OrderChildService {
private
FeignPaymentService
feignPaymentService
;
private
FeignPaymentService
feignPaymentService
;
@Autowired
@Autowired
private
TruckService
truckService
;
private
OrderChildLoanComponent
orderChildLoanComponent
;
@Autowired
private
ZjxlGpsService
zjxlGpsService
;
@Autowired
private
UserService
userService
;
@Autowired
private
OwnerRunningWaterRecordDao
ownerRunningWaterRecordDao
;
@Override
@Override
public
SaveOrderChildVO
saveOrderChild
(
OrderChildSaveParam
param
)
{
public
SaveOrderChildVO
saveOrderChild
(
OrderChildSaveParam
param
)
{
...
@@ -265,7 +256,6 @@ public class OrderChildServiceImpl implements OrderChildService {
...
@@ -265,7 +256,6 @@ public class OrderChildServiceImpl implements OrderChildService {
FeignOrderInfoVO
orderInfo
=
orderService
.
getOrderInfo
(
orderGoods
.
getOrderNo
()).
orElseThrow
(
PerformanceResultEnum
.
ORDER_INVALID
);
FeignOrderInfoVO
orderInfo
=
orderService
.
getOrderInfo
(
orderGoods
.
getOrderNo
()).
orElseThrow
(
PerformanceResultEnum
.
ORDER_INVALID
);
OwnerInfoFeignVO
ownerInfo
=
ownerInfoService
.
getOwnerInfo
(
orderInfo
.
getOwnerUserNo
());
OwnerInfoFeignVO
ownerInfo
=
ownerInfoService
.
getOwnerInfo
(
orderInfo
.
getOwnerUserNo
());
// // 车型限制
// // 车型限制
// FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderGoods.getOrderNo()).orElseThrow
// FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderGoods.getOrderNo()).orElseThrow
// (PerformanceResultEnum.DATA_NOT_FIND);
// (PerformanceResultEnum.DATA_NOT_FIND);
...
@@ -312,8 +302,8 @@ public class OrderChildServiceImpl implements OrderChildService {
...
@@ -312,8 +302,8 @@ public class OrderChildServiceImpl implements OrderChildService {
throw
new
ServiceSystemException
(
PerformanceResultEnum
.
ORDER_WEIGHT_LACK
);
throw
new
ServiceSystemException
(
PerformanceResultEnum
.
ORDER_WEIGHT_LACK
);
}
}
//
TODO 借款账户相关限制
//
接单判断
orderChildLoanComponent
.
getChildDetermine
(
orderInfo
,
ownerInfo
,
orderGoods
,
childNo
);
OrderChild
orderChild
=
new
OrderChild
();
OrderChild
orderChild
=
new
OrderChild
();
orderChild
.
setChildNo
(
childNo
);
orderChild
.
setChildNo
(
childNo
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论