From caa2b51bb4133f5a2e59eac242e744fb57f864a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 10 九月 2024 13:01:44 +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 | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 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 b5b735e..1ad49f2 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
@@ -1,8 +1,25 @@
package com.ruoyi.order.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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;
+import com.ruoyi.order.api.model.TShoppingOrder;
+import com.ruoyi.order.api.model.TVipOrder;
+import com.ruoyi.order.api.query.ShoppingOrderQuery;
+import com.ruoyi.order.api.query.VipShoppingOrderQuery;
+import com.ruoyi.order.service.TVipOrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.omg.CORBA.PRIVATE_MEMBER;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
/**
* <p>
@@ -12,9 +29,38 @@
* @author xiaochen
* @since 2024-08-07
*/
+@Api(tags = "会员订单")
@RestController
@RequestMapping("/t-vip-order")
public class TVipOrderController {
+ @Resource
+ private TVipOrderService vipOrderService;
+ @Resource
+ private AppUserClient appUserClient;
+ @PostMapping("/getVipOrderList")
+ @ApiOperation(value = "列表查询", tags = {"管理后台-会员订单"})
+ public AjaxResult<PageInfo<TVipOrder>> getVipOrderList(@RequestBody VipShoppingOrderQuery query) {
+ if (StringUtils.hasLength(query.getPhone())){
+ List<Long> data = appUserClient.getUserIdsByPhone(query.getPhone()).getData();
+ if (data.isEmpty()){
+ return AjaxResult.success(new PageInfo<TVipOrder>());
+ }
+ }
+ PageInfo<TVipOrder> res = vipOrderService.pageList(query);
+ return AjaxResult.success(res);
+ }
+ @PostMapping("/addVipOrder")
+ @ApiOperation(value = "添加会员订单", tags = {"管理后台-会员订单"})
+ public R<Long> addVipOrder(@RequestBody TVipOrder dto) {
+ vipOrderService.saveOrUpdate(dto);
+ return R.ok(dto.getId());
+ }
+ @GetMapping("/deleteVipOrder")
+ @ApiOperation(value = "批量删除会员订单", tags = {"管理后台-会员订单"})
+ public AjaxResult deleteVipOrder(String id) {
+ vipOrderService.removeBatchByIds(Arrays.asList(id.split(",")));
+ return AjaxResult.success();
+ }
}
--
Gitblit v1.7.1