From 80c6d9fc86582de1478ddbe4cf99f43947cdcaa4 Mon Sep 17 00:00:00 2001 From: phpcjl <phpcjl@gmail.com> Date: 星期五, 06 十二月 2024 09:34:56 +0800 Subject: [PATCH] 1. --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 1 + ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java | 3 +++ ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java | 28 +++++++++++++++------------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java index bf677d3..e5764e5 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java @@ -14,6 +14,9 @@ @ApiModelProperty(value = "订单id") private Long id; + @ApiModelProperty(value = "订单状态") + private Integer orderStatus; + @ApiModelProperty(value = "订单商品") private List<OrderGoodsVO> goodsList; diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java index a9e78a6..d8f9645 100644 --- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java +++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java @@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; @@ -115,18 +116,19 @@ return R.ok(list); } -// /** -// * 充值 -// */ -// @GetMapping("recharge") -// @ApiOperation(value = "充值", notes = "钱包充值") -// public AjaxResult recharge(@ApiParam(value = "充值金额", required = true) @RequestParam BigDecimal amount) { -// Long userId = SecurityUtils.getUserId(); -// String openId; -// // 商户号 -// String partnerTradeNo; -// // TODO 充值 -// return AjaxResult.success(); -// } + /** + * 充值 + */ + @GetMapping("recharge") + @ApiOperation(value = "充值", notes = "钱包充值") + public R<Void> recharge(@ApiParam(value = "充值金额", required = true) @RequestParam BigDecimal amount) { + LoginUser loginUserApplet = tokenService.getLoginUserApplet(); + AppUser appUser = appUserService.getById(loginUserApplet.getUserid()); + String wxOpenid = appUser.getWxOpenid(); + // 商户号 + String partnerTradeNo; + // TODO 充值 + return R.ok(); + } } diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java index 5064e1b..fcbe4ed 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java @@ -115,6 +115,7 @@ OrderDetailVO orderDetailVO = new OrderDetailVO(); orderDetailVO.setId(order.getId()); + orderDetailVO.setOrderStatus(order.getOrderStatus()); orderDetailVO.setPoint(order.getPoint()); orderDetailVO.setAddressId(userAddress.getId()); orderDetailVO.setRecieveName(userAddress.getRecieveName()); -- Gitblit v1.7.1