suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：流水返回对象统一

Browse Source
This commit is contained in:
wangff
2025-11-24 16:27:19 +08:00
parent 9bc035fffd
commit 93417c4a4f
9 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
View File

@@ -8,7 +8,6 @@ import com.cool.store.dto.huoma.*;
import com.cool.store.dto.wallet.*;
import com.cool.store.entity.*;
import com.cool.store.enums.DownSystemTypeEnum;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.MessageEnum;
import com.cool.store.enums.SMSMsgEnum;
import com.cool.store.enums.point.ShopSubStageStatusEnum;
@@ -40,8 +39,6 @@ import com.cool.store.service.wallet.WalletApiService;
import com.cool.store.service.wechat.WechatTemplateService;
import com.cool.store.service.xinfa.XinFaBusinessService;
import com.cool.store.utils.RsaSignUtil;
import com.cool.store.utils.easyExcel.StoreImageExcelExporter;
import com.cool.store.utils.poi.ExcelUtil;
import com.cool.store.utils.poi.StringUtils;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -52,10 +49,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.*;
@@ -757,8 +752,8 @@ public class PCTestController {
@ApiOperation(" 获取账单详情")
@PostMapping("/getBillDetail")
public ResponseResult<BillDetailDTO> getBillDetail(@RequestBody BillDetailRequest request) {
BillDetailDTO billDetail = walletApiService.getBillDetail(request);
public ResponseResult<TradeRecordDTO> getBillDetail(@RequestBody BillDetailRequest request) {
TradeRecordDTO billDetail = walletApiService.getBillDetail(request);
return ResponseResult.success(billDetail);
}

2
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/WalletController.java
View File

@@ -64,7 +64,7 @@ public class WalletController {
@ApiOperation("交易流水详情")
@GetMapping("/billDetail")
public ResponseResult<BillDetailDTO> getBillDetail(BillDetailRequest request) {
public ResponseResult<TradeRecordDTO> getBillDetail(BillDetailRequest request) {
return ResponseResult.success(walletService.getBillDetail(request));
}
}

4
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniWalletController.java
View File

@@ -1,7 +1,7 @@
package com.cool.store.controller.webc;
import com.cool.store.dto.wallet.BillDetailDTO;
import com.cool.store.dto.wallet.OpenBasicInfoDTO;
import com.cool.store.dto.wallet.TradeRecordDTO;
import com.cool.store.request.wallet.*;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.wallet.WalletService;
@@ -77,7 +77,7 @@ public class MiniWalletController {
@ApiOperation("交易流水详情")
@GetMapping("/billDetail")
public ResponseResult<BillDetailDTO> getBillDetail(BillDetailRequest request) {
public ResponseResult<TradeRecordDTO> getBillDetail(BillDetailRequest request) {
return ResponseResult.success(walletService.getBillDetail(request));
}