From dcdb0231034810232f2542f3865666ebf72daf11 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 30 四月 2025 16:45:34 +0800
Subject: [PATCH] sf

---
 server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
index 03c580a..7a8c622 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
@@ -300,7 +300,7 @@
             for(BaseData data :result.getRecords()){
                 //澶氬浘锛岃嫳鏂囬�楀彿闅斿紑
                 if(StringUtils.isNotBlank(data.getBgImg())){
-                    String tImg =  data.getBgImg().replace("锛�", ",").replace(".avif", "").replace("/n1/jfs/", "/n0/jfs/");
+                    String tImg =  data.getBgImg().replace("锛�", ",").replace(".avif", "").replace("/n1/jfs/", "/imgzone/jfs/");
                     String[] imgs =tImg.split(",");
                     data.setBgImgs(imgs);
 
@@ -384,7 +384,8 @@
                 }
 //                goods.setImgurl(getOssImgurl(ossModel,ossModel.getGoodsFolder(), data.getImgurl()));
                 goods.setImgurl(getOssImgurlFile(ossModel.getGoodsFolder(), data.getImgurl(), data.getId(),Constants.ZERO,fileRecords));
-                goods.setPrice(Constants.formatBigdecimal(data.getSaleprice()).multiply(Constants.formatBigdecimal(cModel.getPriceRate())));
+//                goods.setPrice(Constants.formatBigdecimal(data.getSaleprice()).multiply(Constants.formatBigdecimal(cModel.getPriceRate())));
+                goods.setPrice(Constants.formatBigdecimal(data.getSaleprice()));
                 if(model!=null){
                     //濡傛灉宸茬粡瀛樺湪锛屾洿鏂板晢鍝佹暟鎹�
                     goods.setEditDate(date);
@@ -461,7 +462,7 @@
 
     private int addImg(int i,OssModel ossModel, Integer id,String bgImg,List<Multifile> fileList,List<FileRecord> fileRecords) {
         if(StringUtils.isNotBlank(bgImg)){
-            bgImg = bgImg.replace("/n1/jfs/", "/n0/jfs/");
+            bgImg = bgImg.replace("/n1/jfs/", "/imgzone/jfs/");
 //            String img =getOssImgurl(ossModel, ossModel.getGoodsFolder() ,bgImg);
             String img = getOssImgurlFile(ossModel.getGoodsFolder(), bgImg, null,Constants.TWO,fileRecords);
             if(StringUtils.isNotBlank(img)){
@@ -524,7 +525,10 @@
             return;
         }
         String attrName = attr.substring(0,index);
-        if(StringUtils.isBlank(attrName) || StringUtils.equals(attrName, "鍟嗗搧鍚嶇О") || StringUtils.equals(attrName, "鍟嗗搧缂栧彿")){
+        if(StringUtils.isBlank(attrName)
+                || StringUtils.equals(attrName, "鍟嗗搧鍚嶇О")
+                || StringUtils.equals(attrName, "鍟嗗搧缂栧彿")
+                || StringUtils.equals(attrName, "搴楅摵")){
             return;
         }
         String val = attr.substring(index+1);

--
Gitblit v1.9.3