From 2b8f76b2b39ec7e69d9a59133346776c2297e808 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 九月 2024 16:47:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
index 8165775..94822b5 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
@@ -2,6 +2,7 @@
import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.TExchangeOrder;
@@ -51,9 +52,9 @@
}
@PostMapping("/addVipOrder")
@ApiOperation(value = "添加会员订单", tags = {"管理后台-会员订单"})
- public AjaxResult addVipOrder(@RequestBody TVipOrder dto) {
- vipOrderService.save(dto);
- return AjaxResult.success();
+ public R<Long> addVipOrder(@RequestBody TVipOrder dto) {
+ vipOrderService.saveOrUpdate(dto);
+ return R.ok(dto.getId());
}
@GetMapping("/deleteVipOrder")
@ApiOperation(value = "批量删除会员订单", tags = {"管理后台-会员订单"})
@@ -61,5 +62,13 @@
vipOrderService.removeBatchByIds(Arrays.asList(id.split(",")));
return AjaxResult.success();
}
+
+// @PostMapping("/callBack")
+// public R callBack(@RequestParam("code")String code,@RequestParam("outTradeNo")String outTradeNo){
+// shoppingOrderService.callBack(code,outTradeNo);
+// return R.ok();
+//
+// }
+
}
--
Gitblit v1.7.1