feat 调整充值接口适配新的DB

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()));

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;
 

server/like-front/src/main/java/com/mdd/front/controller/PayController.java

@@ -41,10 +41,10 @@ public class PayController {
     @GetMapping("/payWay")
     @ApiOperation("支付方式")
     public AjaxResult<PayWayListVo> 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");

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<Object> record(@Validated PageValidate pageValidate) {
+    public AjaxResult<Object> lists(@Validated PageValidate pageValidate) {
         Integer userId = LikeFrontThreadLocal.getUserId();
 
         PageResult<RechargeRecordVo> list = iRechargeService.record(userId, pageValidate);
         return AjaxResult.success(list);
     }
 
-    @PostMapping("/placeOrder")
+    @PostMapping("/recharge")
     @ApiOperation(value = "充值下单")
-    public AjaxResult<Object> placeOrder(@Validated @RequestBody RechargeValidate rechargeValidate) {
+    public AjaxResult<Object> recharge(@Validated @RequestBody RechargeValidate rechargeValidate) {
         Integer userId = LikeFrontThreadLocal.getUserId();
         Integer terminal = LikeFrontThreadLocal.getTerminal();
 

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);
         }
     }

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<String, Object> response = new LinkedHashMap<>();
-        response.put("orderId", order.getId());
+        response.put("order_id", order.getId());
+        response.put("from", "recharge");
         return response;
     }
 

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参数缺失")
+    @NotNull(message = "money参数缺失")
-    private BigDecimal orderAmount;
+    private BigDecimal money;
 
 }