门店商品中去掉运费模板

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

@@ -117,7 +117,7 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
         builder.put("attributeCategory", "一级分类");
         builder.put("categoryId", "二级分类");
         builder.put("brandId", "品牌");
-        builder.put("freightId", "运费模版");
+//        builder.put("freightId", "运费模版");
 
         R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
         if (Integer.valueOf(r.get("code").toString()) != 0) {
@@ -281,7 +281,7 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
         builder.put("attributeCategory", "一级分类");
         builder.put("categoryId", "二级分类");
         builder.put("brandId", "品牌");
-        builder.put("freightId", "运费模版");
+//        builder.put("freightId", "运费模版");
 
         R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
         if (Integer.valueOf(r.get("code").toString()) != 0) {
@@ -868,12 +868,12 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
                 }else{
                     throw new RRException("商品[" + storeGoodsDto.getGoodsSn() + "]的品牌输入有误");
                 }
-                FreightEntity freightEntity = freightDao.queryFreightByFreightNameAndStoreId(storeGoodsDto.getFreightName(), store.getId());
+                /*FreightEntity freightEntity = freightDao.queryFreightByFreightNameAndStoreId(storeGoodsDto.getFreightName(), store.getId());
                 if (freightEntity != null) {
                     storeRelaEntity.setFreightId(freightEntity.getId());
                 }else{
                     throw new RRException("商品[" + storeGoodsDto.getGoodsSn() + "]的运费模板输入有误");
-                }
+                }*/
                 // 如果底线价大于零售价
                 if (new BigDecimal(storeGoodsDto.getBottomLinePrice()).compareTo(new BigDecimal(storeGoodsDto.getRetailPrice())) == 1) {
                     throw new RRException("商品[" + storeGoodsDto.getGoodsSn() + "]的底线价不可以大于零售价");

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

@@ -11,11 +11,11 @@
                 <mapping row="1" col="3">StoreGoodsDto.categoryName</mapping>
                 <mapping row="1" col="4">StoreGoodsDto.attributeCategory</mapping>
                 <mapping row="1" col="5">StoreGoodsDto.brandName</mapping>
-                <mapping row="1" col="6">StoreGoodsDto.freightName</mapping>
-                <mapping row="1" col="7">StoreGoodsDto.retailPrice</mapping>
-                <mapping row="1" col="8">StoreGoodsDto.marketPrice</mapping>
-                <mapping row="1" col="9">StoreGoodsDto.bottomLinePrice</mapping>
-                <mapping row="1" col="10">StoreGoodsDto.batchSn</mapping>
+<!--                <mapping row="1" col="6">StoreGoodsDto.freightName</mapping>-->
+                <mapping row="1" col="6">StoreGoodsDto.retailPrice</mapping>
+                <mapping row="1" col="7">StoreGoodsDto.marketPrice</mapping>
+                <mapping row="1" col="8">StoreGoodsDto.bottomLinePrice</mapping>
+                <mapping row="1" col="9">StoreGoodsDto.batchSn</mapping>
             </section>
             <loopbreakcondition>
                 <rowcheck offset="0">

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesdiscount.html

@@ -59,7 +59,7 @@
                 <i-input v-model="mkActivitiesDiscount.productSeries" placeholder="商品系列"/>
             </Form-item>
             <Form-item label="折扣" prop="discount">
-                <i-input v-model="mkActivitiesDiscount.discount" placeholder="折扣价"/>
+                <i-input v-model="mkActivitiesDiscount.discount" placeholder="折扣"/>
             </Form-item>
             <Form-item>
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>

kmall-admin/src/main/webapp/WEB-INF/page/shop/storeProductStock.html

@@ -202,13 +202,13 @@
                     </i-option>
                 </i-select>
             </Form-item>
-            <Form-item v-if="showInput" label="运费模版" prop="freightId">
+            <!--<Form-item v-if="showInput" label="运费模版" prop="freightId">
                 <i-select v-model="productStoreRela.freightId" placeholder="运费模版"
                           label-in-value style="width: 268px;">
                     <i-option v-for="freight in freights" :value="freight.id" :key="freight.id">{{freight.name}}
                     </i-option>
                 </i-select>
-            </Form-item>
+            </Form-item>-->
             <Form-item v-if="showInput" label="批次编号" prop="batchSn">
                 <!--<i-input v-model="productStoreRela.batchSn" placeholder="批次编号" style="width: 268px;"/>-->
                 <i-select v-model="productStoreRela.batchSn" placeholder="批次编号" @on-change="changeBatch"
@@ -337,13 +337,13 @@
                     </i-option>
                 </i-select>
             </Form-item>
-            <Form-item v-if="showInput" label="运费模版" prop="freightId">
+            <!--<Form-item v-if="showInput" label="运费模版" prop="freightId">
                 <i-select v-model="productStoreRela.freightId" placeholder="运费模版"
                           label-in-value style="width: 268px;">
                     <i-option v-for="freight in freights" :value="freight.id" :key="freight.id">{{freight.name}}
                     </i-option>
                 </i-select>
-            </Form-item>
+            </Form-item>-->
             <Form-item v-if="showInputSpecification" label="规格" prop="specification">
                 <i-input v-model="productStoreRela.specification" placeholder="规格" style="width: 268px;" v-show="isSupplierOperatorShow" disabled></i-input>
                 <i-input v-model="productStoreRela.specification" placeholder="规格" style="width: 268px;" v-show="!isSupplierOperatorShow"></i-input>

kmall-admin/src/main/webapp/js/mk/mk2memberbirthday.js

@@ -22,14 +22,6 @@ $(function () {
                         return '<span class="label label-success">是</span>';
                     }
                     return '<span class="label label-danger">否</span>';
-                }},
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 180},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 180,align: 'center',formatter: function (value) {
-                    return transDate(value,'yyyy-MM-dd hh:mm:ss');
-                }},
-			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 180},
-			{label: '修改时间', name: 'modTime', index: 'mod_time', width: 180,align: 'center',formatter: function (value) {
-                    return transDate(value,'yyyy-MM-dd hh:mm:ss');
                 }}],
 		viewrecords: true,
         height: 550,

kmall-admin/src/main/webapp/js/shop/supplier.js

@@ -6,9 +6,9 @@ $(function () {
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
 			{label: '一级商户编号', name: 'levelMerchSn', index: 'level_merch_sn', width: 200, align: 'center'},
 			{label: '一级商户标识', name: 'levelMerchFlag', index: 'level_merch_flag', width: 120, align: 'center'},
-            {label: '所属第三方商户', name: 'thirdPartyMerchCode', index: 'thirdPartyMerchCode', width: 120},
-			{label: '二级供货商名称', name: 'childSupplierName', index: 'child_supplier_sn', width: 220 },
-			{label: '二级供货商标识', name: 'childSupplierFlag', index: 'child_supplier_flag', width: 120 },
+            {label: '所属第三方商户', name: 'thirdPartyMerchCode', index: 'thirdPartyMerchCode', width: 120, align: 'center'},
+			{label: '二级供货商名称', name: 'childSupplierName', index: 'child_supplier_sn', width: 220, align: 'center'},
+			{label: '二级供货商标识', name: 'childSupplierFlag', index: 'child_supplier_flag', width: 120, align: 'center'},
 			{label: '排序', name: 'sortOrder', index: 'sort_order', width: 100, align: 'center'},
 			{label: '是否禁用', name: 'isShow', index: 'is_show', width: 100, align: 'center', formatter: function (value) {
                 return value == 0 ?