Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
cms
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
iuav
cms
Commits
0b06e90a
提交
0b06e90a
authored
12月 09, 2023
作者:
刘明祎-运维用途
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
课程购买钱包流水记录
上级
1b9f1964
流水线
#7456
已通过 于阶段
in 2 分 6 秒
变更
5
流水线
1
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
96 行增加
和
4 行删除
+96
-4
PayWalletController.java
.../mmc/iuav/user/controller/wallet/PayWalletController.java
+8
-0
CurriculumOrderLogVO.java
...com/mmc/iuav/user/entity/wallet/CurriculumOrderLogVO.java
+35
-0
PayLogDO.java
...c/main/java/com/mmc/iuav/user/entity/wallet/PayLogDO.java
+2
-0
PayWalletService.java
...va/com/mmc/iuav/user/service/wallet/PayWalletService.java
+8
-0
PayWalletServiceImpl.java
...c/iuav/user/service/wallet/impl/PayWalletServiceImpl.java
+43
-4
没有找到文件。
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/wallet/PayWalletController.java
浏览文件 @
0b06e90a
...
@@ -2,6 +2,7 @@ package com.mmc.iuav.user.controller.wallet;
...
@@ -2,6 +2,7 @@ package com.mmc.iuav.user.controller.wallet;
import
com.mmc.iuav.response.ResultBody
;
import
com.mmc.iuav.response.ResultBody
;
import
com.mmc.iuav.user.controller.BaseController
;
import
com.mmc.iuav.user.controller.BaseController
;
import
com.mmc.iuav.user.entity.wallet.CurriculumOrderLogVO
;
import
com.mmc.iuav.user.entity.wallet.UserBillingDetailVO
;
import
com.mmc.iuav.user.entity.wallet.UserBillingDetailVO
;
import
com.mmc.iuav.user.model.dto.wallet.PayWalletDTO
;
import
com.mmc.iuav.user.model.dto.wallet.PayWalletDTO
;
import
com.mmc.iuav.user.model.qo.wallet.WalletFlowQO
;
import
com.mmc.iuav.user.model.qo.wallet.WalletFlowQO
;
...
@@ -94,4 +95,11 @@ public class PayWalletController extends BaseController {
...
@@ -94,4 +95,11 @@ public class PayWalletController extends BaseController {
public
ResultBody
payUavWallet
(
@RequestBody
PayUavWalletVO
payUavWalletVO
)
{
public
ResultBody
payUavWallet
(
@RequestBody
PayUavWalletVO
payUavWalletVO
)
{
return
payWalletService
.
payUavWallet
(
payUavWalletVO
);
return
payWalletService
.
payUavWallet
(
payUavWalletVO
);
}
}
@ApiOperation
(
value
=
"feign——课程订单钱包流水记录"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ResultBody
.
class
)})
@PostMapping
(
"feignCurriculumOrderLog"
)
public
ResultBody
payUavWallet2
(
HttpServletRequest
request
,
@RequestBody
CurriculumOrderLogVO
param
)
{
return
payWalletService
.
feignCurriculumOrderLog
(
this
.
getUserLoginInfoFromRedis
(
request
).
getUserAccountId
(),
param
);
}
}
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/wallet/CurriculumOrderLogVO.java
0 → 100644
浏览文件 @
0b06e90a
package
com
.
mmc
.
iuav
.
user
.
entity
.
wallet
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
java.math.BigDecimal
;
/**
* @author Admin
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public
class
CurriculumOrderLogVO
{
private
Integer
userAccountId
;
@ApiModelProperty
(
value
=
"云享金消耗金额"
)
private
BigDecimal
cashAmtPaid
;
@ApiModelProperty
(
value
=
"佣金消耗金额"
)
private
BigDecimal
salaryAmtPaid
;
@ApiModelProperty
(
value
=
"订单编号"
)
private
String
orderNo
;
public
PayLogDO
buildPayLog
()
{
return
PayLogDO
.
builder
().
userAccountId
(
this
.
userAccountId
)
.
cashAmtPaid
(
this
.
cashAmtPaid
)
.
salaryAmtPaid
(
this
.
salaryAmtPaid
)
.
payNo
(
this
.
orderNo
)
.
build
();
}
}
\ No newline at end of file
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/wallet/PayLogDO.java
浏览文件 @
0b06e90a
package
com
.
mmc
.
iuav
.
user
.
entity
.
wallet
;
package
com
.
mmc
.
iuav
.
user
.
entity
.
wallet
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
...
@@ -17,6 +18,7 @@ import java.util.Date;
...
@@ -17,6 +18,7 @@ import java.util.Date;
@Data
@Data
@AllArgsConstructor
@AllArgsConstructor
@NoArgsConstructor
@NoArgsConstructor
@Builder
public
class
PayLogDO
implements
Serializable
{
public
class
PayLogDO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
752682324297846133L
;
private
static
final
long
serialVersionUID
=
752682324297846133L
;
...
...
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/wallet/PayWalletService.java
浏览文件 @
0b06e90a
package
com
.
mmc
.
iuav
.
user
.
service
.
wallet
;
package
com
.
mmc
.
iuav
.
user
.
service
.
wallet
;
import
com.mmc.iuav.response.ResultBody
;
import
com.mmc.iuav.response.ResultBody
;
import
com.mmc.iuav.user.entity.wallet.CurriculumOrderLogVO
;
import
com.mmc.iuav.user.model.qo.wallet.WalletFlowQO
;
import
com.mmc.iuav.user.model.qo.wallet.WalletFlowQO
;
import
com.mmc.iuav.user.model.vo.wallet.PayUavWalletVO
;
import
com.mmc.iuav.user.model.vo.wallet.PayUavWalletVO
;
import
com.mmc.iuav.user.model.vo.wallet.TopUpOrderVO
;
import
com.mmc.iuav.user.model.vo.wallet.TopUpOrderVO
;
...
@@ -26,5 +27,12 @@ public interface PayWalletService {
...
@@ -26,5 +27,12 @@ public interface PayWalletService {
ResultBody
payUavWallet
(
PayUavWalletVO
payUavWalletVO
);
ResultBody
payUavWallet
(
PayUavWalletVO
payUavWalletVO
);
/**
* 保存用户购买课程消耗的云享金和佣金的金额流水
* @param param
* @return {@link ResultBody}
*/
ResultBody
feignCurriculumOrderLog
(
Integer
userId
,
CurriculumOrderLogVO
param
);
ResultBody
optimizeWalletFlow
(
WalletFlowVO
walletFlowVO
);
ResultBody
optimizeWalletFlow
(
WalletFlowVO
walletFlowVO
);
}
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/wallet/impl/PayWalletServiceImpl.java
浏览文件 @
0b06e90a
...
@@ -8,10 +8,7 @@ import com.mmc.iuav.user.dao.UserServiceDao;
...
@@ -8,10 +8,7 @@ import com.mmc.iuav.user.dao.UserServiceDao;
import
com.mmc.iuav.user.dao.wallet.PayWalletDao
;
import
com.mmc.iuav.user.dao.wallet.PayWalletDao
;
import
com.mmc.iuav.user.entity.UserAccountDO
;
import
com.mmc.iuav.user.entity.UserAccountDO
;
import
com.mmc.iuav.user.entity.XzWithdrawalApplyDO
;
import
com.mmc.iuav.user.entity.XzWithdrawalApplyDO
;
import
com.mmc.iuav.user.entity.wallet.PayLogDO
;
import
com.mmc.iuav.user.entity.wallet.*
;
import
com.mmc.iuav.user.entity.wallet.PayWalletDO
;
import
com.mmc.iuav.user.entity.wallet.UserBillingDetailVO
;
import
com.mmc.iuav.user.entity.wallet.WithdrawalLogDO
;
import
com.mmc.iuav.user.enums.PayMethodEnums
;
import
com.mmc.iuav.user.enums.PayMethodEnums
;
import
com.mmc.iuav.user.model.dto.wallet.PayWalletDTO
;
import
com.mmc.iuav.user.model.dto.wallet.PayWalletDTO
;
import
com.mmc.iuav.user.model.qo.wallet.WalletFlowQO
;
import
com.mmc.iuav.user.model.qo.wallet.WalletFlowQO
;
...
@@ -37,6 +34,7 @@ import java.util.stream.Collectors;
...
@@ -37,6 +34,7 @@ import java.util.stream.Collectors;
*/
*/
@Service
@Service
@Slf4j
@Slf4j
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
class
PayWalletServiceImpl
implements
PayWalletService
{
public
class
PayWalletServiceImpl
implements
PayWalletService
{
@Resource
@Resource
PayWalletDao
payWalletDao
;
PayWalletDao
payWalletDao
;
...
@@ -629,6 +627,47 @@ public class PayWalletServiceImpl implements PayWalletService {
...
@@ -629,6 +627,47 @@ public class PayWalletServiceImpl implements PayWalletService {
}
}
}
}
/**
* 保存用户购买课程消耗的云享金和佣金的金额流水
*
* @param param
* @return {@link ResultBody}
*/
@Override
public
ResultBody
feignCurriculumOrderLog
(
Integer
userId
,
CurriculumOrderLogVO
param
)
{
PayWalletDO
payWalletByUser
=
payWalletDao
.
getPayWalletByUser
(
param
.
getUserAccountId
());
//需要扣除的云享金
BigDecimal
cashAmtPaid
=
param
.
getCashAmtPaid
();
//需要扣除的佣金
BigDecimal
salaryAmtPaid
=
param
.
getSalaryAmtPaid
();
// 这是扣钱的接口 如果小于0表示加钱 不行
if
(
cashAmtPaid
.
compareTo
(
BigDecimal
.
ZERO
)
<
0
||
salaryAmtPaid
.
compareTo
(
BigDecimal
.
ZERO
)
<
0
){
return
ResultBody
.
error
(
"需要扣除的金额不能为负"
);
}
//扣除完后云享金
BigDecimal
cashAmt
=
payWalletByUser
.
getCashAmt
().
subtract
(
cashAmtPaid
);
//扣除完后佣金余额
BigDecimal
salaryAmt
=
payWalletByUser
.
getSalaryAmt
().
subtract
(
salaryAmtPaid
);
if
(
cashAmt
.
compareTo
(
BigDecimal
.
ZERO
)
>=
0
){
payWalletByUser
.
setCashAmt
(
cashAmt
);
}
else
{
return
ResultBody
.
error
(
"云享金不足"
);
}
if
(
salaryAmt
.
compareTo
(
BigDecimal
.
ZERO
)
>=
0
){
payWalletByUser
.
setSalaryAmt
(
salaryAmt
);
}
else
{
return
ResultBody
.
error
(
"佣金不足"
);
}
payWalletDao
.
updatePayWallet
(
payWalletByUser
);
PayLogDO
payLogDO
=
param
.
buildPayLog
();
payLogDO
.
setOperateUser
(
userId
);
payLogDO
.
setPayMethod
(
1400
);
payWalletDao
.
insertPayLogDO
(
payLogDO
);
return
ResultBody
.
success
();
}
private
ResultBody
handleLeaseOrderRefund
(
PayUavWalletVO
payUavWalletVO
,
PayWalletDO
userWalletInfo
,
PayLogDO
payLogDO
,
PayWalletDO
payWalletDO
)
{
private
ResultBody
handleLeaseOrderRefund
(
PayUavWalletVO
payUavWalletVO
,
PayWalletDO
userWalletInfo
,
PayLogDO
payLogDO
,
PayWalletDO
payWalletDO
)
{
payLogDO
.
setCashAmtPaid
(
payUavWalletVO
.
getCashAmount
());
payLogDO
.
setCashAmtPaid
(
payUavWalletVO
.
getCashAmount
());
payLogDO
.
setSalaryAmtPaid
(
payUavWalletVO
.
getSalaryAmount
());
payLogDO
.
setSalaryAmtPaid
(
payUavWalletVO
.
getSalaryAmount
());
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论