From 0c419caaaa37f0c6a7da01c2755cb909446ccf7a Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 24 Jul 2024 17:54:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/sales/SalesApplication.java | 2 +- .../yxt/sales/biz/smssalesbill/AccountVo.java | 23 ++++++++++ .../smssalesbill/SmsSalesBillDetailsVo.java | 10 ++-- .../biz/smssalesbill/SmsSalesBillDto.java | 7 +-- .../biz/smssalesbill/SmsSalesBillService.java | 46 ++++++++++++++----- .../SmsSalesBillAccountMapper.java | 2 +- .../SmsSalesBillAccountService.java | 4 +- 7 files changed, 72 insertions(+), 22 deletions(-) create mode 100644 src/main/java/com/yxt/sales/biz/smssalesbill/AccountVo.java diff --git a/src/main/java/com/yxt/sales/SalesApplication.java b/src/main/java/com/yxt/sales/SalesApplication.java index 6b35106..125ded4 100644 --- a/src/main/java/com/yxt/sales/SalesApplication.java +++ b/src/main/java/com/yxt/sales/SalesApplication.java @@ -12,7 +12,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication(scanBasePackages = { "com.yxt.sales.config", "com.yxt.common.base.config", - "com.yxt.goods" + "com.yxt.sales" }) // 启用自带定时任务 @EnableScheduling diff --git a/src/main/java/com/yxt/sales/biz/smssalesbill/AccountVo.java b/src/main/java/com/yxt/sales/biz/smssalesbill/AccountVo.java new file mode 100644 index 0000000..0fa1581 --- /dev/null +++ b/src/main/java/com/yxt/sales/biz/smssalesbill/AccountVo.java @@ -0,0 +1,23 @@ +package com.yxt.sales.biz.smssalesbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author Fan + * @description + * @date 2024/7/24 17:19 + */ +@Data +public class AccountVo { + + @ApiModelProperty("结算账户") + private String bankAccount; // 结算账户 + @ApiModelProperty("结算账户") + private String bankAccountKey; // 结算账户 + @ApiModelProperty("结算金额") + private String amount; // 结算金额 + +} diff --git a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillDetailsVo.java b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillDetailsVo.java index b2335ef..38201dc 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillDetailsVo.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillDetailsVo.java @@ -160,13 +160,13 @@ public class SmsSalesBillDetailsVo implements Vo { private String advanceBalance; // 预收款余额 //结算 @ApiModelProperty("结算账户") - private String bankAccount; // 结算账户 - @ApiModelProperty("结算金额") - private String settleAmount; // 结算金额 - + private List accounts; @ApiModelProperty("付款凭证") private List files = new ArrayList<>(); // 付款凭证 - + @ApiModelProperty("结算账户") + private String bankAccount; // 结算账户 + @ApiModelProperty("结算账户") + private String bankAccountKey; // 结算账户 //-------------补充------------- @ApiModelProperty("快递公司sid") private String logisticsNameSid; // 快递公司sid diff --git a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillDto.java b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillDto.java index 67b649c..1bbb4bd 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillDto.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillDto.java @@ -161,10 +161,11 @@ public class SmsSalesBillDto implements Dto { private String advanceBalance; // 预收款余额 //结算 @ApiModelProperty("结算账户") + private List accounts; + @ApiModelProperty("结算账户") private String bankAccount; // 结算账户 - @ApiModelProperty("结算金额") - private String settleAmount; // 结算金额 - + @ApiModelProperty("结算账户") + private String bankAccountKey; // 结算账户 @ApiModelProperty("付款凭证") private List files = new ArrayList<>(); // 付款凭证 diff --git a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java index 24be830..e51b83d 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java @@ -194,23 +194,35 @@ public class SmsSalesBillService extends MybatisBaseService accounts = dto.getAccounts(); + if (!accounts.isEmpty()) { + for (AccountVo accountVo : accounts) { + SmsSalesBillAccount account = new SmsSalesBillAccount(); + BeanUtil.copyProperties(accountVo, account, "id", "sid","remarks"); + account.setBillSid(sid); + smsSalesBillAccountService.insert(account); + } + } else { + if (StringUtils.isNotBlank(dto.getBankAccount())) { + SmsSalesBillAccount account = new SmsSalesBillAccount(); + BeanUtil.copyProperties(dto, account, "id", "sid","remarks"); + account.setBillSid(sid); + smsSalesBillAccountService.insert(account); + } + } SmsSalesBillAmount amount = new SmsSalesBillAmount(); - BeanUtil.copyProperties(dto, amount, "id", "sid"); + BeanUtil.copyProperties(dto, amount, "id", "sid","remarks"); amount.setBillSid(sid); smsSalesBillAmountService.insert(amount); List goodsList = dto.getGoodsList(); @@ -272,9 +284,21 @@ public class SmsSalesBillService extends MybatisBaseService goodsList = new ArrayList<>(); SmsSalesBill entity = fetchBySid(sid); BeanUtil.copyProperties(entity, vo); - SmsSalesBillAccount account = smsSalesBillAccountService.selByBillSid(sid); - if (null != account) { - BeanUtil.copyProperties(account, vo, "id", "sid", "createBySid", "createTime"); + List accounts = smsSalesBillAccountService.selByBillSid(sid); + if (null != accounts && !accounts.isEmpty()) { + if (accounts.size() > 1) { + List accountVos = new ArrayList<>(); + for (SmsSalesBillAccount account : accounts) { + AccountVo accountVo = new AccountVo(); + BeanUtil.copyProperties(account, accountVo, "id", "sid", "createBySid", "createTime"); + accountVos.add(accountVo); + } + vo.setAccounts(accountVos); + } else { + SmsSalesBillAccount account = accounts.get(0); + vo.setBankAccount(account.getBankAccount()); + vo.setBankAccountKey(account.getBankAccountKey()); + } } SmsSalesBillAmount amount = smsSalesBillAmountService.selByBillSid(sid); if (null != amount) { diff --git a/src/main/java/com/yxt/sales/biz/smssalesbillaccount/SmsSalesBillAccountMapper.java b/src/main/java/com/yxt/sales/biz/smssalesbillaccount/SmsSalesBillAccountMapper.java index bb22aaa..6f0840f 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbillaccount/SmsSalesBillAccountMapper.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbillaccount/SmsSalesBillAccountMapper.java @@ -66,5 +66,5 @@ public interface SmsSalesBillAccountMapper extends BaseMapper selByBillSid(String billSid); } diff --git a/src/main/java/com/yxt/sales/biz/smssalesbillaccount/SmsSalesBillAccountService.java b/src/main/java/com/yxt/sales/biz/smssalesbillaccount/SmsSalesBillAccountService.java index c5a1a93..d9e72d1 100644 --- a/src/main/java/com/yxt/sales/biz/smssalesbillaccount/SmsSalesBillAccountService.java +++ b/src/main/java/com/yxt/sales/biz/smssalesbillaccount/SmsSalesBillAccountService.java @@ -37,6 +37,8 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Service; +import java.util.List; + /** * Project: ss-sales(ss-sales)
* File: SmsSalesBillAccountService.java
@@ -63,7 +65,7 @@ public class SmsSalesBillAccountService extends MybatisBaseService selByBillSid(String billSid) { return baseMapper.selByBillSid(billSid); }