所有商品导入后台增加税前价格

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsServiceImpl.java

@@ -767,7 +767,7 @@ public class GoodsServiceImpl implements GoodsService {
                 builder.put("isHotStr", "热销");
                 builder.put("prodBarcode", "产品条码");
 //                builder.put("marketPrice", "市场价");
-//                builder.put("retailPrice", "零售价");
+                builder.put("retailPrice", "零售价");
                 builder.put("supplierName", "供应商");
                 builder.put("goodsNumber", "商品总库存");
                 R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
@@ -901,6 +901,7 @@ public class GoodsServiceImpl implements GoodsService {
                 }else {
                     goodsEntity.setFreightId(freightEntity.getId());
                 }*/
+                BigDecimal retailPrice = BigDecimal.ZERO;
                 if (!Dict.orderBizType.item_11.getItem().equals(goodsDto.getGoodsBizType())) {
                     SysCusUnitCodeEntity sysCusUnitCodeEntity = sysCusUnitCodeDao.queryObjectByName(goodsDto.getUnitName());
                     if (sysCusUnitCodeEntity == null) {
@@ -917,8 +918,18 @@ public class GoodsServiceImpl implements GoodsService {
                     } else {
                         goodsEntity.setOriCntCode(sysCusNationCodeEntity.getCode());
                     }
-                    goodsEntity.setGoodsRate(BigDecimal.valueOf(Double.valueOf(goodsDto.getGoodsRate())));
+
+                    if(goodsDto.getGoodsRate().indexOf("%") != -1){
+                        goodsDto.setGoodsRate(goodsDto.getGoodsRate().substring(0, goodsDto.getGoodsRate().indexOf("%")));
+                    }
+
+                    goodsEntity.setGoodsRate(BigDecimal.valueOf(Double.valueOf(goodsDto.getGoodsRate())).divide(new BigDecimal(100), 4, BigDecimal.ROUND_HALF_UP));
+                    retailPrice = BigDecimal.valueOf(Double.valueOf(goodsDto.getRetailPrice())).divide(goodsEntity.getGoodsRate().add(new BigDecimal(1)), 2, BigDecimal.ROUND_HALF_UP);
+                }else{
+                    retailPrice = BigDecimal.valueOf(Double.valueOf(goodsDto.getGoodsRate())).setScale(2, BigDecimal.ROUND_HALF_UP);
                 }
+
+                goodsEntity.setRetailPrice(retailPrice);
                 goodsEntity.setIsOnSale(Integer.parseInt(goodsDto.getIsOnSaleStr()));
                 goodsEntity.setIsHot(Integer.parseInt(goodsDto.getIsHotStr()));
 //                goodsEntity.setRetailPrice(BigDecimal.valueOf(Integer.valueOf(goodsDto.getRetailPrice())));

kmall-admin/src/main/resources/XmlTemplate/GoodsDtoList.xml

@@ -23,13 +23,13 @@
                 <mapping row="1" col="12">GoodsDto.ciqProdModel</mapping>
                 <mapping row="1" col="13">GoodsDto.goodsRate</mapping>
                 <!--<mapping row="1" col="16">GoodsDto.marketPrice</mapping>-->
-                <!--<mapping row="1" col="17">GoodsDto.retailPrice</mapping>-->
-                <mapping row="1" col="14">GoodsDto.brand</mapping>
-                <mapping row="1" col="15">GoodsDto.unitName</mapping>
-                <mapping row="1" col="16">GoodsDto.oriCntName</mapping>
-                <mapping row="1" col="17">GoodsDto.cusDeclEle</mapping>
-                <mapping row="1" col="18">GoodsDto.cusRecCode</mapping>
-                <mapping row="1" col="19">GoodsDto.goodsNumber</mapping>
+                <mapping row="1" col="14">GoodsDto.retailPrice</mapping>
+                <mapping row="1" col="15">GoodsDto.brand</mapping>
+                <mapping row="1" col="16">GoodsDto.unitName</mapping>
+                <mapping row="1" col="17">GoodsDto.oriCntName</mapping>
+                <mapping row="1" col="18">GoodsDto.cusDeclEle</mapping>
+                <mapping row="1" col="19">GoodsDto.cusRecCode</mapping>
+                <mapping row="1" col="20">GoodsDto.goodsNumber</mapping>
             </section>
             <loopbreakcondition>
                 <rowcheck offset="0">

kmall-admin/src/main/resources/mybatis/mapper/GoodsDao.xml

@@ -478,6 +478,7 @@
 			`primary_pic_url`,
 			`list_pic_url`,
 			`goods_rate`,
+			`retail_price`,
 			`sell_volume`,
 			`primary_product_id`,
 			`unit_price`,
@@ -530,6 +531,7 @@
 			#{primaryPicUrl},
 			#{listPicUrl},
 			#{goodsRate},
+			#{retailPrice},
 			#{sellVolume},
 			#{primaryProductId},
 			#{unitPrice},