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

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

@@ -117,7 +117,7 @@ public class MkActivitiesCombinationPriceServiceImpl implements MkActivitiesComb
                     mkActivitiesCombinationPriceEntity.setCombinationNum(combinationPriceGoodsDto.getCombinedCount());
                     mkActivitiesCombinationPriceEntity.setDeadline(combinationPriceGoodsDto.getDeadline());
                     mkActivitiesCombinationPriceEntity.setMkaId(Long.parseLong(mkaId));
-                    mkActivitiesCombinationPriceEntity.setCombinationType(combinationPriceGoodsDto.getGoodsSns());
+                    mkActivitiesCombinationPriceEntity.setCombinationType(combinationPriceGoodsDto.getBarCodes());
                     mkActivitiesCombinationPriceEntity.setCreateTime(createTime);
 
                     mkActivitiesCombinationPriceEntityList.add(mkActivitiesCombinationPriceEntity);

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

@@ -15,11 +15,16 @@
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
-                <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
-                        :format="['xls','xlsx']"
-                        action="../mkactivitiescombinationprice/upload" :before-upload="beforeUpload"  :data="uploadData" >
-                    <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
-                </Upload>
+            </div>
+            <div class="buttons-group" style="width: 100%;margin-top: 8px; padding-left: 10px;">
+                <i-col style="display: inline-grid;">
+                    <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
+                            :format="['xls','xlsx']"
+                            action="../mkactivitiescombinationprice/upload" :before-upload="beforeUpload"  :data="uploadData" >
+                        <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
+                    </Upload>
+                </i-col>
+                <a href="../statics/file/activities_combination_price_yyyy_mm_dd_v1.0.0.xlsx">组合价模板下载</a>
             </div>
             <div class="buttons-group">
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>

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

@@ -15,11 +15,16 @@
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
-                <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
-                        :format="['xls','xlsx']"
-                        action="../mkactivitiescoupon/upload" :before-upload="beforeUpload"  :data="uploadData" >
-                    <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
-                </Upload>
+            </div>
+            <div class="buttons-group" style="width: 100%;margin-top: 8px; padding-left: 10px;">
+                <i-col style="display: inline-grid;">
+                    <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
+                            :format="['xls','xlsx']"
+                            action="../mkactivitiescoupon/upload" :before-upload="beforeUpload"  :data="uploadData" >
+                        <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
+                    </Upload>
+                </i-col>
+                <a href="../statics/file/activities_coupon_yyyy_mm_dd_v1.0.0.xlsx">优惠卷模板下载</a>
             </div>
             <div class="buttons-group">
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>

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

@@ -15,11 +15,16 @@
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
-                <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
-                        :format="['xls','xlsx']"
-                        action="../mkactivitiesdiscount/upload" :before-upload="beforeUpload"  :data="uploadData" >
-                    <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
-                </Upload>
+            </div>
+            <div class="buttons-group" style="width: 100%;margin-top: 8px; padding-left: 10px;">
+                <i-col style="display: inline-grid;">
+                    <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
+                            :format="['xls','xlsx']"
+                            action="../mkactivitiesdiscount/upload" :before-upload="beforeUpload"  :data="uploadData" >
+                        <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
+                    </Upload>
+                </i-col>
+                <a href="../statics/file/activities_discount_yyyy_mm_dd_v1.0.0.xlsx">全场打折模板下载</a>
             </div>
             <div class="buttons-group">
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>

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

@@ -15,11 +15,16 @@
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
-                <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
-                        :format="['xls','xlsx']"
-                        action="../mkactivitiesfullgift/upload" :before-upload="beforeUpload"  :data="uploadData" >
-                    <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
-                </Upload>
+            </div>
+            <div class="buttons-group" style="width: 100%;margin-top: 8px; padding-left: 10px;">
+                <i-col style="display: inline-grid;">
+                    <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
+                            :format="['xls','xlsx']"
+                            action="../mkactivitiesfullgift/upload" :before-upload="beforeUpload"  :data="uploadData" >
+                        <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
+                    </Upload>
+                </i-col>
+                <a href="../statics/file/activities_full_gift_yyyy_mm_dd_v1.0.0.xlsx">满赠模板下载</a>
             </div>
             <div class="buttons-group">
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>

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

@@ -15,11 +15,16 @@
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
-                <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
-                        :format="['xls','xlsx']"
-                        action="../mkactivitiesfullreduction/upload" :before-upload="beforeUpload"  :data="uploadData" >
-                    <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
-                </Upload>
+            </div>
+            <div class="buttons-group" style="width: 100%;margin-top: 8px; padding-left: 10px;">
+                <i-col style="display: inline-grid;">
+                    <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
+                            :format="['xls','xlsx']"
+                            action="../mkactivitiesfullreduction/upload" :before-upload="beforeUpload"  :data="uploadData" >
+                        <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
+                    </Upload>
+                </i-col>
+                <a href="../statics/file/activities_full_reduction_yyyy_mm_dd_v1.0.0.xlsx">满减模板下载</a>
             </div>
             <div class="buttons-group">
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>

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

@@ -16,11 +16,16 @@
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
-                <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
-                        :format="['xls','xlsx']"
-                        action="../mkactivitiesgetonefreegoods/upload" :before-upload="beforeUpload"  :data="uploadData" >
-                    <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
-                </Upload>
+            </div>
+            <div class="buttons-group" style="width: 100%;margin-top: 8px; padding-left: 10px;">
+                <i-col style="display: inline-grid;">
+                    <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
+                            :format="['xls','xlsx']"
+                            action="../mkactivitiesgetonefreegoods/upload" :before-upload="beforeUpload"  :data="uploadData" >
+                        <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
+                    </Upload>
+                </i-col>
+                <a href="../statics/file/activities_get_one_free_goods_yyyy_mm_dd_v1.0.0.xlsx">买一送一模板下载</a>
             </div>
             <div class="buttons-group">
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>

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

@@ -15,11 +15,16 @@
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
-                <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
-                        :format="['xls','xlsx']"
-                        action="../mkactivitiespromotion/upload" :before-upload="beforeUpload"  :data="uploadData" >
-                    <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
-                </Upload>
+            </div>
+            <div class="buttons-group" style="width: 100%;margin-top: 8px; padding-left: 10px;">
+                <i-col style="display: inline-grid;">
+                    <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
+                            :format="['xls','xlsx']"
+                            action="../mkactivitiespromotion/upload" :before-upload="beforeUpload"  :data="uploadData" >
+                        <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
+                    </Upload>
+                </i-col>
+                <a href="../statics/file/activities_promotion_yyyy_mm_dd_v1.0.0.xlsx">临时促销模板下载</a>
             </div>
             <div class="buttons-group">
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>

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

@@ -15,11 +15,16 @@
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
-                <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
-                        :format="['xls','xlsx']"
-                        action="../mkdailyactivities/upload" :before-upload="beforeUpload"  :data="uploadData" >
-                 <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
-                </Upload>
+            </div>
+            <div class="buttons-group" style="width: 100%;margin-top: 8px; padding-left: 10px;">
+                <i-col style="display: inline-grid;">
+                    <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
+                            :format="['xls','xlsx']"
+                            action="../mkdailyactivities/upload" :before-upload="beforeUpload"  :data="uploadData" >
+                        <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
+                    </Upload>
+                </i-col>
+                <a href="../statics/file/daily_activities_yyyy_mm_dd_v1.0.0.xlsx">日常活动模板下载</a>
             </div>
             <div class="buttons-group">
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>