hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-25 16:35:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product

Browse Source
This commit is contained in:
YunaiV
2023-04-19 18:10:59 +08:00
parent 32da5aae84 e5fcc7a387
commit 502fa11f1d
147 changed files with 1988 additions and 1165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
View File

@ -22,7 +22,7 @@ public class TradeOrderBaseVO {
private String no;
@Schema(description = "下单时间", required = true)
private Date createTime;
private LocalDateTime createTime;
@Schema(description = "订单类型", required = true, example = "1")
private Integer type;

3
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.trade.controller.app.order;
import cn.hutool.extra.servlet.ServletUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
@ -55,7 +54,7 @@ public class AppTradeOrderController {
HttpServletRequest servletRequest) {
// 获取登录用户、用户 IP 地址
Long loginUserId = getLoginUserId();
String clientIp = ServletUtil.getClientIP(servletRequest);
String clientIp = ServletUtils.getClientIP(servletRequest);
// 创建交易订单，预支付记录
Long orderId = tradeOrderService.createOrder(loginUserId, clientIp, createReqVO);
return success(orderId);