From c2b69c0e5bac21b3ae20b39370713168e30984d5 Mon Sep 17 00:00:00 2001
From: Xue YANG <xuey648@gmail.com>
Date: Wed, 4 Jun 2025 12:08:28 +0200
Subject: [PATCH 1/2] feat: Reconstruct_Sku_price update new add and import

---
 .../controller/admin/SkuPriceController.java  | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuPriceController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuPriceController.java
index c46fae45b..37d68e92d 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuPriceController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuPriceController.java
@@ -39,6 +39,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -130,6 +131,12 @@ public class SkuPriceController extends JeecgController<SkuPrice, ISkuPriceServi
             return Result.error("相同内容的售价记录已存在，仅日期不同，请勿重复添加。");
         }
 
+        if (skuPrice.getPrice() != null) {
+            skuPrice.setPrice(skuPrice.getPrice().setScale(2, RoundingMode.HALF_UP));
+        }
+        if (skuPrice.getDiscountedPrice() != null) {
+            skuPrice.setDiscountedPrice(skuPrice.getDiscountedPrice().setScale(2, RoundingMode.HALF_UP));
+        }
         skuPrice.setCreateBy(sysUser.getUsername());
         skuPrice.setCreateTime(new Date());
         skuPriceService.save(skuPrice);
@@ -281,16 +288,20 @@ public class SkuPriceController extends JeecgController<SkuPrice, ISkuPriceServi
                                     break;
                                 case 1: // Price
                                     BigDecimal price;
-                                    if (cell.getCellType() == CellType.NUMERIC) {
-                                        price = BigDecimal.valueOf(cell.getNumericCellValue());
+                                    if (cell.getCellType() == CellType.BLANK) {
+                                        price = null;
+                                    } else if (cell.getCellType() == CellType.NUMERIC) {
+                                        price = BigDecimal.valueOf(cell.getNumericCellValue()).setScale(2, RoundingMode.UP);
                                     } else {
-                                        price = new BigDecimal(cell.getStringCellValue().trim());
+                                        price = new BigDecimal(cell.getStringCellValue().trim()).setScale(2, RoundingMode.UP);
                                     }
                                     skuPrice.setPrice(price);
                                     break;
                                 case 2: // Threshold
-                                    int threshold;
-                                    if (cell.getCellType() == CellType.NUMERIC) {
+                                    Integer threshold;
+                                    if (cell.getCellType() == CellType.BLANK) {
+                                        threshold = null;
+                                    } else if (cell.getCellType() == CellType.NUMERIC) {
                                         threshold = (int) cell.getNumericCellValue();
                                     } else {
                                         threshold = Integer.parseInt(cell.getStringCellValue().trim());
@@ -299,10 +310,12 @@ public class SkuPriceController extends JeecgController<SkuPrice, ISkuPriceServi
                                     break;
                                 case 3: // Discounted Price
                                     BigDecimal discountedPrice;
-                                    if (cell.getCellType() == CellType.NUMERIC) {
-                                        discountedPrice = BigDecimal.valueOf(cell.getNumericCellValue());
+                                    if (cell.getCellType() == CellType.BLANK) {
+                                        discountedPrice = null;
+                                    } else if (cell.getCellType() == CellType.NUMERIC) {
+                                        discountedPrice = BigDecimal.valueOf(cell.getNumericCellValue()).setScale(2, RoundingMode.UP);
                                     } else {
-                                        discountedPrice = new BigDecimal(cell.getStringCellValue().trim());
+                                        discountedPrice = new BigDecimal(cell.getStringCellValue().trim()).setScale(2, RoundingMode.UP);
                                     }
                                     skuPrice.setDiscountedPrice(discountedPrice);
                                     break;

From 916f5a1c26adbe9076172f7d981a88bdb3865a37 Mon Sep 17 00:00:00 2001
From: Xue YANG <xuey648@gmail.com>
Date: Wed, 4 Jun 2025 14:57:09 +0200
Subject: [PATCH 2/2] feat: Reconstruct_Sku_price modify skuPriceResultMap

---
 .../modules/business/mapper/xml/PlatformOrderContentMapper.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml
index 21b461cbb..571af8353 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml
@@ -136,8 +136,7 @@
         <result property="threshold" column="threshold"/>
         <result property="discountedPrice" column="discounted_price"/>
         <result property="date" column="price_date"/>
-        <result property="priceRmb" column="price_rmb"/>
-        <result property="discountedPriceRmb" column="discounted_price_rmb"/>
+        <result property="currencyId" column="currency_id"/>
     </resultMap>
 
     <resultMap id="promotionResultMap" type="org.jeecg.modules.business.entity.Promotion">