From aaa922990af28c79116f3b3c3de8c3518eb4cd50 Mon Sep 17 00:00:00 2001 From: damonyuan <404054358@qq.com> Date: Sun, 20 Oct 2024 17:10:58 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E8=B0=83=E6=95=B4=E5=85=85=E5=80=BC?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=80=82=E9=85=8D=E6=96=B0=E7=9A=84DB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FinanceRechargerServiceImpl.java | 6 +++--- .../main/java/com/mdd/common/entity/RechargeOrder.java | 5 +++-- .../java/com/mdd/front/controller/PayController.java | 6 +++--- .../com/mdd/front/controller/RechargeController.java | 8 ++++---- .../com/mdd/front/service/impl/PayServiceImpl.java | 4 ++-- .../mdd/front/service/impl/RechargeServiceImpl.java | 10 +++++----- .../java/com/mdd/front/validate/RechargeValidate.java | 4 ++-- 7 files changed, 22 insertions(+), 21 deletions(-) diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java index 15fd0521..bd1b2f05 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java @@ -171,7 +171,7 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService { LogMoneyEnum.UM_DEC_RECHARGE.getCode(), rechargeOrder.getOrderAmount(), rechargeOrder.getId(), - rechargeOrder.getOrderSn(), + rechargeOrder.getSn(), "充值订单退款", null ); @@ -182,7 +182,7 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService { refundRecord.setSn(refundSn); refundRecord.setUserId(rechargeOrder.getUserId()); refundRecord.setOrderId(rechargeOrder.getId()); - refundRecord.setOrderSn(rechargeOrder.getOrderSn()); + refundRecord.setOrderSn(rechargeOrder.getSn()); refundRecord.setOrderType(RefundEnum.getOrderType(RefundEnum.ORDER_TYPE_RECHARGE.getCode())); refundRecord.setOrderAmount(rechargeOrder.getOrderAmount()); refundRecord.setRefundAmount(rechargeOrder.getOrderAmount()); @@ -205,7 +205,7 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService { // 发起退款请求 RefundRequestV3 requestV3 = new RefundRequestV3(); requestV3.setTransactionId(rechargeOrder.getTransactionId()); - requestV3.setOutTradeNo(rechargeOrder.getOrderSn()); + requestV3.setOutTradeNo(rechargeOrder.getSn()); requestV3.setOutRefundNo(refundSn); requestV3.setTotalAmount(AmountUtil.yuan2Fen(rechargeOrder.getOrderAmount().toString())); requestV3.setRefundAmount(AmountUtil.yuan2Fen(rechargeOrder.getOrderAmount().toString())); diff --git a/server/like-common/src/main/java/com/mdd/common/entity/RechargeOrder.java b/server/like-common/src/main/java/com/mdd/common/entity/RechargeOrder.java index f0d3715d..39713435 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/RechargeOrder.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/RechargeOrder.java @@ -22,7 +22,7 @@ public class RechargeOrder { private Integer userId; @ApiModelProperty("订单编号") - private String orderSn; + private String sn; @ApiModelProperty("支付编号") private String paySn; @@ -47,7 +47,8 @@ public class RechargeOrder { @ApiModelProperty("退款状态: [0=未退款 , 1=已退款]") private Integer refundStatus; - + @ApiModelProperty("退款交易流水号") + private Integer refundTransactionId; @ApiModelProperty("创建时间") private Long createTime; diff --git a/server/like-front/src/main/java/com/mdd/front/controller/PayController.java b/server/like-front/src/main/java/com/mdd/front/controller/PayController.java index 6d3c4b81..25de8edf 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/PayController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/PayController.java @@ -41,10 +41,10 @@ public class PayController { @GetMapping("/payWay") @ApiOperation("支付方式") public AjaxResult payWay(@Validated @NotNull(message = "from参数丢失") @RequestParam String from, - @Validated @NotNull(message = "orderId参数丢失") @RequestParam Integer orderId) { + @Validated @NotNull(message = "orderId参数丢失") @RequestParam Integer order_id) { Integer terminal = LikeFrontThreadLocal.getTerminal(); - PayWayListVo list = iPayService.payWay(from, orderId, terminal); + PayWayListVo list = iPayService.payWay(from, order_id, terminal); return AjaxResult.success(list); } @@ -75,7 +75,7 @@ public class PayController { Assert.isTrue(!payWay.equals(PaymentEnum.WALLET_PAY.getCode()), "支付类型不被支持"); requestObj.setUserId(rechargeOrder.getUserId()); - requestObj.setOutTradeNo(rechargeOrder.getOrderSn()); + requestObj.setOutTradeNo(rechargeOrder.getSn()); requestObj.setOrderAmount(rechargeOrder.getOrderAmount()); requestObj.setDescription("余额充值"); requestObj.setAttach("recharge"); diff --git a/server/like-front/src/main/java/com/mdd/front/controller/RechargeController.java b/server/like-front/src/main/java/com/mdd/front/controller/RechargeController.java index b545042e..ff012c45 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/RechargeController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/RechargeController.java @@ -33,18 +33,18 @@ public class RechargeController { return AjaxResult.success(vo); } - @GetMapping("/record") + @GetMapping("/lists") @ApiOperation(value = "充值记录") - public AjaxResult record(@Validated PageValidate pageValidate) { + public AjaxResult lists(@Validated PageValidate pageValidate) { Integer userId = LikeFrontThreadLocal.getUserId(); PageResult list = iRechargeService.record(userId, pageValidate); return AjaxResult.success(list); } - @PostMapping("/placeOrder") + @PostMapping("/recharge") @ApiOperation(value = "充值下单") - public AjaxResult placeOrder(@Validated @RequestBody RechargeValidate rechargeValidate) { + public AjaxResult recharge(@Validated @RequestBody RechargeValidate rechargeValidate) { Integer userId = LikeFrontThreadLocal.getUserId(); Integer terminal = LikeFrontThreadLocal.getTerminal(); diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java index d3a76cd8..f610d7c7 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java @@ -118,7 +118,7 @@ public class PayServiceImpl implements IPayService { vo.setPayStatus(rechargeOrder.getPayStatus()); vo.setPayWay(PaymentEnum.getPayWayMsg(rechargeOrder.getPayWay())); vo.setOrderId(rechargeOrder.getId()); - vo.setOrderSn(rechargeOrder.getOrderSn()); + vo.setOrderSn(rechargeOrder.getSn()); vo.setOrderAmount(rechargeOrder.getOrderAmount()); vo.setPayTime(StringUtils.isNotEmpty(vo.getPayTime()) ? TimeUtils.timestampToDate(vo.getPayTime()) : ""); } @@ -243,7 +243,7 @@ public class PayServiceImpl implements IPayService { LogMoneyEnum.UM_INC_RECHARGE.getCode(), rechargeOrder.getOrderAmount(), rechargeOrder.getId(), - rechargeOrder.getOrderSn(), + rechargeOrder.getSn(), "用户充值余额", null); } } diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/RechargeServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/RechargeServiceImpl.java index ece4b7df..30a6f4f2 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/RechargeServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/RechargeServiceImpl.java @@ -107,24 +107,24 @@ public class RechargeServiceImpl implements IRechargeService { throw new OperateException("充值功能已关闭"); } - if (rechargeValidate.getOrderAmount().compareTo(config.getMinAmount()) < 0) { + if (rechargeValidate.getMoney().compareTo(config.getMinAmount()) < 0) { throw new OperateException("充值金额不能少于" + config.getMinAmount()); } RechargeOrder order = new RechargeOrder(); order.setUserId(userId); order.setOrderTerminal(terminal); - order.setOrderSn(rechargeOrderMapper.randMakeOrderSn("order_sn")); + order.setSn(rechargeOrderMapper.randMakeOrderSn("sn")); order.setPayStatus(0); order.setRefundStatus(0); - order.setOrderAmount(rechargeValidate.getOrderAmount()); + order.setOrderAmount(rechargeValidate.getMoney()); order.setCreateTime(System.currentTimeMillis() / 1000); order.setUpdateTime(System.currentTimeMillis() / 1000); - order.setDeleteTime(System.currentTimeMillis() / 1000); rechargeOrderMapper.insert(order); Map response = new LinkedHashMap<>(); - response.put("orderId", order.getId()); + response.put("order_id", order.getId()); + response.put("from", "recharge"); return response; } diff --git a/server/like-front/src/main/java/com/mdd/front/validate/RechargeValidate.java b/server/like-front/src/main/java/com/mdd/front/validate/RechargeValidate.java index b6ae295b..0a43dc03 100644 --- a/server/like-front/src/main/java/com/mdd/front/validate/RechargeValidate.java +++ b/server/like-front/src/main/java/com/mdd/front/validate/RechargeValidate.java @@ -13,7 +13,7 @@ public class RechargeValidate implements Serializable { private static final long serialVersionUID = 1L; - @NotNull(message = "orderAmount参数缺失") - private BigDecimal orderAmount; + @NotNull(message = "money参数缺失") + private BigDecimal money; }