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 | 39 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 3 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 5f4fb2a..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,4 +1,5 @@ package com.ruoyi.order.controller; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -18,6 +19,7 @@ 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.annotations.ApiOperation; import org.springframework.util.StringUtils; @@ -144,9 +146,40 @@ 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(); + + } -- Gitblit v1.7.1