From 32a43e602e4a78478781532d31fbc38755188df7 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 二月 2025 09:32:15 +0800
Subject: [PATCH] 111
---
server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java b/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java
index 7f564cc..f27e18d 100644
--- a/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java
@@ -32,6 +32,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* @author 姹熻箘韫�
@@ -92,6 +93,7 @@
public ApiResponse<PageData<Goodsorder>> findPage (@RequestBody PageWrap<Goodsorder> pageWrap) {
return ApiResponse.success(goodsorderService.findPage(pageWrap));
}
+
@ApiOperation("绾夸笂浜ゆ槗姹囨�绘暟鎹帴鍙�")
@PostMapping("/getTotalData")
@RequiresPermissions("business:goodsorder:query")
@@ -118,7 +120,8 @@
for (Goodsorder goodsorder:goodsorders) {
DiscountGoodsorderExportVO discountGoodsorderExportVO = new DiscountGoodsorderExportVO();
BeanUtils.copyProperties(goodsorder,discountGoodsorderExportVO);
- discountGoodsorderExportVO.setPayMoney(discountGoodsorderExportVO.getPayMoney());
+ discountGoodsorderExportVO.setPayMoney(discountGoodsorderExportVO.getMoney());
+ discountGoodsorderExportVO.setOrigin(Constants.ZERO);
discountGoodsorderExportVOList.add(discountGoodsorderExportVO);
}
ExcelExporter.build(DiscountGoodsorderExportVO.class).exportWithFirstAndEnd(discountGoodsorderExportVOList, "璁㈠崟鍒楄〃_"+System.currentTimeMillis(),"璁㈠崟鍒楄〃_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
@@ -170,6 +173,9 @@
@PostMapping("/backGoodsorder")
@RequiresPermissions("business:goodsorder:query")
public ApiResponse backGoodsorder(@RequestBody GoodsorderBackDTO goodsorderBackDTO){
+ if(Objects.nonNull(goodsorderBackDTO) && Objects.isNull(goodsorderBackDTO.getBackType())){
+ goodsorderBackDTO.setBackType(Constants.ONE);
+ }
goodsorderService.backGoodsorder(goodsorderBackDTO);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3