From b4ee04b14d289262fc303967412a56202b6e002f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 22 Sep 2021 16:41:04 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
index 7189e7a..9d7ef92 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
@@ -2,6 +2,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.mall.dto.AddOrderDto;
+import cc.mrbird.febs.mall.dto.PayOrderDto;
import cc.mrbird.febs.mall.service.IApiMallOrderInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -10,7 +11,9 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @author wzy
@@ -41,5 +44,15 @@
return new FebsResponse().success();
}
+ @ApiOperation(value = "支付订单", notes = "支付订单")
+ @PostMapping(value = "/payOrder")
+ public FebsResponse payOrder(@RequestBody PayOrderDto payOrderDto) {
+ String result = mallOrderInfoService.payOrder(payOrderDto);
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("orderNo", result);
+ map.put("type", payOrderDto.getType());
+ return new FebsResponse().success().data(map).message("支付成功");
+ }
}
--
Gitblit v1.9.1