From 10de85f85ad0874b2d93c851bb4d3eacab24a183 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 21 八月 2024 14:45:25 +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/TExchangeOrderController.java | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 157 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
index 1c24499..9535840 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
@@ -1,21 +1,34 @@
package com.ruoyi.order.controller;
+import java.time.LocalDateTime;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.chargingPile.api.feignClient.ChargingPileClient;
+import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.order.api.model.TExchangeOrder;
import com.ruoyi.order.api.model.TShoppingOrder;
+import com.ruoyi.order.api.query.TActivityStatisticsQuery;
+import com.ruoyi.order.api.vo.TActivityVO;
+import com.ruoyi.order.dto.ExchangeOrderGoodsInfo;
+import com.ruoyi.order.dto.GetMyExchangeOrder;
+import com.ruoyi.order.dto.MyExchangeOrderList;
+import com.ruoyi.order.service.TChargingOrderService;
import com.ruoyi.order.service.TExchangeOrderService;
import com.ruoyi.order.service.TShoppingOrderService;
+import com.ruoyi.order.service.TVipOrderService;
+import com.ruoyi.other.api.dto.ExchangeDto;
import io.swagger.annotations.Api;
-import io.swagger.models.auth.In;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -29,10 +42,41 @@
@RestController
@RequestMapping("/t-exchange-order")
public class TExchangeOrderController {
- @Autowired
+ @Resource
private TShoppingOrderService tShoppingOrderService;
- @Autowired
+ @Resource
private TExchangeOrderService exchangeOrderService;
+
+ @Resource
+ private AppUserClient appUserClient;
+ @Resource
+ private ChargingPileClient chargingPileClient;
+ /**
+ * 管理后台 活动费用统计
+ * @param
+ * @return
+ */
+ @PostMapping(value = "/activityStatistics")
+ public R<TActivityVO> activityStatistics(@RequestBody TActivityStatisticsQuery dto) {
+ if (StringUtils.hasLength(dto.getPhone())){
+ // 远程调用查询出符合条件的用户ids
+ List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData();
+ dto.setUserIds(data);
+ }
+ if (dto.getSiteId()!=null){
+ // 远程调用查询出符合条件的充电桩ids
+ List<TChargingPile> data = chargingPileClient.getChargingPileBySiteId(dto.getSiteId()).getData();
+ dto.setChargingPileIds(data.stream().map(TChargingPile::getId).collect(Collectors.toList()));
+ }
+ return R.ok(tShoppingOrderService.activityStatistics(dto));
+ }
+
+ //订单详情
+ @PostMapping(value = "/detail")
+ public R<TExchangeOrder> detail(@RequestParam("orderId") Long orderId) {
+ return R.ok(exchangeOrderService.getById(orderId));
+ }
+
/**
* 管理后台 根据商品ids 查询对应的销量
* @param goodsIds 订单号-商品类型
@@ -67,5 +111,111 @@
}
return R.ok(res);
}
+ /**
+ * 管理后台 根据t_app_coupon订单ids查询优惠券的订单编号
+ * @param goodsIds 订单号-商品类型
+ * @return
+ */
+ @PostMapping("/getCodeByOrderId")
+ public R<List<String>> getCodeByOrderId(String goodsIds){
+ String[] split = goodsIds.split("-");
+ List<String> strings = new ArrayList<>();
+ for (String s : split) {
+ if (s.contains("-")){
+ // 带有负号的是积分兑换的订单
+ TExchangeOrder one = exchangeOrderService.getOne(new QueryWrapper<TExchangeOrder>()
+ .eq("order_type", 2)
+ .eq("id", s.replace("-","")));
+ if (one != null){
+ strings.add(one.getCode());
+ }else{
+ strings.add("");
+ }
+ }else{
+ TShoppingOrder one = tShoppingOrderService.getOne(new QueryWrapper<TShoppingOrder>()
+ .eq("order_type", 2)
+ .eq("id", s));
+ if (one != null){
+ strings.add(one.getCode());
+ }else{
+ strings.add("");
+ }
+ }
+
+ }
+
+ return R.ok(strings);
+ }
+
+
+
+
+ @PostMapping("/getById")
+ public R<Long> getById(@RequestParam("goodId") Integer goodId,@RequestParam("userId") Long userId){
+ return R.ok(exchangeOrderService.lambdaQuery().eq(TExchangeOrder::getGoodsId,goodId).eq(TExchangeOrder::getAppUserId,userId).ne(TExchangeOrder::getStatus,4).count());
+ }
+
+ @PostMapping("/create")
+ public R<Long> exchangeCreate(@RequestBody ExchangeDto exchangeDto){
+ TExchangeOrder tExchangeOrder = new TExchangeOrder();
+ tExchangeOrder.setCode("");
+ tExchangeOrder.setAppUserId(exchangeDto.getUserId());
+ tExchangeOrder.setOrderType(0);
+ tExchangeOrder.setGoodsId(0);
+ tExchangeOrder.setCouponId(0);
+ tExchangeOrder.setPurchaseQuantity(0);
+ tExchangeOrder.setAppUserAddressId(0L);
+ tExchangeOrder.setPoints(0);
+ tExchangeOrder.setRemark("");
+ tExchangeOrder.setStatus(0);
+ tExchangeOrder.setExpressCompany("");
+ tExchangeOrder.setExpressNumber("");
+ tExchangeOrder.setConsignerId(0);
+ tExchangeOrder.setConsignerTime(LocalDateTime.now());
+ tExchangeOrder.setReceivingTime(LocalDateTime.now());
+ tExchangeOrder.setCancellationTime(LocalDateTime.now());
+ tExchangeOrder.setCancellationId(0);
+ tExchangeOrder.setCreateTime(LocalDateTime.now());
+ tExchangeOrder.setDelFlag(false);
+ return R.ok();
+
+ }
+
+
+
+ @GetMapping("/getMyExchangeOrder")
+ @ApiOperation(value = "获取兑换记录列表", tags = {"小程序-兑换记录"})
+ public AjaxResult<List<MyExchangeOrderList>> getMyExchangeOrder(GetMyExchangeOrder query){
+ List<MyExchangeOrderList> list = exchangeOrderService.getMyExchangeOrder(query);
+ return AjaxResult.success(list);
+ }
+
+
+
+ @GetMapping("/getGoodsExchangeOrder/{id}")
+ @ApiOperation(value = "获取兑换订单详情", tags = {"小程序-兑换记录"})
+ public AjaxResult<ExchangeOrderGoodsInfo> getGoodsExchangeOrder(@PathVariable String id){
+ ExchangeOrderGoodsInfo goodsExchangeOrder = exchangeOrderService.getGoodsExchangeOrder(id);
+ return AjaxResult.success(goodsExchangeOrder);
+ }
+
+
+ @PutMapping("/confirmReceipt/{id}")
+ @ApiOperation(value = "确认收货操作", tags = {"小程序-兑换记录"})
+ public AjaxResult confirmReceipt(@PathVariable String id){
+ TExchangeOrder tExchangeOrder = exchangeOrderService.getById(id);
+ if(tExchangeOrder.getStatus() == 3){
+ return AjaxResult.error("不能重复确认收货");
+ }
+ if(tExchangeOrder.getStatus() == 1){
+ return AjaxResult.error("订单还未发货呢");
+ }
+ if(tExchangeOrder.getStatus() == 4){
+ return AjaxResult.error("订单已取消，不允许操作。");
+ }
+ tExchangeOrder.setStatus(3);
+ exchangeOrderService.updateById(tExchangeOrder);
+ return AjaxResult.success();
+ }
}
--
Gitblit v1.7.1