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 | 56 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 31 insertions(+), 25 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 9535840..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,4 +1,5 @@
package com.ruoyi.order.controller;
+import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
@@ -15,11 +16,10 @@
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 com.ruoyi.common.core.dto.ExchangeDto;
+import com.ruoyi.common.core.utils.OrderCodeUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.StringUtils;
@@ -27,6 +27,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -82,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];
@@ -116,8 +117,8 @@
* @param goodsIds 订单号-商品类型
* @return
*/
- @PostMapping("/getCodeByOrderId")
- public R<List<String>> getCodeByOrderId(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) {
@@ -151,33 +152,38 @@
@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());
+ 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("");
+ tExchangeOrder.setCode(OrderCodeUtil.getOrderCode("DH"));
tExchangeOrder.setAppUserId(exchangeDto.getUserId());
- tExchangeOrder.setOrderType(0);
- tExchangeOrder.setGoodsId(0);
- tExchangeOrder.setCouponId(0);
- tExchangeOrder.setPurchaseQuantity(0);
- tExchangeOrder.setAppUserAddressId(0L);
- tExchangeOrder.setPoints(0);
+ 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("");
- 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);
+ if (exchangeDto.getGoodType()==1){
+ tExchangeOrder.setStatus(0);
+ }else {
+ tExchangeOrder.setStatus(3);
+ }
tExchangeOrder.setCreateTime(LocalDateTime.now());
tExchangeOrder.setDelFlag(false);
- return R.ok();
+ exchangeOrderService.save(tExchangeOrder);
+ return R.ok(tExchangeOrder.getId());
}
--
Gitblit v1.7.1