diff --git a/hiver-admin/test-output/test-report.html b/hiver-admin/test-output/test-report.html index 5a474ac9..1531e2da 100644 --- a/hiver-admin/test-output/test-report.html +++ b/hiver-admin/test-output/test-report.html @@ -5,7 +5,7 @@ -Hiver测试报告 +Hiver锟斤拷锟皆憋拷锟斤拷 @@ -35,7 +35,7 @@ Hiver
  • -十一月 10, 2024 16:27:17 +十一锟斤拷 10, 2024 22:06:39
    • @@ -84,7 +84,7 @@

    passTest

    -

    16:27:17 下午 / 0.017 secs

    +

    22:06:39 锟斤拷锟斤拷 / 0.016 secs

    @@ -92,9 +92,9 @@
    #test-id=1
    passTest
    -11.10.2024 16:27:17 -11.10.2024 16:27:17 -0.017 secs +11.10.2024 22:06:39 +11.10.2024 22:06:39 +0.016 secs
    @@ -104,7 +104,7 @@ Pass - 16:27:17 + 22:06:39 Test passed @@ -128,13 +128,13 @@

    Started

    -

    十一月 10, 2024 16:27:17

    +

    十一锟斤拷 10, 2024 22:06:39

    Ended

    -

    十一月 10, 2024 16:27:17

    +

    十一锟斤拷 10, 2024 22:06:39

    diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SaleController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SaleController.java index 553e6e68..07ccfe4b 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SaleController.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SaleController.java @@ -189,10 +189,10 @@ public class SaleController { // 20240616 寮鍗曞彲鑳藉煎寘鍚璐у崟 Sale sale = saleQueryDTO.getSale(); sale.setLastDebtAmount(amountOwed); + // 1. 澶勭悊鍟嗗搧淇℃伅锛屾柊鍟嗗搧杩涜鏂板晢鍝佺殑鏂板锛屽垎绫诲強瑙勬牸鐨勬柊澧烇紝鍒嗙被搴撶殑鏂板锛屽瓙鍥剧殑鏂板 + saleQueryDTO = productService.handleProduct(saleQueryDTO); // 澶勭悊閿鍞晢鍝佷俊鎭 if (saleQueryDTO.getSaleDetailList() != null && !saleQueryDTO.getSaleDetailList().isEmpty()) { - // 1. 澶勭悊鍟嗗搧淇℃伅锛屾柊鍟嗗搧杩涜鏂板晢鍝佺殑鏂板锛屽垎绫诲強瑙勬牸鐨勬柊澧烇紝鍒嗙被搴撶殑鏂板锛屽瓙鍥剧殑鏂板 - saleQueryDTO = productService.handleProduct(saleQueryDTO); // 2.澶勭悊璁㈠崟琛ㄦā鍧 sale = salesAndDetailsService.handleSalesDetails(saleQueryDTO); // 鏇存柊sale