Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xinrenli
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
郑云飞
xinrenli
Commits
6c6697b1
Commit
6c6697b1
authored
Apr 03, 2023
by
郑云飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
下单未完成
parent
d1dbd353
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
45 additions
and
1 deletions
+45
-1
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbOrderController.java
+14
-1
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/IDbOrderService.java
+4
-0
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbOrderServiceImpl.java
+27
-0
No files found.
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbOrderController.java
View file @
6c6697b1
...
...
@@ -4,6 +4,7 @@ import java.util.List;
import
java.util.Arrays
;
import
com.yongqi.common.core.domain.model.LoginUser
;
import
com.yongqi.common.helper.LoginHelper
;
import
com.yongqi.xinrenli.domain.DbOrder
;
import
com.yongqi.xinrenli.domain.bo.DbOrderEditBo
;
import
lombok.RequiredArgsConstructor
;
...
...
@@ -126,7 +127,7 @@ public class DbOrderController extends BaseController {
/**
* 取消订单
*
* @param id
s
主键串
* @param id 主键串
*/
@SaCheckPermission
(
"xinrenli:order:remove"
)
@Log
(
title
=
"订单"
,
businessType
=
BusinessType
.
DELETE
)
...
...
@@ -136,4 +137,16 @@ public class DbOrderController extends BaseController {
LoginUser
loginUser
=
new
LoginUser
();
return
toAjax
(
iDbOrderService
.
deleteWithValidByIds
(
id
,
loginUser
));
}
/**
* 下单
*/
@SaCheckPermission
(
"xinrenli:order:pay"
)
@Log
(
title
=
"下单"
,
businessType
=
BusinessType
.
DELETE
)
@RequestMapping
(
"/orderPay"
)
public
R
orderPay
(
@NotNull
(
message
=
"主键不能为空"
)
@RequestParam
(
"id"
)
Long
orderId
,
@RequestParam
(
value
=
"id"
,
required
=
false
)
Long
couponId
)
{
LoginUser
loginUser
=
LoginHelper
.
getLoginUser
();
return
iDbOrderService
.
orderPay
(
orderId
,
couponId
,
loginUser
);
}
}
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/IDbOrderService.java
View file @
6c6697b1
package
com
.
yongqi
.
xinrenli
.
service
;
import
com.yongqi.common.core.domain.R
;
import
com.yongqi.common.core.domain.model.LoginUser
;
import
com.yongqi.xinrenli.domain.DbOrder
;
import
com.yongqi.xinrenli.domain.bo.DbOrderEditBo
;
...
...
@@ -66,4 +67,7 @@ public interface IDbOrderService {
* @return
*/
TableDataInfo
<
DbOrderVo
>
homeList
(
DbOrderBo
bo
,
PageQuery
pageQuery
);
R
orderPay
(
Long
id
,
Long
couponId
,
LoginUser
loginUser
);
}
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbOrderServiceImpl.java
View file @
6c6697b1
...
...
@@ -2,6 +2,7 @@ package com.yongqi.xinrenli.service.impl;
import
cn.hutool.core.bean.BeanUtil
;
import
com.baomidou.mybatisplus.core.toolkit.ObjectUtils
;
import
com.yongqi.common.core.domain.R
;
import
com.yongqi.common.core.domain.entity.SysUser
;
import
com.yongqi.common.core.domain.model.LoginUser
;
import
com.yongqi.common.utils.StringUtils
;
...
...
@@ -10,15 +11,19 @@ import com.yongqi.common.core.domain.PageQuery;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.yongqi.xinrenli.domain.DbCoupon
;
import
com.yongqi.xinrenli.domain.DbFile
;
import
com.yongqi.xinrenli.domain.bo.DbFileBo
;
import
com.yongqi.xinrenli.domain.bo.DbOrderEditBo
;
import
com.yongqi.xinrenli.domain.vo.DbFileVo
;
import
com.yongqi.xinrenli.enums.DeleteStatusEnum
;
import
com.yongqi.xinrenli.enums.FileEnumServiceType
;
import
com.yongqi.xinrenli.mapper.DbCouponMapper
;
import
com.yongqi.xinrenli.mapper.DbFileMapper
;
import
com.yongqi.xinrenli.service.IDbCouponService
;
import
lombok.Data
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
com.yongqi.xinrenli.domain.bo.DbOrderBo
;
import
com.yongqi.xinrenli.domain.vo.DbOrderVo
;
...
...
@@ -42,6 +47,8 @@ public class DbOrderServiceImpl implements IDbOrderService {
private
final
DbOrderMapper
baseMapper
;
private
final
DbFileMapper
fileMapper
;
@Autowired
private
DbCouponMapper
couponMapper
;
/**
* 查询订单
...
...
@@ -250,4 +257,24 @@ public class DbOrderServiceImpl implements IDbOrderService {
});
return
TableDataInfo
.
build
(
result
);
}
/**
* 下单
* @param orderId 订单id
* @param couponId 优惠券id
* @param loginUser 当前登录用户
* @return
*/
@Override
public
R
orderPay
(
Long
orderId
,
Long
couponId
,
LoginUser
loginUser
)
{
// 1.根据订单id获取订单信息
DbOrder
dbOrder
=
this
.
baseMapper
.
selectById
(
orderId
);
// 2.根据卡券id获取卡券信息
DbCoupon
dbCoupon
=
couponMapper
.
selectById
(
couponId
);
// 3.计算应支付金额
// 4.组装支付数据
// 5.调用微信统一下单接口
// 6.返回支付所需数据
return
null
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment