From 0d17e59721df8386120156f045b1900a7e435097 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 21 九月 2023 11:02:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java | 37 ++-----------------------------------
1 files changed, 2 insertions(+), 35 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 aceab32..118f433 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
@@ -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);
@@ -511,40 +512,6 @@
}
}
-// dealCateParam(cateId,goodsId,data.getAttr1(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr2(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr3(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr4(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr5(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr6(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr7(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr8(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr9(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr10(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr11(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr12(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr13(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr14(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr15(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr16(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr17(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr18(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr19(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr20(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr21(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr22(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr23(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr24(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr25(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr26(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr27(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr28(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr29(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr30(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr31(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr32(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr33(),cateList);
-// dealCateParam(cateId,goodsId,data.getAttr34(),cateList);
}
private void dealCateParam(Integer cateId, Integer goodsId, String attr,List<BaseCateParam> list,List<BaseGoodsParam> paramList) {
--
Gitblit v1.9.3