open_platform/ss-common-sales
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

销售订单

Browse Source
This commit is contained in:
fanzongzhe
2024-07-24 17:54:01 +08:00
parent 94f6b46e00
commit 0c419caaaa
7 changed files with 72 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/yxt/sales/SalesApplication.java
View File

@@ -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

23
src/main/java/com/yxt/sales/biz/smssalesbill/AccountVo.java Normal file
View File

@@ -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; // 结算金额
}

10
src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillDetailsVo.java
View File

@@ -160,13 +160,13 @@ public class SmsSalesBillDetailsVo implements Vo {
private String advanceBalance; // 预收款余额
//结算
@ApiModelProperty("结算账户")
private String bankAccount; // 结算账户
@ApiModelProperty("结算金额")
private String settleAmount; // 结算金额
private List<AccountVo> accounts;
@ApiModelProperty("付款凭证")
private List<FileQueryUrl> files = new ArrayList<>(); // 付款凭证
@ApiModelProperty("结算账户")
private String bankAccount; // 结算账户
@ApiModelProperty("结算账户")
private String bankAccountKey; // 结算账户
//-------------补充-------------
@ApiModelProperty("快递公司sid")
private String logisticsNameSid; // 快递公司sid

7
src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillDto.java
View File

@@ -161,10 +161,11 @@ public class SmsSalesBillDto implements Dto {
private String advanceBalance; // 预收款余额
//结算
@ApiModelProperty("结算账户")
private List<AccountVo> accounts;
@ApiModelProperty("结算账户")
private String bankAccount; // 结算账户
@ApiModelProperty("结算金额")
private String settleAmount; // 结算金额
@ApiModelProperty("结算账户")
private String bankAccountKey; // 结算账户
@ApiModelProperty("付款凭证")
private List<FileQueryUrl> files = new ArrayList<>(); // 付款凭证

40
src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java
View File

@@ -194,23 +194,35 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
}
if (StringUtils.isNotBlank(sid)) {
SmsSalesBillLogistics logistics = new SmsSalesBillLogistics();
BeanUtil.copyProperties(dto, logistics, "id", "sid");
BeanUtil.copyProperties(dto, logistics, "id", "sid","remarks");
logistics.setBillSid(sid);
smsSalesBillLogisticsService.insert(logistics);
SmsSalesBillshipper billshipper = new SmsSalesBillshipper();
BeanUtil.copyProperties(dto, billshipper, "id", "sid");
BeanUtil.copyProperties(dto, billshipper, "id", "sid","remarks");
billshipper.setBillSid(sid);
smsSalesBillshipperService.insert(billshipper);
SmsSalesBillInvoice invoice = new SmsSalesBillInvoice();
BeanUtil.copyProperties(dto, invoice, "id", "sid");
BeanUtil.copyProperties(dto, invoice, "id", "sid","remarks");
invoice.setBillSid(sid);
smsSalesBillInvoiceService.insert(invoice);
List<AccountVo> accounts = dto.getAccounts();
if (!accounts.isEmpty()) {
for (AccountVo accountVo : accounts) {
SmsSalesBillAccount account = new SmsSalesBillAccount();
BeanUtil.copyProperties(dto, account, "id", "sid");
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<SmsSalesBillDetailDetailsVo> goodsList = dto.getGoodsList();
@@ -272,9 +284,21 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
List<SmsSalesBillDetailDetailsVo> 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<SmsSalesBillAccount> accounts = smsSalesBillAccountService.selByBillSid(sid);
if (null != accounts && !accounts.isEmpty()) {
if (accounts.size() > 1) {
List<AccountVo> 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) {

2
src/main/java/com/yxt/sales/biz/smssalesbillaccount/SmsSalesBillAccountMapper.java
View File

@@ -66,5 +66,5 @@ public interface SmsSalesBillAccountMapper extends BaseMapper<SmsSalesBillAccoun
@Delete("delete from sms_sales_bill_account where billSid =#{billSid}")
void delByBillSid(String billSid);
@Select("select * from sms_sales_bill_account where billSid =#{billSid}")
SmsSalesBillAccount selByBillSid(String billSid);
List<SmsSalesBillAccount> selByBillSid(String billSid);
}

4
src/main/java/com/yxt/sales/biz/smssalesbillaccount/SmsSalesBillAccountService.java
View File

@@ -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) <br/>
* File: SmsSalesBillAccountService.java <br/>
@@ -63,7 +65,7 @@ public class SmsSalesBillAccountService extends MybatisBaseService<SmsSalesBillA
baseMapper.delByBillSid(billSid);
}
public SmsSalesBillAccount selByBillSid(String billSid) {
public List<SmsSalesBillAccount> selByBillSid(String billSid) {
return baseMapper.selByBillSid(billSid);
}