Browse Source

修改类名称

wanglang 2 weeks ago
parent
commit
b5ae8f0166

+ 5 - 5
trade-client/src/main/java/com/trade/client/accounts/payableaccounts/controller/PayableAccountsController.java

@@ -5,7 +5,7 @@
 package com.trade.client.accounts.payableaccounts.controller;
 
 import com.trade.client.accounts.payableaccounts.dto.PaymentConfirmDto;
-import com.trade.client.accounts.payableaccounts.service.BPayableAccountsService;
+import com.trade.client.accounts.payableaccounts.service.CPayableAccountsService;
 import com.trade.client.accounts.payableaccounts.vo.PayableAccountsDetail;
 import com.trade.common.core.domain.ResponseResult;
 import com.trade.common.core.page.GridPage;
@@ -35,7 +35,7 @@ import javax.validation.Valid;
 public class PayableAccountsController {
 
     @Resource
-    private BPayableAccountsService bPayableAccountsService;
+    private CPayableAccountsService cPayableAccountsService;
 
     /**
      * 获取我的付款列表分页
@@ -46,7 +46,7 @@ public class PayableAccountsController {
     @ApiOperation(value = "获取我的付款列表分页", notes = "获取我的付款列表分页")
     @PostMapping("/get/page")
     public ResponseResult<GridPage<PayableAccounts>> queryListByPage(@RequestBody PayableAccountsSearchDto searchDto) {
-        return ResponseResult.success(bPayableAccountsService.queryListByPage(searchDto));
+        return ResponseResult.success(cPayableAccountsService.queryListByPage(searchDto));
     }
 
     /**
@@ -58,7 +58,7 @@ public class PayableAccountsController {
     @ApiOperation(value = "提交付款确认", notes = "提交付款确认")
     @PostMapping("/submit")
     public ResponseResult<Boolean> queryListByPage(@RequestBody @Valid PaymentConfirmDto paymentConfirmDto) {
-        return ResponseResult.success(bPayableAccountsService.submitPaymentConfirm(paymentConfirmDto));
+        return ResponseResult.success(cPayableAccountsService.submitPaymentConfirm(paymentConfirmDto));
     }
 
     /**
@@ -70,6 +70,6 @@ public class PayableAccountsController {
     @ApiOperation(value = "查询付款记录详情", notes = "查询付款记录详情")
     @GetMapping("/get/detail")
     public ResponseResult<PayableAccountsDetail> queryDetail(Long id) {
-        return ResponseResult.success(bPayableAccountsService.queryDetail(id));
+        return ResponseResult.success(cPayableAccountsService.queryDetail(id));
     }
 }

+ 1 - 1
trade-client/src/main/java/com/trade/client/accounts/payableaccounts/service/BPayableAccountsService.java

@@ -12,7 +12,7 @@ import com.trade.service.business.payableaccounts.dto.PayableAccountsSearchDto;
  * @Date: 2024/11/5
  * @Version: 1.0
  */
-public interface BPayableAccountsService {
+public interface CPayableAccountsService {
 
     /**
      * 分页查询付款记录

+ 8 - 4
trade-client/src/main/java/com/trade/client/accounts/payableaccounts/service/impl/BPayableAccountsServiceImpl.java

@@ -3,7 +3,7 @@ package com.trade.client.accounts.payableaccounts.service.impl;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.trade.client.accounts.payableaccounts.dto.PaymentConfirmDto;
-import com.trade.client.accounts.payableaccounts.service.BPayableAccountsService;
+import com.trade.client.accounts.payableaccounts.service.CPayableAccountsService;
 import com.trade.client.accounts.payableaccounts.vo.PayableAccountsDetail;
 import com.trade.client.enterprise.customer.domain.CustomerUser;
 import com.trade.client.enterprise.customer.service.CustomerUserService;
@@ -11,7 +11,6 @@ import com.trade.common.annotation.RewriteDate;
 import com.trade.common.constant.HttpStatus;
 import com.trade.common.core.page.GridPage;
 import com.trade.common.exception.ServiceException;
-import com.trade.common.utils.ConstantUtil;
 import com.trade.service.business.payableaccounts.domain.PayableAccounts;
 import com.trade.service.business.payableaccounts.dto.PayableAccountsSearchDto;
 import com.trade.service.business.payableaccounts.service.PayableAccountsService;
@@ -37,7 +36,7 @@ import java.util.List;
  * @Version: 1.0
  */
 @Service
-public class BPayableAccountsServiceImpl implements BPayableAccountsService {
+public class CPayableAccountsServiceImpl implements CPayableAccountsService {
 
     @Resource
     private PayableAccountsService payableAccountsService;
@@ -104,8 +103,13 @@ public class BPayableAccountsServiceImpl implements BPayableAccountsService {
             throw new ServiceException("该应付账款记录不存在");
         }
         PayableAccountsDetail payableAccountsDetail = new PayableAccountsDetail();
-        businessRelateFileBaseService.fillBizObjFiles(payableAccountsDetail, payableAccounts.getId(),
+        BusinessRelateFile businessRelateFile =businessRelateFileBaseService.getByCondition(payableAccounts.getId(),
                 BillingConstant.PAYMENT_VOUCHER, FileTypeEnum.PAYABLE_ACCOUNTS.getCode());
+        FileAbstractDto payableAccountsFile = new FileAbstractDto(
+                fileStorageService.getFileStorageById(businessRelateFile.getFileId()));
+        payableAccountsDetail.setPayableAccountsFile(payableAccountsFile);
+//        businessRelateFileBaseService.fillBizObjFiles(payableAccountsDetail, payableAccounts.getId(),
+//                BillingConstant.PAYMENT_VOUCHER, FileTypeEnum.PAYABLE_ACCOUNTS.getCode());
         payableAccountsDetail.setPayableAccountInfo(payableAccounts);
         FileAbstractDto contactFile = new FileAbstractDto(
                 fileStorageService.getFileStorageById(payableAccounts.getContactFileId()));