root
/
school
1
0
Fork 0
Code Issues 8 Pull Requests Projects Releases Wiki Activity
Browse Source

退货新增商品BUG优化啊啊

dev
wangfukang 1 year ago
parent
3e51066931
commit
f493bc850c
2 changed files with 11 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      hiver-admin/test-output/test-report.html
  2. 4
      hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SaleController.java

18
hiver-admin/test-output/test-report.html
View File

@ -5,7 +5,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>Hiver测试报告</title> <title>Hiver���Ա���</title>
<link rel="apple-touch-icon" href="spark/logo.png"> <link rel="apple-touch-icon" href="spark/logo.png">
<link rel="shortcut icon" href="spark/logo.png"> <link rel="shortcut icon" href="spark/logo.png">
<link rel="stylesheet" href="spark/spark-style.css"> <link rel="stylesheet" href="spark/spark-style.css">
@ -35,7 +35,7 @@
<a href="#"><span class="badge badge-primary">Hiver</span></a> <a href="#"><span class="badge badge-primary">Hiver</span></a>
</li> </li>
<li class="m-r-10"> <li class="m-r-10">
<a href="#"><span class="badge badge-primary">十一月 10, 2024 16:27:17</span></a> <a href="#"><span class="badge badge-primary">ʮһ�� 10, 2024 22:06:39</span></a>
</li> </li>
</ul> </ul>
</div> </div>
@ -84,7 +84,7 @@
<div class="test-detail"> <div class="test-detail">
<span class="meta text-white badge badge-sm"></span> <span class="meta text-white badge badge-sm"></span>
<p class="name">passTest</p> <p class="name">passTest</p>
<p class="text-sm"><span>16:27:17 下午</span> / <span>0.017 secs</span></p> <p class="text-sm"><span>22:06:39 ����</span> / <span>0.016 secs</span></p>
</div> </div>
<div class="test-contents d-none"> <div class="test-contents d-none">
<div class="detail-head"> <div class="detail-head">
@ -92,9 +92,9 @@
<div class="info"> <div class="info">
<div class='float-right'><span class='badge badge-default'>#test-id=1</span></div> <div class='float-right'><span class='badge badge-default'>#test-id=1</span></div>
<h5 class="test-status text-pass">passTest</h5> <h5 class="test-status text-pass">passTest</h5>
<span class='badge badge-success'>11.10.2024 16:27:17</span> <span class='badge badge-success'>11.10.2024 22:06:39</span>
<span class='badge badge-danger'>11.10.2024 16:27:17</span> <span class='badge badge-danger'>11.10.2024 22:06:39</span>
<span class='badge badge-default'>0.017 secs</span> <span class='badge badge-default'>0.016 secs</span>
</div> </div>
<div class="m-t-10 m-l-5"></div> <div class="m-t-10 m-l-5"></div>
</div> </div>
@ -104,7 +104,7 @@
<tbody> <tbody>
<tr class="event-row"> <tr class="event-row">
<td><span class="badge log pass-bg">Pass</span></td> <td><span class="badge log pass-bg">Pass</span></td>
<td>16:27:17</td> <td>22:06:39</td>
<td> <td>
Test passed Test passed
</td> </td>
@ -128,13 +128,13 @@
<div class="col-md-3"> <div class="col-md-3">
<div class="card"><div class="card-body"> <div class="card"><div class="card-body">
<p class="m-b-0">Started</p> <p class="m-b-0">Started</p>
<h3>十一月 10, 2024 16:27:17</h3> <h3>ʮһ�� 10, 2024 22:06:39</h3>
</div></div> </div></div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<div class="card"><div class="card-body"> <div class="card"><div class="card-body">
<p class="m-b-0">Ended</p> <p class="m-b-0">Ended</p>
<h3>十一月 10, 2024 16:27:17</h3> <h3>ʮһ�� 10, 2024 22:06:39</h3>
</div></div> </div></div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">

4
hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SaleController.java
View File

@ -189,10 +189,10 @@ public class SaleController {
// 20240616 开单可能值包含退货单 // 20240616 开单可能值包含退货单
Sale sale = saleQueryDTO.getSale(); Sale sale = saleQueryDTO.getSale();
sale.setLastDebtAmount(amountOwed); sale.setLastDebtAmount(amountOwed);
// 处理销售商品信息
if (saleQueryDTO.getSaleDetailList() != null && !saleQueryDTO.getSaleDetailList().isEmpty()) {
// 1. 处理商品信息，新商品进行新商品的新增，分类及规格的新增，分类库的新增，子图的新增 // 1. 处理商品信息，新商品进行新商品的新增，分类及规格的新增，分类库的新增，子图的新增
saleQueryDTO = productService.handleProduct(saleQueryDTO); saleQueryDTO = productService.handleProduct(saleQueryDTO);
// 处理销售商品信息
if (saleQueryDTO.getSaleDetailList() != null && !saleQueryDTO.getSaleDetailList().isEmpty()) {
// 2.处理订单表模块 // 2.处理订单表模块
sale = salesAndDetailsService.handleSalesDetails(saleQueryDTO); sale = salesAndDetailsService.handleSalesDetails(saleQueryDTO);
// 更新sale // 更新sale

Write Preview
Loading…
Cancel
Save