Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general

kmall-admin/src/main/java/com/kmall/admin/controller/ProductStoreRelaController.java

@@ -334,7 +334,7 @@ public class ProductStoreRelaController {
         ExcelExport ee = new ExcelExport("门店商品信息");
 
         String[] header = new String[]{"所属商户","所属门店","商品类型","货品业务类型","商品编码","商品名称","产品编码",
-                "sku","plu","品牌","批次编号","批次到期日期","是否上架","是否热销","库存是否共享","门店库存","园区库存","零售价",
+                "sku","plu","品牌","批次编号","批次到期日期","是否上架","是否热销","库存是否共享","门店库存","园区库存","零售价(税后)",
                 "市场价","底线价","销售量"};
 
         List<Map<String, Object>> list = new ArrayList<>();

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,7 +901,6 @@ 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) {
@@ -924,12 +923,8 @@ public class GoodsServiceImpl implements GoodsService {
                     }
 
                     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="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>
+                <!--<mapping row="1" col="14">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>
             </section>
             <loopbreakcondition>
                 <rowcheck offset="0">

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

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