12.6修改

2025-12-06 20:31:05 +08:00
parent a950417939
commit 0b361ba2b7
9 changed files with 134 additions and 70 deletions
@@ -113,6 +113,8 @@ public class TmsReceiptApplicationService {
            tmsReceiptDO.setOrganizationId(organizationId);
            tmsReceiptDO.setOrganizationName(organizationName);
            tmsReceiptDO.setCreateBy(userId);
+            tmsReceiptDO.setAccountName(dto.getAccountName());
+            tmsReceiptDO.setAccountInformation(dto.getAccountInformation());
            tmsReceiptDO.setCreateByName(userName);
            tmsReceiptDO.setReceivePaymentNumber(OrderSequence.getOrderCode());
            tmsReceiptDO.setCreateTime(now);
@@ -92,6 +92,14 @@ public class TmsReceipt extends BaseVOEntity{
    @Excel(name = "收款备注")
    private String remark;

+    @ApiModelProperty("账户名称")
+    @Excel(name = "账户名称")
+    private String accountName;
+
+    @ApiModelProperty("账户信息")
+    @Excel(name = "账户信息")
+    private String accountInformation;
+
    @ApiModelProperty("删除标记：0-无状态，1-正常，2-已删除")
    @Excel(name = "是否删除", readConverterExp = "删除标记：0-无状态，1-正常，2-已删除")
    private Integer delFlag;
@@ -88,6 +88,14 @@ public class TmsReceiptPO extends BaseVOEntity{
    @Excel(name = "收款备注")
    private String remark;

+    @ApiModelProperty("账户名称")
+    @Excel(name = "账户名称")
+    private String accountName;
+
+    @ApiModelProperty("账户信息")
+    @Excel(name = "账户信息")
+    private String accountInformation;
+
    @ApiModelProperty("删除标记：0-无状态，1-正常，2-已删除")
    @Excel(name = "是否删除", readConverterExp = "删除标记：0-无状态，1-正常，2-已删除")
    private Integer delFlag;
@@ -99,6 +99,14 @@ public class TmsReceiptDO extends BaseVOEntity{
    @Excel(name = "收款备注")
    private String remark;

+    @ApiModelProperty("账户名称")
+    @Excel(name = "账户名称")
+    private String accountName;
+
+    @ApiModelProperty("账户信息")
+    @Excel(name = "账户信息")
+    private String accountInformation;
+
    @ApiModelProperty("删除标记：0-无状态，1-正常，2-已删除")
    @Excel(name = "是否删除", readConverterExp = "删除标记：0-无状态，1-正常，2-已删除")
    private Integer delFlag;
@@ -95,6 +95,14 @@ public class TmsReceiptDTO extends BaseVOEntity{
    @Excel(name = "收款备注")
    private String remark;

+    @ApiModelProperty("账户名称")
+    @Excel(name = "账户名称")
+    private String accountName;
+
+    @ApiModelProperty("账户信息")
+    @Excel(name = "账户信息")
+    private String accountInformation;
+
    @ApiModelProperty("删除标记：0-无状态，1-正常，2-已删除")
    @Excel(name = "是否删除", readConverterExp = "删除标记：0-无状态，1-正常，2-已删除")
    private Integer delFlag;
@@ -1,11 +1,16 @@
 package com.linke.finance.interfaces.facadeApp.tmsReceipt;

+import java.util.ArrayList;
 import java.util.List;

+import com.linke.finance.application.server.receivingAccount.ReceivingAccountApplicationService;
 import com.linke.finance.application.server.tmsReceipt.TmsReceiptApplicationService;
 import com.linke.finance.application.server.tmsReceipt.TmsReceiptAssembler;
+import com.linke.finance.domain.receivingAccount.repository.po.ReceivingAccountPO;
+import com.linke.finance.domain.receivingAccount.repository.todo.ReceivingAccountDO;
 import com.linke.finance.domain.tmsReceipt.repository.po.TmsReceiptPO;
 import com.linke.finance.domain.tmsReceipt.repository.todo.TmsReceiptDO;
+import com.linke.finance.interfaces.dto.ReceivingAccountDTO;
 import com.linke.finance.interfaces.dto.TmsReceiptDTO;
 import com.mhd.common.core.utils.IgnoreNullUtil;
 import com.mhd.common.core.utils.bean.BeanUtils;
@@ -33,6 +38,8 @@ public class TmsReceiptApi extends BaseController{
    @Autowired
    private TmsReceiptApplicationService tmsReceiptApplicationService;

+    @Autowired
+    private ReceivingAccountApplicationService receivingAccountApplicationService;

    @Resource
    private TmsReceiptAssembler tmsReceiptAssembler;
@@ -53,6 +60,66 @@ public class TmsReceiptApi extends BaseController{
        List<TmsReceiptPO> list = tmsReceiptApplicationService.queryList(tmsReceiptDO);
        return getDataTable(list);
    }
+    /**
+     * 查询收款账户列表
+     */
+//    @ApiOperation("查询收款账户列表")
+    @Log(title = "查询收款账户列表", description = "查询收款账户列表", businessType = BusinessType.INQUIRE)
+    @GetMapping("/listAccount")
+    public TableDataInfo listAccount(ReceivingAccountDTO receivingAccountDTO)
+    {
+        //转换实体
+        ReceivingAccountDO receivingAccountDO = new ReceivingAccountDO();
+        BeanUtils.copyProperties(receivingAccountDTO, receivingAccountDO);
+        startPage();
+        List<ReceivingAccountPO> list = receivingAccountApplicationService.queryList(receivingAccountDO);
+        return getDataTable(list);
+    }
+
+    /**
+     * 新增收款账户
+     */
+//    @ApiOperation("新增收款账户")
+    @Log(title = "新增收款账户", description = "新增收款账户", businessType = BusinessType.INSERT)
+    @PostMapping("/addAccount")
+    public AjaxResult addAccount(@RequestBody ReceivingAccountDTO receivingAccountDTO)
+    {
+        //转换实体
+        ReceivingAccountDO receivingAccountDO = new ReceivingAccountDO();
+        BeanUtils.copyProperties(receivingAccountDTO, receivingAccountDO);
+        return toAjax(receivingAccountApplicationService.insert(receivingAccountDO));
+    }
+
+    /**
+     * 批量新增收款账户
+     */
+//    @ApiOperation("批量新增收款账户")
+    @Log(title = "批量新增收款账户", description = "批量新增收款账户", businessType = BusinessType.INSERT)
+    @PostMapping("/batchAddAccount")
+    public AjaxResult batchAddAccount(@RequestBody List<ReceivingAccountDTO> receivingAccountDTOList)
+    {
+        //转换实体
+        List<ReceivingAccountDO> receivingAccountDOList = new ArrayList<>();
+        for (ReceivingAccountDTO dto : receivingAccountDTOList) {
+            ReceivingAccountDO receivingAccountDO = new ReceivingAccountDO();
+            BeanUtils.copyProperties(dto, receivingAccountDO);
+            receivingAccountDOList.add(receivingAccountDO);
+        }
+        return toAjax(receivingAccountApplicationService.batchInsert(receivingAccountDOList));
+    }
+
+
+    /**
+     * 删除收款账户
+     */
+//    @ApiOperation("删除收款账户")
+    @Log(title = "删除收款账户", description = "删除收款账户", businessType = BusinessType.DELETE)
+    @DeleteMapping("/deleteAccount/{id}")
+    public AjaxResult deleteAccount(@PathVariable("id") Long id)
+    {
+        return toAjax(receivingAccountApplicationService.deleteById(id));
+    }
+

    /**
     * 编辑&保存收款单