| Pass |
- 16:50:16 |
+ 18:32:59 |
Test passed
|
@@ -128,13 +128,13 @@
Started
-
八月 04, 2024 16:50:15
+
八月 04, 2024 18:32:59
Ended
-
八月 04, 2024 16:50:16
+
八月 04, 2024 18:32:59
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/bill/service/impl/BillServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/bill/service/impl/BillServiceImpl.java
index 764dc485..3109f309 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/bill/service/impl/BillServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/bill/service/impl/BillServiceImpl.java
@@ -81,7 +81,7 @@ public class BillServiceImpl implements BillService {
if (saleArrearsVo != null) {
customerBillDataVo.setArrears(saleArrearsVo.getArrears());
customerBillDataVo.setTotalSale(saleArrearsVo.getTotalSale());
- }else{
+ } else {
customerBillDataVo.setArrears(BigDecimal.ZERO);
customerBillDataVo.setTotalSale(BigDecimal.ZERO);
}
@@ -90,7 +90,7 @@ public class BillServiceImpl implements BillService {
final ArrearsVo returnSaleArrearsVo = returnSaleService.getTotalReturn(customerBillQueryVo);
if (returnSaleArrearsVo != null) {
customerBillDataVo.setTotalReturn(returnSaleArrearsVo.getTotalReturn());
- }else{
+ } else {
customerBillDataVo.setTotalReturn(BigDecimal.ZERO);
}
// 鏍规嵁瀹㈡埛id鍙婃棩鏈熻寖鍥村璐﹀崟鏄庣粏
@@ -99,13 +99,13 @@ public class BillServiceImpl implements BillService {
// 鑾峰彇saleId,鍘绘煡璇㈤攢鍞崟鐨勫晢鍝佹槑缁嗭紝鍙婇璐у崟鐨勫晢鍝佹槑缁
final List saleIdList = new ArrayList<>();
- if(records.isEmpty()){
+ if (records.isEmpty()) {
//鏈紑鍗曪紝鏌ヨ瀹㈡埛娆犳锛屼綔涓哄垵鏈熸瑺娆惧拰鏈熸湯娆犳
- final Debt debt = debtService.selectByUserId(customerBillQueryVo.getShopId(),customerBillQueryVo.getCustomerId());
+ final Debt debt = debtService.selectByUserId(customerBillQueryVo.getShopId(), customerBillQueryVo.getCustomerId());
// 瑕佹煡鏂板鎴风殑鍒涘缓鏃堕棿锛屾牴鎹敤鎴风殑鍒涘缓鏃堕棿鏉ュ垽鏂紱
// 濡傛灉鏌ヨ鏃堕棿灏忎簬鍒涘缓鏃堕棿锛岄偅涔堝垵鏈熸瑺娆惧拰鏈熸湯娆犳搴旇涓0
// 濡傛灉鏌ヨ鐨勬椂闂村ぇ浜庡垱寤烘椂闂达紝閭ｄ箞鍒濇湡娆犳鍜屾湡鏈瑺娆惧簲璇ヤ负瀹㈡埛娆犳
- if(debt != null){
+ if (debt != null) {
final Date createTime = debt.getCreateTime();
final String endDate = customerBillQueryVo.getEndDate();
final Date enddate;
@@ -115,18 +115,18 @@ public class BillServiceImpl implements BillService {
throw new RuntimeException(e);
}
// 浠ヤ负鐜板湪鍒涘缓瀹㈡埛灏卞垱寤轰簡娆犳淇℃伅锛岄偅涔堝氨鎸夌収娆犳淇℃伅鐨勫垱寤烘椂闂翠綔涓烘爣璇
- if(createTime.after(enddate)){
+ if (createTime.after(enddate)) {
customerBillDataVo.setInitialArrears(BigDecimal.ZERO);
customerBillDataVo.setEndArrears(BigDecimal.ZERO);
- }else{
+ } else {
customerBillDataVo.setInitialArrears(debt.getAmountOwed());
customerBillDataVo.setEndArrears(debt.getAmountOwed());
}
}
- }else{
+ } else {
for (int i = 0; i < records.size(); i++) {
- if(StringUtils.isNotEmpty(records.get(i).getSaleId())){
+ if (StringUtils.isNotEmpty(records.get(i).getSaleId())) {
saleIdList.add(records.get(i).getSaleId());
}
// 鏍规嵁鏃堕棿鍗囧簭鏌ヨ鐨勶紝杩欓噷鑾峰彇绗竴涓殑鍒濇湡娆犳褰撳仛鏈鏌ヨ鐨勫垵鏈熸瑺娆
@@ -134,11 +134,10 @@ public class BillServiceImpl implements BillService {
final BigDecimal lastDebtAmount = records.get(0).getLastDebtAmount();
customerBillDataVo.setInitialArrears(lastDebtAmount);
}
- // 鑾峰彇鏈鍚庝竴涓殑鍓╀綑娆犳褰撳仛鏈鏌ヨ鐨勫墿浣欐瑺娆
- if (i == records.size() - 1) {
- customerBillDataVo.setEndArrears(records.get(i).getBalanceDue());
- }
}
+ // 鍥犱负璁板綍鍒嗛〉浜嗭紝鎵浠ヨ繖閲屼笉鑳借幏鍙栨渶鍚庝竴鏉℃暟鎹綔涓鸿幏鏈熸湯娆犳锛屽簲璇ュ崟鐙煡璇竴涓
+ final BigDecimal arrearsByUserId = dealingsRecordService.getArrearsByUserId(customerBillQueryVo);
+ customerBillDataVo.setEndArrears(arrearsByUserId);
}
if (!saleIdList.isEmpty()) {
@@ -272,10 +271,11 @@ public class BillServiceImpl implements BillService {
/**
* 鑾峰彇渚涘簲鍟嗗璐﹀崟
- * @author 鐜嬪瘜搴
- * @date 2024/7/23
+ *
* @param supplierBillQueryVo
* @return SupplierBillDataVo
+ * @author 鐜嬪瘜搴
+ * @date 2024/7/23
*/
@Override
public SupplierBillDataVo getPurchaseBill(SupplierBillQueryVo supplierBillQueryVo) {
@@ -295,8 +295,10 @@ public class BillServiceImpl implements BillService {
// 鑾峰彇鏈湡鍏ㄩ儴鎷胯揣鎬婚噾棰
final ArrearsVo saleArrearsVo = purchaseService.getArrearsAndTotalSale(supplierBillQueryVo);
if (saleArrearsVo != null) {
+ supplierBillDataVo.setArrears(saleArrearsVo.getArrears());
supplierBillDataVo.setTotalSale(saleArrearsVo.getTotalSale());
- }else{
+ } else {
+ supplierBillDataVo.setArrears(BigDecimal.ZERO);
supplierBillDataVo.setTotalSale(BigDecimal.ZERO);
}
@@ -306,13 +308,13 @@ public class BillServiceImpl implements BillService {
// 鑾峰彇saleId,鍘绘煡璇㈤攢鍞崟鐨勫晢鍝佹槑缁嗭紝鍙婇璐у崟鐨勫晢鍝佹槑缁
final List purchaseIdList = new ArrayList<>();
- if(records.isEmpty()){
+ if (records.isEmpty()) {
//鏈紑鍗曪紝鏌ヨ瀹㈡埛娆犳锛屼綔涓哄垵鏈熸瑺娆惧拰鏈熸湯娆犳
- final Debt debt = debtService.selectByUserId(supplierBillQueryVo.getShopId(),supplierBillQueryVo.getSupplierId());
+ final Debt debt = debtService.selectByUserId(supplierBillQueryVo.getShopId(), supplierBillQueryVo.getSupplierId());
// 瑕佹煡鏂板鎴风殑鍒涘缓鏃堕棿锛屾牴鎹敤鎴风殑鍒涘缓鏃堕棿鏉ュ垽鏂紱
// 濡傛灉鏌ヨ鏃堕棿灏忎簬鍒涘缓鏃堕棿锛岄偅涔堝垵鏈熸瑺娆惧拰鏈熸湯娆犳搴旇涓0
// 濡傛灉鏌ヨ鐨勬椂闂村ぇ浜庡垱寤烘椂闂达紝閭ｄ箞鍒濇湡娆犳鍜屾湡鏈瑺娆惧簲璇ヤ负瀹㈡埛娆犳
- if(debt != null){
+ if (debt != null) {
final Date createTime = debt.getCreateTime();
final String endDate = supplierBillQueryVo.getEndDate();
Date enddate = new Date();
@@ -324,18 +326,18 @@ public class BillServiceImpl implements BillService {
throw new RuntimeException(e);
}
// 浠ヤ负鐜板湪鍒涘缓瀹㈡埛灏卞垱寤轰簡娆犳淇℃伅锛岄偅涔堝氨鎸夌収娆犳淇℃伅鐨勫垱寤烘椂闂翠綔涓烘爣璇
- if(createTime.after(enddate)){
+ if (createTime.after(enddate)) {
supplierBillDataVo.setInitialArrears(BigDecimal.ZERO);
supplierBillDataVo.setEndArrears(BigDecimal.ZERO);
- }else{
+ } else {
supplierBillDataVo.setInitialArrears(debt.getAmountOwed());
supplierBillDataVo.setEndArrears(debt.getAmountOwed());
}
}
- }else{
+ } else {
for (int i = 0; i < records.size(); i++) {
- if(StringUtils.isNotEmpty(records.get(i).getPurchaseId())){
+ if (StringUtils.isNotEmpty(records.get(i).getPurchaseId())) {
purchaseIdList.add(records.get(i).getPurchaseId());
}
// 鏍规嵁鏃堕棿鍗囧簭鏌ヨ鐨勶紝杩欓噷鑾峰彇绗竴涓殑鍒濇湡娆犳褰撳仛鏈鏌ヨ鐨勫垵鏈熸瑺娆
@@ -343,11 +345,11 @@ public class BillServiceImpl implements BillService {
final BigDecimal lastDebtAmount = records.get(0).getLastDebtAmount();
supplierBillDataVo.setInitialArrears(lastDebtAmount);
}
- // 鑾峰彇鏈鍚庝竴涓殑鍓╀綑娆犳褰撳仛鏈鏌ヨ鐨勫墿浣欐瑺娆
- if (i == records.size() - 1) {
- supplierBillDataVo.setEndArrears(records.get(i).getBalanceDue());
- }
}
+ // 鍥犱负璁板綍鍒嗛〉浜嗭紝鎵浠ヨ繖閲屼笉鑳借幏鍙栨渶鍚庝竴鏉℃暟鎹綔涓鸿幏鏈熸湯娆犳锛屽簲璇ュ崟鐙煡璇竴涓
+ final BigDecimal arrearsBySupplierId = dealingsRecordService.getArrearsBySupplierId(supplierBillQueryVo);
+ supplierBillDataVo.setEndArrears(arrearsBySupplierId);
+
}
if (!purchaseIdList.isEmpty()) {
@@ -368,7 +370,7 @@ public class BillServiceImpl implements BillService {
}
// 鑾峰彇鍏ュ簱鍗曡鏍兼槑缁
final List stockLogList = stockLogService.getPurchaseDetails(purchaseIdList);
- final Map> stockLogMap = new HashMap<>();
+ final Map> stockLogMap = new HashMap<>();
for (StockLog stockLog : stockLogList) {
final String detailId = stockLog.getDetailId();
if (stockLogMap.containsKey(detailId)) {
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/DealingsRecordMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/DealingsRecordMapper.java
index 749e22e5..a68b55c0 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/DealingsRecordMapper.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/DealingsRecordMapper.java
@@ -69,4 +69,8 @@ public interface DealingsRecordMapper extends BaseMapper {
* @date 2024/8/2
*/
void deleteDealingsRecord(@Param("id") String id);
+
+ BigDecimal getArrearsByUserId(@Param("customerBillQueryVo") CustomerBillQueryVo customerBillQueryVo);
+
+ BigDecimal getArrearsBySupplierId(@Param("supplierBillQueryVo") SupplierBillQueryVo supplierBillQueryVo);
}
\ No newline at end of file
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/DealingsRecordService.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/DealingsRecordService.java
index 4daba7b2..200a9141 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/DealingsRecordService.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/DealingsRecordService.java
@@ -63,4 +63,24 @@ public interface DealingsRecordService extends IService {
* @date 2024/8/2
*/
void deleteDealingsRecord(String id);
+
+ /**
+ * 鑾峰彇瀹㈡埛鏈熸湯娆犳
+ *
+ * @param customerBillQueryVo
+ * @return Page
+ * @author 鐜嬪瘜搴
+ * @date 2024/7/6
+ */
+ BigDecimal getArrearsByUserId(CustomerBillQueryVo customerBillQueryVo);
+
+ /**
+ * 鑾峰彇渚涘簲鍟嗘湡鏈瑺娆
+ *
+ * @param supplierBillQueryVo
+ * @return Page
+ * @author 鐜嬪瘜搴
+ * @date 2024/7/6
+ */
+ BigDecimal getArrearsBySupplierId(SupplierBillQueryVo supplierBillQueryVo);
}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/DealingsRecordServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/DealingsRecordServiceImpl.java
index 3075c98d..96987be1 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/DealingsRecordServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/DealingsRecordServiceImpl.java
@@ -85,4 +85,14 @@ public class DealingsRecordServiceImpl extends ServiceImpl
+
+
+
+
\ No newline at end of file
diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/PurchaseMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/PurchaseMapper.xml
index e923e16d..aa904b50 100644
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/PurchaseMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/PurchaseMapper.xml
@@ -550,6 +550,7 @@