From 77d9a9ef25e204171b865d15a8daa6be111c6e9f Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 17 May 2024 10:11:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProductService.java               | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
index 744c032..2162aad 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -275,16 +275,23 @@ public class ProductService {
 
         //价格组装
         for (TbProductSku tbProductSku : productSku.get()) {
-            //原价
+            //售价
             if (tbProductSku.getSalePrice().compareTo(BigDecimal.ZERO) == 0) {
-                productInfo.setOriginPrice(BigDecimal.ZERO);
-                productInfo.setDiscount(BigDecimal.ZERO);
+                if(tbProductSku.getOriginPrice().compareTo(BigDecimal.ZERO) == 0){
+                    productInfo.setOriginPrice(BigDecimal.ZERO);
+                    productInfo.setDiscount(BigDecimal.ZERO);
+                    productInfo.setSalePrice(BigDecimal.ZERO);
+                }else {
+                    productInfo.setOriginPrice(tbProductSku.getOriginPrice());
+                    productInfo.setDiscount(BigDecimal.ZERO);
+                    productInfo.setSalePrice(tbProductSku.getOriginPrice());
+                }
             } else {
-                productInfo.setOriginPrice(tbProductSku.getSalePrice());
+                productInfo.setOriginPrice(tbProductSku.getOriginPrice());
                 productInfo.setDiscount(BigDecimalUtils.getDiscount(tbProductSku.getOriginPrice(), tbProductSku.getSalePrice()));
+                //现价
+                productInfo.setSalePrice(tbProductSku.getSalePrice());
             }
-            //现价
-            productInfo.setSalePrice(new BigDecimal(tbProductSku.getSalePrice().toString()));
         }
         //销量
         productInfo.setRealSalesNumber(new BigDecimal(tbProduct.getRealSalesNumber()));