weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bms2相关修改；

Browse Source
This commit is contained in:
王奎兴
2026-03-18 21:11:49 +08:00
parent f7ad001154
commit caf5adfc3e
11 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_bms/src/main/java/com/mhd/bms/application/server/paymentWallet/PaymentWalletApplicationService.java
+7 -7
View File
@@ -62,15 +62,15 @@ public class PaymentWalletApplicationService {
throw new DigitalLogisticsException(UserError.TIMEOUT);
}
//根据支付方式编码查询支付方式
if(!StringUtils.isNotEmpty(paymentWalletDO.getPaymentMethodCode())){
/*if(!StringUtils.isNotEmpty(paymentWalletDO.getPaymentMethodCode())){
throw new ServiceException("支付方式编码不能为空");
}
PaymentManage paymentManage = paymentManageDomainService.selectByPaymentCode(paymentWalletDO.getPaymentMethodCode());
}*/
/*PaymentManage paymentManage = paymentManageDomainService.selectByPaymentCode(paymentWalletDO.getPaymentMethodCode());
if(null == paymentManage){
throw new ServiceException("支付方式信息未找到");
}
paymentWalletDO.setPaymentMethod(paymentManage.getPaymentMethod());
paymentWalletDO.setPaymentManageId(paymentManage.getPaymentManageId());
}*/
//paymentWalletDO.setPaymentMethod(paymentManage.getPaymentMethod());
//paymentWalletDO.setPaymentManageId(paymentManage.getPaymentManageId());
paymentWalletDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
paymentWalletDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
paymentWalletDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
@@ -133,4 +133,4 @@ public class PaymentWalletApplicationService {
}
return paymentWalletDomainService.getInfo(paymentWalletDTO.getPaymentWalletId());
}
}
}
mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java
+16 -2
View File
@@ -468,6 +468,12 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
.map(BmsMakeOutInvoiceItem::getInvoiceValue)
.filter(java.util.Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
// 将 feeType 用、拼接起来
String feeTypes = bmsMakeOutInvoiceItems.stream()
.map(BmsMakeOutInvoiceItem::getFeeType)
.filter(java.util.Objects::nonNull)
.collect(java.util.stream.Collectors.joining("、"));
String salesmanId = reconciliation.getSalesmanId();
String customerUserDept = billManageMapper.getCustomerUserDept(salesmanId);
String deptValue = billManageMapper.getDeptValue(customerUserDept);
@@ -499,9 +505,17 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
item.setObjtype("0");
item.setDirection("1");
if (deptName != null && !deptName.isEmpty()) {
item.setScomment(deptName+"："+appointShipper+"物流费");
if (feeTypes != null && !feeTypes.isEmpty()) {
item.setScomment(deptName+"："+appointShipper+feeTypes);
} else {
item.setScomment(deptName+"："+appointShipper+feeTypes);
}
} else {
item.setScomment("业务部："+appointShipper+"物流费");
if (feeTypes != null && !feeTypes.isEmpty()) {
item.setScomment("业务部："+appointShipper+feeTypes);
} else {
item.setScomment("业务部："+appointShipper+feeTypes);
}
}
item.setPk_currtype(settlementCurrencyNcCode);
item.setMoney_cr(String.valueOf(totalInvoiceValue));
mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/entity/BusinessDocument.java
+1 -1
View File
@@ -177,7 +177,7 @@ public class BusinessDocument extends BaseVOEntity{
@ApiModelProperty("业务员名称")
private String salesmanName;
@ApiModelProperty("税率")
private String taxRate;
private Double taxRate;
@ApiModelProperty("收款帐户")
private String paymentAccountId;
@ApiModelProperty("收款帐户名称")
mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/po/BusinessDocumentPO.java
+1 -1
View File
@@ -182,7 +182,7 @@ public class BusinessDocumentPO extends BaseVOEntity{
@ApiModelProperty("业务员名称")
private String salesmanName;
@ApiModelProperty("税率")
private String taxRate;
private Double taxRate;
@ApiModelProperty("收款帐户")
private String paymentAccountId;
@ApiModelProperty("收款帐户名称")
mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/todo/BusinessDocumentDO.java
+1 -1
View File
@@ -202,7 +202,7 @@ public class BusinessDocumentDO extends BaseVOEntity{
@ApiModelProperty("业务员名称")
private String salesmanName;
@ApiModelProperty("税率")
private String taxRate;
private Double taxRate;
@ApiModelProperty("收款帐户")
private String paymentAccountId;
@ApiModelProperty("收款帐户名称")
mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/businessDocument/BusinessDocumentDTO.java
+1 -1
View File
@@ -208,7 +208,7 @@ public class BusinessDocumentDTO extends BaseVOEntity{
@ApiModelProperty("业务员名称")
private String salesmanName;
@ApiModelProperty("税率")
private String taxRate;
private Double taxRate;
@ApiModelProperty("收款帐户")
private String paymentAccountId;
@ApiModelProperty("收款帐户名称")
mhd_bms/src/main/resources/mapper/BillManageMapper.xml
+1 -1
View File
@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND a.reconciliation_status = #{billManageDO.reconciliationStatus}
</if>
<if test="billManageDO.applyNumber != null and billManageDO.applyNumber != ''">
AND a.apply_number = #{billManageDO.applyNumber}
AND a.apply_number like concat('%', #{billManageDO.applyNumber}, '%')
</if>
<if test="billManageDO.settlementCurrency != null and billManageDO.settlementCurrency != ''">
AND a.settlement_currency = #{billManageDO.settlementCurrency}
mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml
+1 -1
View File
@@ -35,7 +35,7 @@
</select>
<sql id="common_where">
<if test="bmsInvoiceListQueryDTO.id !=null and bmsInvoiceListQueryDTO.id != ''"> and a.id = #{bmsInvoiceListQueryDTO.id} </if>
<if test="bmsInvoiceListQueryDTO.billNumber !=null and bmsInvoiceListQueryDTO.billNumber != ''"> and b.bill_number = #{bmsInvoiceListQueryDTO.billNumber} </if>
<if test="bmsInvoiceListQueryDTO.billNumber !=null and bmsInvoiceListQueryDTO.billNumber != ''"> and b.bill_number like concat('%', #{bmsInvoiceListQueryDTO.billNumber}, '%') </if>
<if test="bmsInvoiceListQueryDTO.id!=null and bmsInvoiceListQueryDTO.id!=''"> and instr(a.id ,#{bmsInvoiceListQueryDTO.id}) > 0 </if>
<if test="bmsInvoiceListQueryDTO.invoiceState!=null"> and instr(a.invoice_state ,#{bmsInvoiceListQueryDTO.invoiceState}) > 0 </if>
<if test="bmsInvoiceListQueryDTO.createStartTime!=null and bmsInvoiceListQueryDTO.createEndTime!=null ">