Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
I
ims-ci-test
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
test-ci
ims-ci-test
Commits
074d8dd2
提交
074d8dd2
authored
8月 29, 2023
作者:
张小凤
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
RequirementsDao(update)
上级
af1a6319
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
19 行增加
和
3 行删除
+19
-3
RequirementsDao.java
...rc/main/java/com/mmc/csf/release/dao/RequirementsDao.java
+3
-0
RequirementsServiceImpl.java
...mmc/csf/release/service/impl/RequirementsServiceImpl.java
+7
-0
RequirementsDao.xml
...rc/main/resources/mapper/requirements/RequirementsDao.xml
+9
-3
没有找到文件。
release-service/src/main/java/com/mmc/csf/release/dao/RequirementsDao.java
浏览文件 @
074d8dd2
...
...
@@ -8,6 +8,7 @@ import com.mmc.csf.infomation.vo.ServiceSettleAccountsVO;
import
com.mmc.csf.release.entity.requirements.*
;
import
org.apache.ibatis.annotations.Mapper
;
import
java.math.BigDecimal
;
import
java.util.List
;
/**
...
...
@@ -170,4 +171,6 @@ public interface RequirementsDao {
RequirementsAmountUpdateDO
selectAmountUpdate
(
Integer
requirementsInfoId
);
RequirementsAmountUpdateDTO
amountUpdateDTO
(
Integer
requirementsInfoId
);
void
insertPlatformOrderEarnings
(
BigDecimal
earnings
,
Integer
requirementsInfoId
,
Integer
userAccountId
);
}
release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java
浏览文件 @
074d8dd2
...
...
@@ -744,6 +744,8 @@ public class RequirementsServiceImpl implements RequirementsService {
BigDecimal
bigDecimal
=
new
BigDecimal
(
0.9
);
BigDecimal
preemptTotalAmount
=
requirementsServiceDO
.
getPreemptTotalAmount
();
BigDecimal
percentagePenaltyOfOrder
=
preemptTotalAmount
.
multiply
(
bigDecimal
).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
//平台抽取百分之十
BigDecimal
earnings
=
preemptTotalAmount
.
multiply
(
new
BigDecimal
(
0.1
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
WalletFlowVO
walletFlowVO
=
new
WalletFlowVO
();
FlyerWalletFlowVO
flyerWalletFlowVO
=
new
FlyerWalletFlowVO
();
IsNullConvertZeroUtil
.
checkIsNull
(
flyerWalletFlowVO
);
...
...
@@ -762,6 +764,7 @@ public class RequirementsServiceImpl implements RequirementsService {
requirementsServiceDO
.
setPercentagePenaltyOfOrder
(
percentagePenaltyOfOrder
);
//飞手单方面取消将20之二十退回到发布者佣金里面
flyerCancel
(
walletFlowVO
,
request
.
getHeader
(
"token"
));
requirementsDao
.
insertPlatformOrderEarnings
(
earnings
,
requirementsInfoId
,
userAccountId
);
requirementsDao
.
updateScene
(
requirementsInfoId
,
7
);
requirementsDao
.
updateInfo
(
requirementsInfoId
,
7
);
requirementsDao
.
updateFlow
(
requirementsInfoId
,
7
);
...
...
@@ -1045,6 +1048,10 @@ public class RequirementsServiceImpl implements RequirementsService {
applyRefund
(
applyRefundVO
,
request
.
getHeader
(
"token"
));
}
BigDecimal
receiveSalaryAmount
=
orderAmount
.
multiply
(
new
BigDecimal
(
0.2
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
//平台抽取百分之十
//发布者取消
BigDecimal
earnings
=
orderAmount
.
multiply
(
new
BigDecimal
(
0.1
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
requirementsDao
.
insertPlatformOrderEarnings
(
earnings
,
requirementsInfoId
,
userAccountId
);
flyerWalletFlowVO
.
setSalaryAmount
(
receiveSalaryAmount
);
flyerWalletFlowVO
.
setUserAccountId
(
requirementsInfoDO
.
getPilotCertificationUserId
());
flyerWalletFlowVO
.
setOperateUserAccountId
(
userAccountId
);
...
...
release-service/src/main/resources/mapper/requirements/RequirementsDao.xml
浏览文件 @
074d8dd2
...
...
@@ -57,6 +57,12 @@
#{returnSalaryAmount})
</insert>
<insert
id=
"insertPlatformOrderEarnings"
>
INSERT INTO platform_order_earnings(liquidated_damages, requirements_info_id, user_account_id, create_time,
update_time)
values (#{earnings}, #{requirementsInfoId}, #{userAccountId}, NOW(), NOW())
</insert>
<select
id=
"selectAmountUpdate"
resultType=
"com.mmc.csf.release.entity.requirements.RequirementsAmountUpdateDO"
>
SELECT id,
requirements_info_id,
...
...
@@ -388,13 +394,13 @@
sf.order_status,
ri.publish,
ra.order_amount,
ra.update_order_amount,
ra
u
.update_order_amount,
ra.reason,
ra.url,
ra.order_level
FROM requirements_info ri
LEFT JOIN requirements_type rt
ON rt.id = ri.requirement_type_
id
LEFT JOIN requirements_type rt
ON rt.id = ri.requirement_type_id
LEFT JOIN requirements_amount_update rau ON rau.requirements_info_id = ri.
id
LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
AND ra.user_account_id = ri.user_account_id
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论