订单支付,优化名称

src/main/java/com/caimei365/order/controller/SubmitApi.java → src/main/java/com/caimei365/order/controller/OrderSubmitApi.java

@@ -25,7 +25,7 @@ import java.util.Map;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/order/submit")
-public class SubmitApi {
+public class OrderSubmitApi {
     private final SubmitService submitService;
 
     /**

src/main/java/com/caimei365/order/controller/OnlinePayApi.java → src/main/java/com/caimei365/order/controller/PayOrderApi.java

@@ -1,13 +1,12 @@
 package com.caimei365.order.controller;
 
 import com.caimei365.order.model.ResponseJson;
-import com.caimei365.order.service.OnlinePayService;
+import com.caimei365.order.service.PayOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -23,8 +22,8 @@ import java.util.Map;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/order/pay")
-public class OnlinePayApi {
-    private final OnlinePayService onlinePayService;
+public class PayOrderApi {
+    private final PayOrderService payOrderService;
 
     /**
      * 订单支付前效验付款规则
@@ -36,7 +35,7 @@ public class OnlinePayApi {
         if (null == orderId) {
             return ResponseJson.error("订单Id不能为空！", null);
         }
-        return onlinePayService.payBeforeCheck(orderId);
+        return payOrderService.payBeforeCheck(orderId);
     }
 
     /**
@@ -49,21 +48,16 @@ public class OnlinePayApi {
         if (null == orderId) {
             return ResponseJson.error("订单Id不能为空！", null);
         }
-        return onlinePayService.balanceDeduction(orderId);
+        return payOrderService.balanceDeduction(orderId);
     }
 
-
-
-
-
-
     /**
      * 获取线上支付全局开关状态
      */
     @ApiOperation("获取线上支付全局开关状态（旧：/PayOrder/onLineSwitch）")
     @GetMapping("/online/switch")
     public ResponseJson<Integer> getPayOnLineSwitch() {
-        return onlinePayService.getPayOnLineSwitch();
+        return payOrderService.getPayOnLineSwitch();
     }
 
     /**
@@ -76,7 +70,7 @@ public class OnlinePayApi {
         if (null == orderId) {
             return ResponseJson.error("订单Id不能为空！", null);
         }
-        return onlinePayService.getCheckoutCounter(orderId);
+        return payOrderService.getCheckoutCounter(orderId);
     }
 
 

src/main/java/com/caimei365/order/mapper/OnlinePayMapper.java → src/main/java/com/caimei365/order/mapper/PayOrderMapper.java

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @date : 2021/7/29
  */
 @Mapper
-public interface OnlinePayMapper {
+public interface PayOrderMapper {
     /**
      * 获取线上支付全局开关状态
      */

src/main/java/com/caimei365/order/service/OnlinePayService.java → src/main/java/com/caimei365/order/service/PayOrderService.java

@@ -10,7 +10,7 @@ import java.util.Map;
  * @author : Charles
  * @date : 2021/7/29
  */
-public interface OnlinePayService {
+public interface PayOrderService {
     /**
      * 订单支付前效验付款规则
      * @param orderId 订单Id

src/main/java/com/caimei365/order/service/impl/OnlinePayServiceImpl.java → src/main/java/com/caimei365/order/service/impl/PayOrderServiceImpl.java

@@ -3,14 +3,14 @@ package com.caimei365.order.service.impl;
 import com.caimei365.order.components.OrderCommonService;
 import com.caimei365.order.components.ProductService;
 import com.caimei365.order.mapper.BaseMapper;
-import com.caimei365.order.mapper.OnlinePayMapper;
+import com.caimei365.order.mapper.PayOrderMapper;
 import com.caimei365.order.mapper.OrderCommonMapper;
 import com.caimei365.order.model.ResponseJson;
 import com.caimei365.order.model.po.BalanceRecordPo;
 import com.caimei365.order.model.vo.DiscernReceiptVo;
 import com.caimei365.order.model.vo.OrderProductVo;
 import com.caimei365.order.model.vo.OrderVo;
-import com.caimei365.order.service.OnlinePayService;
+import com.caimei365.order.service.PayOrderService;
 import com.caimei365.order.utils.MathUtil;
 import com.google.common.util.concurrent.AtomicDouble;
 import lombok.extern.slf4j.Slf4j;
@@ -32,11 +32,11 @@ import java.util.concurrent.atomic.AtomicReference;
  */
 @Slf4j
 @Service
-public class OnlinePayServiceImpl implements OnlinePayService {
+public class PayOrderServiceImpl implements PayOrderService {
     @Resource
     private BaseMapper baseMapper;
     @Resource
-    private OnlinePayMapper onlinePayMapper;
+    private PayOrderMapper payOrderMapper;
     @Resource
     private OrderCommonMapper orderCommonMapper;
     @Resource
@@ -52,7 +52,7 @@ public class OnlinePayServiceImpl implements OnlinePayService {
     @Override
     public ResponseJson<Map<String, Object>> payBeforeCheck(Integer orderId) {
         // 订单信息
-        OrderVo order = onlinePayMapper.getOrderByOrderId(orderId);
+        OrderVo order = payOrderMapper.getOrderByOrderId(orderId);
         if (null == order) {
             return ResponseJson.error("订单不存在", null);
         }
@@ -60,7 +60,7 @@ public class OnlinePayServiceImpl implements OnlinePayService {
         Map<String, Object> map = new HashMap<>();
         map.put("orderId", orderId);
         // 查询审核中的退款退货数量
-        int refundCount = onlinePayMapper.getRefundCount(orderId);
+        int refundCount = payOrderMapper.getRefundCount(orderId);
         if (refundCount > 0) {
             map.put("code", -1);
             map.put("msg", "订单已申请全部退款，无需再付款！");
@@ -102,7 +102,7 @@ public class OnlinePayServiceImpl implements OnlinePayService {
     @Override
     public ResponseJson<Map<String, Object>> balanceDeduction(Integer orderId) {
         // 订单信息
-        OrderVo order = onlinePayMapper.getOrderByOrderId(orderId);
+        OrderVo order = payOrderMapper.getOrderByOrderId(orderId);
         if (null == order) {
             return ResponseJson.error("订单不存在", null);
         }
@@ -145,7 +145,7 @@ public class OnlinePayServiceImpl implements OnlinePayService {
             String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
             order.setUpdateDate(curDateStr);
             // 更新订单支付状态
-            onlinePayMapper.updateOrderStatus(order);
+            payOrderMapper.updateOrderStatus(order);
             // 剩余待付金额
             order.setPendingPayments(MathUtil.sub(order.getPendingPayments(), balancePayFee).doubleValue());
             // 修改账户余额
@@ -156,7 +156,7 @@ public class OnlinePayServiceImpl implements OnlinePayService {
                 productService.saveDiscernReceipt(balancePayFee, orderId, "【订单支付,余额抵扣】");
             }
             availableMoney = MathUtil.sub(availableMoney, balancePayFee).doubleValue();
-            onlinePayMapper.updateMoneyByUserId(userMoney, availableMoney, order.getUserId());
+            payOrderMapper.updateMoneyByUserId(userMoney, availableMoney, order.getUserId());
             log.info("【订单支付,余额抵扣】>>>>>>>>>>>更新用户余额(update[user])userId：" + order.getUserId() + "，orderId：" + orderId);
             //保存余额到余额收支记录
             BalanceRecordPo balanceRecord = new BalanceRecordPo();
@@ -183,7 +183,7 @@ public class OnlinePayServiceImpl implements OnlinePayService {
      */
     @Override
     public ResponseJson<Integer> getPayOnLineSwitch() {
-        Integer status = onlinePayMapper.getPayOnLineSwitch();
+        Integer status = payOrderMapper.getPayOnLineSwitch();
         return ResponseJson.success(status);
     }
 
@@ -195,7 +195,7 @@ public class OnlinePayServiceImpl implements OnlinePayService {
     @Override
     public ResponseJson<Map<String, Object>> getCheckoutCounter(Integer orderId) {
         // 订单信息
-        OrderVo order = onlinePayMapper.getOrderByOrderId(orderId);
+        OrderVo order = payOrderMapper.getOrderByOrderId(orderId);
         if (null == order) {
             return ResponseJson.error("订单不存在", null);
         }

src/main/resources/mapper/OnlinePayMapper.xml → src/main/resources/mapper/PayOrderMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei365.order.mapper.OnlinePayMapper">
+<mapper namespace="com.caimei365.order.mapper.PayOrderMapper">
     <update id="updateOrderStatus">
         UPDATE cm_order SET
         status = #{status}