From 5d4ebe6d0b7dda230b19f4913bdeb60556b46678 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 13 十月 2025 18:33:47 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java
index 612a601..14a8778 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java
@@ -10,17 +10,13 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TErpGoodsUpdateStatusDto;
-import com.ruoyi.system.dto.UpdateStatusProcurementDto;
import com.ruoyi.system.model.*;
+import com.ruoyi.system.query.TSysGoodsExchangeQuery;
import com.ruoyi.system.query.TSysGoodsQuery;
-import com.ruoyi.system.query.TSysOrderQuery;
import com.ruoyi.system.service.*;
-import com.ruoyi.system.vo.TErpGoodsVO;
-import com.ruoyi.system.vo.TSysOrderPageVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.parameters.P;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -181,5 +177,40 @@
return R.ok();
}
+
+ // 获取兑换记录
+ @ApiOperation(value = "获取兑换记录")
+ @PostMapping(value = "/getExchangeRecord")
+ public R<PageInfo<TSysGoodsExchange>> getExchangeRecord(@RequestBody @Valid TSysGoodsExchangeQuery query) {
+ PageInfo<TSysGoodsExchange> page = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ LambdaQueryWrapper<TSysGoodsExchange> wrapper = new LambdaQueryWrapper<TSysGoodsExchange>().eq(TSysGoodsExchange::getGoodsId, query.getId());
+ if(query.getClinicName()!=null && !query.getClinicName().isEmpty()){
+ wrapper.like(TSysGoodsExchange::getClinicName, query.getClinicName());
+ }
+ if(query.getTime()!=null && !query.getTime().isEmpty()){
+ wrapper.between(TSysGoodsExchange::getCreateTime, query.getTime().split(" - ")[0]+ " 00:00:00", query.getTime().split(" - ")[1]+ " 23:59:59");
+ }
+ if(query.getStatus()!=null){
+ wrapper.eq(TSysGoodsExchange::getStatus, query.getStatus());
+ }
+ wrapper.orderByDesc(BaseModel::getCreateTime);
+ PageInfo<TSysGoodsExchange> page1 = sysGoodsExchangeService.page(page, wrapper);
+ return R.ok(page1);
+ }
+
+ // 获取兑换记录
+ @ApiOperation(value = "发货")
+ @PostMapping(value = "/sendGoods")
+ public R<?> sendGoods(@RequestBody @Valid TSysGoodsExchange exchange) {
+ TSysGoodsExchange exchange1 = sysGoodsExchangeService.getById(exchange.getId());
+ if(exchange1.getStatus()==2){
+ return R.fail("该订单已发货");
+ }
+ exchange1.setStatus(2);
+ exchange1.setLogisticsNumber(exchange1.getLogisticsNumber());
+ sysGoodsExchangeService.updateById(exchange1);
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1