From 25c2e11cf8045a2a59bc5c661a7d96e5b372b318 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 24 八月 2024 09:48:07 +0800
Subject: [PATCH] 8.24.1
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java | 187 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 144 insertions(+), 43 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 873af59..1e5f04f 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,24 +1,35 @@
package com.ruoyi.order.controller;
+import java.text.SimpleDateFormat;
+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.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.TActivityVO;
+import com.ruoyi.order.dto.ExchangeOrderGoodsInfo;
+import com.ruoyi.order.dto.GetMyExchangeOrder;
+import com.ruoyi.order.dto.MyExchangeOrderList;
import com.ruoyi.order.service.TExchangeOrderService;
import com.ruoyi.order.service.TShoppingOrderService;
+import com.ruoyi.common.core.dto.ExchangeDto;
+import com.ruoyi.common.core.utils.OrderCodeUtil;
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.RequestParam;
-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.Arrays;
+import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -32,14 +43,38 @@
@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 Long orderId) {
+ public R<TExchangeOrder> detail(@RequestParam("orderId") Long orderId) {
return R.ok(exchangeOrderService.getById(orderId));
}
@@ -48,8 +83,8 @@
* @param goodsIds 订单号-商品类型
* @return
*/
- @PostMapping("/getSalesCountByGoodsIds")
- public R<List<Integer>> getSalesCountByGoodsId(String goodsIds){
+ @GetMapping("/getSalesCountByGoodsIds/{goodsIds}")
+ public R<List<Integer>> getSalesCountByGoodsId(@PathVariable("goodsIds")String goodsIds){
String[] split = goodsIds.split("-");
// 取出最后一位字符 类型1查询现金购买 类型2查询积分兑换
String s = split[split.length - 1];
@@ -78,49 +113,115 @@
return R.ok(res);
}
/**
- * 管理后台 根据t_app_coupon流水号查询现金优惠券的订单编号
+ * 管理后台 根据t_app_coupon订单ids查询优惠券的订单编号
* @param goodsIds 订单号-商品类型
* @return
*/
- @PostMapping("/getCodeBySerialNumber")
- public R<List<String>> getCodeBySerialNumber(String goodsIds){
+ @GetMapping("/getCodeByOrderId/{goodsIds}")
+ public R<List<String>> getCodeByOrderId(@PathVariable("goodsIds") String goodsIds){
String[] split = goodsIds.split("-");
List<String> strings = new ArrayList<>();
for (String s : split) {
- TShoppingOrder one = tShoppingOrderService.getOne(new QueryWrapper<TShoppingOrder>()
- .eq("order_type", 2)
- .eq("serial_number", s));
- if (one != null){
- strings.add(one.getCode());
+ 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{
- strings.add("");
+ 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);
}
- /**
- * 管理后台 根据t_app_coupon流水号查询积分兑换优惠券的订单编号
- * @param goodsIds 订单号-商品类型
- * @return
- */
- @PostMapping("/getCodeBySerialNumberIntegral")
- public R<List<String>> getCodeBySerialNumberIntegral(String goodsIds){
- String[] split = goodsIds.split("-");
- List<String> strings = new ArrayList<>();
- for (String s : split) {
- TExchangeOrder one = exchangeOrderService.getOne(new QueryWrapper<TExchangeOrder
- >()
- .eq("order_type", 2)
- .eq("serial_number", 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,@RequestParam("goodType") Integer goodType){
+ if (goodType==1){
+ return R.ok(exchangeOrderService.lambdaQuery().eq(TExchangeOrder::getGoodsId,goodId).eq(TExchangeOrder::getAppUserId,userId).ne(TExchangeOrder::getStatus,4).count());
+ }else {
+ return R.ok(exchangeOrderService.lambdaQuery().eq(TExchangeOrder::getCouponId,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(OrderCodeUtil.getOrderCode("DH"));
+ tExchangeOrder.setAppUserId(exchangeDto.getUserId());
+ tExchangeOrder.setOrderType(exchangeDto.getGoodType());
+ if (exchangeDto.getGoodType()==1) {
+ tExchangeOrder.setGoodsId(exchangeDto.getGoodId());
+ }else {
+ tExchangeOrder.setCouponId(exchangeDto.getGoodId());
+ }
+ tExchangeOrder.setPurchaseQuantity(1);
+ tExchangeOrder.setAppUserAddressId(Long.valueOf(exchangeDto.getAddressId()));
+ tExchangeOrder.setPoints(exchangeDto.getPoint());
+ tExchangeOrder.setRemark("");
+ if (exchangeDto.getGoodType()==1){
+ tExchangeOrder.setStatus(0);
+ }else {
+ tExchangeOrder.setStatus(3);
+ }
+ tExchangeOrder.setCreateTime(LocalDateTime.now());
+ tExchangeOrder.setDelFlag(false);
+ exchangeOrderService.save(tExchangeOrder);
+ return R.ok(tExchangeOrder.getId());
+
+ }
+
+
+
+ @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