From 6b53b5915b10b0568bb5b44ee35679ece3c476ce Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 21 八月 2024 17:05:21 +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 | 109 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 88 insertions(+), 21 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 17afde1..690d828 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,4 +1,6 @@
package com.ruoyi.order.controller;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -6,26 +8,27 @@
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.page.PageInfo;
-import com.ruoyi.order.api.model.TChargingOrder;
+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.TActivityStatisticslVO;
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.order.service.impl.TChargingOrderServiceImpl;
+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 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.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -41,17 +44,14 @@
@RestController
@RequestMapping("/t-exchange-order")
public class TExchangeOrderController {
- @Autowired
+ @Resource
private TShoppingOrderService tShoppingOrderService;
- @Autowired
+ @Resource
private TExchangeOrderService exchangeOrderService;
- @Autowired
- private TChargingOrderService chargingOrderService;
- @Autowired
- private TVipOrderService vipOrderService;
- @Autowired
+
+ @Resource
private AppUserClient appUserClient;
- @Autowired
+ @Resource
private ChargingPileClient chargingPileClient;
/**
* 管理后台 活动费用统计
@@ -75,7 +75,7 @@
//订单详情
@PostMapping(value = "/detail")
- public R<TExchangeOrder> detail(@RequestParam Long orderId) {
+ public R<TExchangeOrder> detail(@RequestParam("orderId") Long orderId) {
return R.ok(exchangeOrderService.getById(orderId));
}
@@ -148,11 +148,78 @@
return R.ok(strings);
}
- /**
- * 管理后台 根据t_app_coupon订单ids查询积分兑换优惠券的订单编号
- * @param goodsIds 订单号-商品类型
- * @return
- */
+
+
+
+ @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();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+ String code = "DH" + Math.random() * 1000 + sdf.format(new Date());
+ tExchangeOrder.setCode(code);
+ 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