支付改造

2021-10-09 22:23:15 +08:00
parent 001892824c
commit af8f9745e9
13 changed files with 181 additions and 124 deletions
--- a/pay-service-project/pay-service-api/pom.xml
+++ b/pay-service-project/pay-service-api/pom.xml
@@ -31,5 +31,9 @@
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+        </dependency>
    </dependencies>
 </project>
--- a/pay-service-project/pay-service-api/src/main/java/cn/iocoder/mall/payservice/rpc/transaction/PayTransactionFeign.java
+++ b/pay-service-project/pay-service-api/src/main/java/cn/iocoder/mall/payservice/rpc/transaction/PayTransactionFeign.java
@@ -0,0 +1,63 @@
+package cn.iocoder.mall.payservice.rpc.transaction;
+
+import cn.iocoder.common.framework.vo.CommonResult;
+import cn.iocoder.common.framework.vo.PageResult;
+import cn.iocoder.mall.payservice.rpc.transaction.dto.*;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * Title:
+ * Description:
+ *
+ * @author zhuyang
+ * @version 1.0 2021/10/9
+ */
+@FeignClient(value = "pay-service")
+public interface PayTransactionFeign {
+    /**
+     * 创建支付交易单
+     *
+     * @param createReqDTO 创建信息
+     * @return 支付交易单号
+     */
+    @PostMapping("/pay/transaction/createPayTransaction")
+    CommonResult<Integer> createPayTransaction(@RequestBody PayTransactionCreateReqDTO createReqDTO);
+
+    /**
+     * 提交支付交易单
+     *
+     * @param submitReqDTO 提交信息
+     * @return 提交响应，包含三方支付的响应
+     */
+    @PostMapping("/pay/transaction/submitPayTransaction")
+    CommonResult<PayTransactionSubmitRespDTO> submitPayTransaction(@RequestBody PayTransactionSubmitReqDTO submitReqDTO);
+
+    /**
+     * 获得当支付交易单
+     *
+     * @param getReqDTO 获得条件
+     * @return 支付交易单
+     */
+    @PostMapping("/pay/transaction/getPayTransaction")
+    CommonResult<PayTransactionRespDTO> getPayTransaction(@RequestBody PayTransactionGetReqDTO getReqDTO);
+
+    /**
+     * 更新交易支付成功
+     *
+     * @param successReqDTO 支付成功信息
+     * @return 是否成功
+     */
+    @PostMapping("/pay/transaction/updatePayTransactionSuccess")
+    CommonResult<Boolean> updatePayTransactionSuccess(@RequestBody PayTransactionSuccessReqDTO successReqDTO);
+
+    /**
+     * 获得交易支付单分页
+     *
+     * @param pageReqDTO 分页条件
+     * @return 交易支付单分页
+     */
+    @PostMapping("/pay/transaction/pagePayTransaction")
+    CommonResult<PageResult<PayTransactionRespDTO>> pagePayTransaction(@RequestBody  PayTransactionPageReqDTO pageReqDTO);
+}
--- a/pay-service-project/pay-service-api/src/main/java/cn/iocoder/mall/payservice/rpc/transaction/PayTransactionRpc.java
+++ b/pay-service-project/pay-service-api/src/main/java/cn/iocoder/mall/payservice/rpc/transaction/PayTransactionRpc.java
@@ -1,52 +0,0 @@
-package cn.iocoder.mall.payservice.rpc.transaction;
-
-import cn.iocoder.common.framework.vo.CommonResult;
-import cn.iocoder.common.framework.vo.PageResult;
-import cn.iocoder.mall.payservice.rpc.transaction.dto.*;
-
-/**
- * 支付交易单 RPC 接口
- */
-public interface PayTransactionRpc {
-
-    /**
-     * 创建支付交易单
-     *
-     * @param createReqDTO 创建信息
-     * @return 支付交易单号
-     */
-    CommonResult<Integer> createPayTransaction(PayTransactionCreateReqDTO createReqDTO);
-
-    /**
-     * 提交支付交易单
-     *
-     * @param submitReqDTO 提交信息
-     * @return 提交响应，包含三方支付的响应
-     */
-    CommonResult<PayTransactionSubmitRespDTO> submitPayTransaction(PayTransactionSubmitReqDTO submitReqDTO);
-
-    /**
-     * 获得当支付交易单
-     *
-     * @param getReqDTO 获得条件
-     * @return 支付交易单
-     */
-    CommonResult<PayTransactionRespDTO> getPayTransaction(PayTransactionGetReqDTO getReqDTO);
-
-    /**
-     * 更新交易支付成功
-     *
-     * @param successReqDTO 支付成功信息
-     * @return 是否成功
-     */
-    CommonResult<Boolean> updatePayTransactionSuccess(PayTransactionSuccessReqDTO successReqDTO);
-
-    /**
-     * 获得交易支付单分页
-     *
-     * @param pageReqDTO 分页条件
-     * @return 交易支付单分页
-     */
-    CommonResult<PageResult<PayTransactionRespDTO>> pagePayTransaction(PayTransactionPageReqDTO pageReqDTO);
-
-}
--- a/pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/PayServiceApplication.java
+++ b/pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/PayServiceApplication.java
@@ -2,8 +2,12 @@ package cn.iocoder.mall.payservice;

 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;

@SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients
 public class PayServiceApplication {

    public static void main(String[] args) {
--- a/pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/rpc/transaction/PayTransactionRpcImpl.java
+++ b/pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/rpc/transaction/PayTransactionRpcImpl.java
@@ -1,44 +0,0 @@
-package cn.iocoder.mall.payservice.rpc.transaction;
-
-import cn.iocoder.common.framework.vo.CommonResult;
-import cn.iocoder.common.framework.vo.PageResult;
-import cn.iocoder.mall.payservice.rpc.transaction.dto.*;
-import cn.iocoder.mall.payservice.service.transaction.PayTransactionService;
-import org.apache.dubbo.config.annotation.DubboService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import static cn.iocoder.common.framework.vo.CommonResult.success;
-
-@DubboService
-public class PayTransactionRpcImpl implements PayTransactionRpc {
-
-    @Autowired
-    private PayTransactionService payTransactionService;
-
-    @Override
-    public CommonResult<Integer> createPayTransaction(PayTransactionCreateReqDTO createReqDTO) {
-        return success(payTransactionService.createPayTransaction(createReqDTO));
-    }
-
-    @Override
-    public CommonResult<PayTransactionSubmitRespDTO> submitPayTransaction(PayTransactionSubmitReqDTO submitReqDTO) {
-        return success(payTransactionService.submitPayTransaction(submitReqDTO));
-    }
-
-    @Override
-    public CommonResult<PayTransactionRespDTO> getPayTransaction(PayTransactionGetReqDTO getReqDTO) {
-        return success(payTransactionService.getPayTransaction(getReqDTO));
-    }
-
-    @Override
-    public CommonResult<Boolean> updatePayTransactionSuccess(PayTransactionSuccessReqDTO successReqDTO) {
-        return success(payTransactionService.updateTransactionPaySuccess(successReqDTO.getPayChannel(),
-                successReqDTO.getParams()));
-    }
-
-    @Override
-    public CommonResult<PageResult<PayTransactionRespDTO>> pagePayTransaction(PayTransactionPageReqDTO pageReqDTO) {
-        return success(payTransactionService.pagePayTransaction(pageReqDTO));
-    }
-
-}
--- a/pay-service-project/pay-service-app/src/main/java/controller/PayTransactionController.java
+++ b/pay-service-project/pay-service-app/src/main/java/controller/PayTransactionController.java
@@ -0,0 +1,81 @@
+package controller;
+
+import cn.iocoder.common.framework.vo.CommonResult;
+import cn.iocoder.common.framework.vo.PageResult;
+import cn.iocoder.mall.payservice.rpc.transaction.dto.*;
+import cn.iocoder.mall.payservice.service.transaction.PayTransactionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static cn.iocoder.common.framework.vo.CommonResult.success;
+
+/**
+ * Title:
+ * Description:
+ *
+ * @author zhuyang
+ * @version 1.0 2021/10/9
+ */
+@RestController
+@RequestMapping("/pay/transaction")
+public class PayTransactionController {
+    @Autowired
+    private PayTransactionService payTransactionService;
+
+    /**
+     * 创建支付交易单
+     *
+     * @param createReqDTO 创建信息
+     * @return 支付交易单号
+     */
+    @PostMapping("createPayTransaction")
+    CommonResult<Integer> createPayTransaction(@RequestBody PayTransactionCreateReqDTO createReqDTO){
+        return success(payTransactionService.createPayTransaction(createReqDTO));
+    }
+
+    /**
+     * 提交支付交易单
+     *
+     * @param submitReqDTO 提交信息
+     * @return 提交响应，包含三方支付的响应
+     */
+    @PostMapping("submitPayTransaction")
+    CommonResult<PayTransactionSubmitRespDTO> submitPayTransaction(@RequestBody PayTransactionSubmitReqDTO submitReqDTO){
+        return success(payTransactionService.submitPayTransaction(submitReqDTO));
+    }
+
+    /**
+     * 获得当支付交易单
+     *
+     * @param getReqDTO 获得条件
+     * @return 支付交易单
+     */
+    @PostMapping("getPayTransaction")
+    CommonResult<PayTransactionRespDTO> getPayTransaction(@RequestBody PayTransactionGetReqDTO getReqDTO){
+        return success(payTransactionService.getPayTransaction(getReqDTO));}
+
+    /**
+     * 更新交易支付成功
+     *
+     * @param successReqDTO 支付成功信息
+     * @return 是否成功
+     */
+    @PostMapping("updatePayTransactionSuccess")
+    CommonResult<Boolean> updatePayTransactionSuccess(@RequestBody PayTransactionSuccessReqDTO successReqDTO){
+        return success(payTransactionService.updateTransactionPaySuccess(successReqDTO.getPayChannel(),
+            successReqDTO.getParams()));}
+
+    /**
+     * 获得交易支付单分页
+     *
+     * @param pageReqDTO 分页条件
+     * @return 交易支付单分页
+     */
+    @PostMapping("pagePayTransaction")
+    CommonResult<PageResult<PayTransactionRespDTO>> pagePayTransaction(@RequestBody  PayTransactionPageReqDTO pageReqDTO){
+        return success(payTransactionService.pagePayTransaction(pageReqDTO));}
+
+}