浏览代码

Merge branch 'master' of zhh/kmall-haikong into master

lhm 3 年之前
父节点
当前提交
8a08ec5926
共有 64 个文件被更改,包括 47 次插入38 次删除
  1. 1 1
      kmall-admin/src/main/java/com/kmall/admin/controller/ProductController.java
  2. 2 2
      kmall-admin/src/main/webapp/WEB-INF/page/compared/payorderinfo.html
  3. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/mk/mk2goodstopicprice.html
  4. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiescombinationprice.html
  5. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiescoupon.html
  6. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesdiscount.html
  7. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesfullgift.html
  8. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesfullreduction.html
  9. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesgetonefreegoods.html
  10. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitieshalfprice.html
  11. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiespromotion.html
  12. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesscore.html
  13. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/mk/mkdailyactivities.html
  14. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/shop/ad.html
  15. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/shop/brand.html
  16. 2 2
      kmall-admin/src/main/webapp/WEB-INF/page/shop/category.html
  17. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/shop/freight.html
  18. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/shop/goods.html
  19. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/shop/goodsexportpdf.html
  20. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/shop/goodsproduct.html
  21. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/shop/goodstransportinfodetail.html
  22. 2 2
      kmall-admin/src/main/webapp/WEB-INF/page/shop/mallpaymentorderdata.html
  23. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/shop/order.html
  24. 1 0
      kmall-admin/src/main/webapp/WEB-INF/page/shop/product.html
  25. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/shop/store.html
  26. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/shop/storeProductStock.html
  27. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/shop/storetransferinventoryorder.html
  28. 1 1
      kmall-admin/src/main/webapp/WEB-INF/page/sys/user.html
  29. 1 1
      kmall-admin/src/main/webapp/js/shop/brand.js
  30. 8 1
      kmall-admin/src/main/webapp/js/shop/product.js
  31. 1 1
      kmall-admin/src/main/webapp/js/shop/supplier.js
  32. 1 1
      kmall-admin/src/main/webapp/js/shop/syscusnationcode.js
  33. 1 1
      kmall-admin/src/main/webapp/js/shop/syscusunitcode.js
  34. 1 1
      kmall-admin/src/main/webapp/js/sys/generator.js
  35. 0 0
      kmall-admin/src/main/webapp/statics/file/activities_combination_price.xlsx
  36. 0 0
      kmall-admin/src/main/webapp/statics/file/activities_coupon.xlsx
  37. 0 0
      kmall-admin/src/main/webapp/statics/file/activities_discount.xlsx
  38. 0 0
      kmall-admin/src/main/webapp/statics/file/activities_full_gift.xlsx
  39. 0 0
      kmall-admin/src/main/webapp/statics/file/activities_full_reduction.xlsx
  40. 0 0
      kmall-admin/src/main/webapp/statics/file/activities_get_one_free_goods.xlsx
  41. 0 0
      kmall-admin/src/main/webapp/statics/file/activities_half_price.xlsx
  42. 0 0
      kmall-admin/src/main/webapp/statics/file/activities_promotion.xlsx
  43. 0 0
      kmall-admin/src/main/webapp/statics/file/activities_score.xlsx
  44. 0 0
      kmall-admin/src/main/webapp/statics/file/ali.xls
  45. 0 0
      kmall-admin/src/main/webapp/statics/file/brand.xls
  46. 0 0
      kmall-admin/src/main/webapp/statics/file/category_store_export.xls
  47. 0 0
      kmall-admin/src/main/webapp/statics/file/daily_activities.xlsx
  48. 0 0
      kmall-admin/src/main/webapp/statics/file/general_goods_export.xls
  49. 0 0
      kmall-admin/src/main/webapp/statics/file/goods_export.xls
  50. 0 0
      kmall-admin/src/main/webapp/statics/file/goods_product_import.xlsx
  51. 0 0
      kmall-admin/src/main/webapp/statics/file/goods_transport_info_detail_import.xls
  52. 0 0
      kmall-admin/src/main/webapp/statics/file/order_express_export.xls
  53. 0 0
      kmall-admin/src/main/webapp/statics/file/pdf_goods_export.xlsx
  54. 0 0
      kmall-admin/src/main/webapp/statics/file/store_export.xls
  55. 0 0
      kmall-admin/src/main/webapp/statics/file/store_goods_export.xlsx
  56. 0 0
      kmall-admin/src/main/webapp/statics/file/store_id_export.xls
  57. 0 0
      kmall-admin/src/main/webapp/statics/file/store_topic_goods_export.xlsx
  58. 0 0
      kmall-admin/src/main/webapp/statics/file/store_transfer_inventory_order_import.xls
  59. 0 0
      kmall-admin/src/main/webapp/statics/file/supplier_export.xls
  60. 0 0
      kmall-admin/src/main/webapp/statics/file/sys_cus_nation_code_export.xls
  61. 0 0
      kmall-admin/src/main/webapp/statics/file/sys_cus_unit_code_export.xls
  62. 二进制
      kmall-admin/src/main/webapp/statics/file/sys_user_export.xls
  63. 0 0
      kmall-admin/src/main/webapp/statics/file/wx.xls
  64. 3 2
      kmall-gen/src/main/java/com/kmall/gen/controller/SysGeneratorController.java

+ 1 - 1
kmall-admin/src/main/java/com/kmall/admin/controller/ProductController.java

@@ -40,7 +40,7 @@ public class ProductController {
         ParamUtils.setQueryPowerByRoleType(params, "storeId", "merchSn", "thirdPartyMerchCode");
         ParamUtils.setQueryPowerByRoleType(params, "storeId", "merchSn", "thirdPartyMerchCode");
         ParamUtils.setName(params, "categoryName");
         ParamUtils.setName(params, "categoryName");
 
 
-        ParamUtils.setName(params, "goodsName");
+        // ParamUtils.setName(params, "goodsName");
         //查询列表数据
         //查询列表数据
         Query query = new Query(params);
         Query query = new Query(params);
 
 

+ 2 - 2
kmall-admin/src/main/webapp/WEB-INF/page/compared/payorderinfo.html

@@ -44,8 +44,8 @@
                 </i-col>-->
                 </i-col>-->
                <!-- <a href="../statics/file/alipay_pay_order.xls">支付宝模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
                <!-- <a href="../statics/file/alipay_pay_order.xls">支付宝模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
                 <a href="../statics/file/weixin_pay_order.xls">微信模板下载</a>-->
                 <a href="../statics/file/weixin_pay_order.xls">微信模板下载</a>-->
-                <!--<a href="../statics/file/ali_yyyy_mm_dd_v1.0.0.xls">支付宝模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
-                <a href="../statics/file/wx_yyyy_mm_dd_v1.0.0.xls">微信模板下载</a>-->
+                <!--<a href="../statics/file/ali.xls">支付宝模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                <a href="../statics/file/wx.xls">微信模板下载</a>-->
             </div>
             </div>
         </Row>
         </Row>
 	    <table id="jqGrid"></table>
 	    <table id="jqGrid"></table>

+ 1 - 1
kmall-admin/src/main/webapp/WEB-INF/page/mk/mk2goodstopicprice.html

@@ -21,7 +21,7 @@
                         <i-button type="ghost" icon="ios-cloud-upload-outline">活动商品导入</i-button>
                         <i-button type="ghost" icon="ios-cloud-upload-outline">活动商品导入</i-button>
                     </Upload>
                     </Upload>
                 </i-col>
                 </i-col>
-                <a href="../statics/file/store_topic_goods_export_yyyy_mm_dd_v1.0.0.xlsx">活动商品模板下载</a>&nbsp;&nbsp;&nbsp;
+                <a href="../statics/file/store_topic_goods_export.xlsx">活动商品模板下载</a>&nbsp;&nbsp;&nbsp;
             </div>
             </div>
             <div class="buttons-group">
             <div class="buttons-group">
                 #if($shiro.hasPermission("mk2goodstopicprice:save"))
                 #if($shiro.hasPermission("mk2goodstopicprice:save"))

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

@@ -24,7 +24,7 @@
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                     </Upload>
                     </Upload>
                 </i-col>
                 </i-col>
-                <a href="../statics/file/activities_combination_price_yyyy_mm_dd_v1.0.0.xlsx">组合价模板下载</a>
+                <a href="../statics/file/activities_combination_price.xlsx">组合价模板下载</a>
             </div>
             </div>
             <div class="buttons-group">
             <div class="buttons-group">
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>

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

@@ -24,7 +24,7 @@
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                     </Upload>
                     </Upload>
                 </i-col>
                 </i-col>
-                <a href="../statics/file/activities_coupon_yyyy_mm_dd_v1.0.0.xlsx">优惠卷模板下载</a>
+                <a href="../statics/file/activities_coupon.xlsx">优惠卷模板下载</a>
             </div>
             </div>
             <div class="buttons-group">
             <div class="buttons-group">
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>

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

@@ -24,7 +24,7 @@
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                     </Upload>
                     </Upload>
                 </i-col>
                 </i-col>
-                <a href="../statics/file/activities_discount_yyyy_mm_dd_v1.0.0.xlsx">全场打折模板下载</a>
+                <a href="../statics/file/activities_discount.xlsx">全场打折模板下载</a>
             </div>
             </div>
             <div class="buttons-group">
             <div class="buttons-group">
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>

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

@@ -24,7 +24,7 @@
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                     </Upload>
                     </Upload>
                 </i-col>
                 </i-col>
-                <a href="../statics/file/activities_full_gift_yyyy_mm_dd_v1.0.0.xlsx">满赠模板下载</a>
+                <a href="../statics/file/activities_full_gift.xlsx">满赠模板下载</a>
             </div>
             </div>
             <div class="buttons-group">
             <div class="buttons-group">
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>

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

@@ -24,7 +24,7 @@
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                     </Upload>
                     </Upload>
                 </i-col>
                 </i-col>
-                <a href="../statics/file/activities_full_reduction_yyyy_mm_dd_v1.0.0.xlsx">满减模板下载</a>
+                <a href="../statics/file/activities_full_reduction.xlsx">满减模板下载</a>
             </div>
             </div>
             <div class="buttons-group">
             <div class="buttons-group">
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>

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

@@ -25,7 +25,7 @@
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                     </Upload>
                     </Upload>
                 </i-col>
                 </i-col>
-                <a href="../statics/file/activities_get_one_free_goods_yyyy_mm_dd_v1.0.0.xlsx">买一送一模板下载</a>
+                <a href="../statics/file/activities_get_one_free_goods.xlsx">买一送一模板下载</a>
             </div>
             </div>
             <div class="buttons-group">
             <div class="buttons-group">
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>

+ 1 - 1
kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitieshalfprice.html

@@ -24,7 +24,7 @@
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                     </Upload>
                     </Upload>
                 </i-col>
                 </i-col>
-                <a href="../statics/file/activities_half_price_yyyy_mm_dd_v1.0.0.xlsx">第二件半价模板下载</a>
+                <a href="../statics/file/activities_half_price.xlsx">第二件半价模板下载</a>
             </div>
             </div>
             <div class="buttons-group">
             <div class="buttons-group">
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>

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

@@ -24,7 +24,7 @@
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                     </Upload>
                     </Upload>
                 </i-col>
                 </i-col>
-                <a href="../statics/file/activities_promotion_yyyy_mm_dd_v1.0.0.xlsx">临时促销模板下载</a>
+                <a href="../statics/file/activities_promotion.xlsx">临时促销模板下载</a>
             </div>
             </div>
             <div class="buttons-group">
             <div class="buttons-group">
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>

+ 1 - 1
kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesscore.html

@@ -26,7 +26,7 @@
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                     </Upload>
                     </Upload>
                 </i-col>
                 </i-col>
-                <a href="../statics/file/activities_score_yyyy_mm_dd_v1.0.0.xlsx">积分抵扣模板下载</a>
+                <a href="../statics/file/activities_score.xlsx">积分抵扣模板下载</a>
             </div>
             </div>
             <div class="buttons-group">
             <div class="buttons-group">
 <!--                #if($shiro.hasPermission("mkactivitiesscore:save"))-->
 <!--                #if($shiro.hasPermission("mkactivitiesscore:save"))-->

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

@@ -24,7 +24,7 @@
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                     </Upload>
                     </Upload>
                 </i-col>
                 </i-col>
-                <a href="../statics/file/daily_activities_yyyy_mm_dd_v1.0.0.xlsx">日常活动模板下载</a>
+                <a href="../statics/file/daily_activities.xlsx">日常活动模板下载</a>
             </div>
             </div>
             <div class="buttons-group">
             <div class="buttons-group">
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>

+ 1 - 1
kmall-admin/src/main/webapp/WEB-INF/page/shop/ad.html

@@ -124,7 +124,7 @@
                         action="../uploadCommon/storeIdUpload">
                         action="../uploadCommon/storeIdUpload">
                     <i-button type="ghost" icon="ios-cloud-upload-outline">复制广告(批量上传门店id)</i-button>
                     <i-button type="ghost" icon="ios-cloud-upload-outline">复制广告(批量上传门店id)</i-button>
                 </Upload>
                 </Upload>
-                &nbsp;&nbsp;&nbsp;<a href="../statics/file/store_id_export_yyyy_mm_dd_v1.0.0.xls">广告门店id模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                &nbsp;&nbsp;&nbsp;<a href="../statics/file/store_id_export.xls">广告门店id模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
             </Form-item>
             </Form-item>
             <Form-item label="上传成功的门店id" prop="storeList">
             <Form-item label="上传成功的门店id" prop="storeList">
                 <i-input v-model="copyAdDto.storeList" placeholder="上传成功的门店id" disabled/>
                 <i-input v-model="copyAdDto.storeList" placeholder="上传成功的门店id" disabled/>

+ 1 - 1
kmall-admin/src/main/webapp/WEB-INF/page/shop/brand.html

@@ -237,7 +237,7 @@
                         action="../uploadCommon/brandStoreUpload">
                         action="../uploadCommon/brandStoreUpload">
                     <i-button type="ghost" icon="ios-cloud-upload-outline">复制品牌(批量上传门店id)</i-button>
                     <i-button type="ghost" icon="ios-cloud-upload-outline">复制品牌(批量上传门店id)</i-button>
                 </Upload>
                 </Upload>
-                &nbsp;&nbsp;&nbsp;<a href="../statics/file/category_store_export_yyyy_mm_dd_v1.0.0.xls">品牌门店id模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                &nbsp;&nbsp;&nbsp;<a href="../statics/file/category_store_export.xls">品牌门店id模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
             </Form-item>
             </Form-item>
             <Form-item label="上传成功的门店id" prop="storeList">
             <Form-item label="上传成功的门店id" prop="storeList">
                 <i-input v-model="copyBrandDto.storeList" placeholder="上传成功的门店id" disabled/>
                 <i-input v-model="copyBrandDto.storeList" placeholder="上传成功的门店id" disabled/>

+ 2 - 2
kmall-admin/src/main/webapp/WEB-INF/page/shop/category.html

@@ -262,7 +262,7 @@
                         action="../uploadCommon/storeIdUpload">
                         action="../uploadCommon/storeIdUpload">
                     <i-button type="ghost" icon="ios-cloud-upload-outline">复制一级分类(批量上传门店id)</i-button>
                     <i-button type="ghost" icon="ios-cloud-upload-outline">复制一级分类(批量上传门店id)</i-button>
                 </Upload>
                 </Upload>
-                &nbsp;&nbsp;&nbsp;<a href="../statics/file/store_id_export_yyyy_mm_dd_v1.0.0.xls">一级分类门店id模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                &nbsp;&nbsp;&nbsp;<a href="../statics/file/store_id_export.xls">一级分类门店id模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
             </Form-item>
             </Form-item>
             <Form-item v-if="level=='L2'">
             <Form-item v-if="level=='L2'">
                 <Upload :show-upload-list="false" :on-success="uploadExcelL2Success" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
                 <Upload :show-upload-list="false" :on-success="uploadExcelL2Success" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
@@ -270,7 +270,7 @@
                         action="../uploadCommon/cateStoreUpload">
                         action="../uploadCommon/cateStoreUpload">
                     <i-button type="ghost" icon="ios-cloud-upload-outline">复制二级分类(批量上传门店id)</i-button>
                     <i-button type="ghost" icon="ios-cloud-upload-outline">复制二级分类(批量上传门店id)</i-button>
                 </Upload>
                 </Upload>
-                &nbsp;&nbsp;&nbsp;<a href="../statics/file/category_store_export_yyyy_mm_dd_v1.0.0.xls">二级分类模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                &nbsp;&nbsp;&nbsp;<a href="../statics/file/category_store_export.xls">二级分类模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
             </Form-item>
             </Form-item>
             <Form-item label="上传成功的门店id" prop="storeList">
             <Form-item label="上传成功的门店id" prop="storeList">
                 <i-input v-model="copyCategoryDto.storeList" placeholder="上传成功的门店id" disabled/>
                 <i-input v-model="copyCategoryDto.storeList" placeholder="上传成功的门店id" disabled/>

+ 1 - 1
kmall-admin/src/main/webapp/WEB-INF/page/shop/freight.html

@@ -128,7 +128,7 @@
                         action="../uploadCommon/storeIdUpload">
                         action="../uploadCommon/storeIdUpload">
                     <i-button type="ghost" icon="ios-cloud-upload-outline">复制运费(批量上传门店id)</i-button>
                     <i-button type="ghost" icon="ios-cloud-upload-outline">复制运费(批量上传门店id)</i-button>
                 </Upload>
                 </Upload>
-                &nbsp;&nbsp;&nbsp;<a href="../statics/file/store_id_export_yyyy_mm_dd_v1.0.0.xls">运费门店id模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                &nbsp;&nbsp;&nbsp;<a href="../statics/file/store_id_export.xls">运费门店id模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
             </Form-item>
             </Form-item>
             <Form-item label="上传成功的门店id" prop="storeList">
             <Form-item label="上传成功的门店id" prop="storeList">
                 <i-input v-model="copyFreightDto.storeList" placeholder="上传成功的门店id" disabled/>
                 <i-input v-model="copyFreightDto.storeList" placeholder="上传成功的门店id" disabled/>

+ 1 - 1
kmall-admin/src/main/webapp/WEB-INF/page/shop/goods.html

@@ -193,7 +193,7 @@
                 #end
                 #end
                 #if($shiro.hasPermission("goods:down"))
                 #if($shiro.hasPermission("goods:down"))
                 &nbsp;&nbsp;&nbsp;&nbsp;
                 &nbsp;&nbsp;&nbsp;&nbsp;
-                <a href="../statics/file/goods_export_yyyy_mm_dd_v1.0.0.xls">商品模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                <a href="../statics/file/goods_export.xls">商品模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
 <!--                <a href="../statics/file/goods_img.zip">商品图片批量导入示例下载</a>-->
 <!--                <a href="../statics/file/goods_img.zip">商品图片批量导入示例下载</a>-->
                 #end
                 #end
             </div>
             </div>

+ 1 - 1
kmall-admin/src/main/webapp/WEB-INF/page/shop/goodsexportpdf.html

@@ -48,7 +48,7 @@
                     <i-button type="ghost" icon="ios-cloud-upload-outline">标签pdf制作模板导入</i-button>
                     <i-button type="ghost" icon="ios-cloud-upload-outline">标签pdf制作模板导入</i-button>
                 </Upload>
                 </Upload>
             </i-col>
             </i-col>
-            &nbsp;&nbsp;&nbsp;<a href="../statics/file/pdf_goods_export_yyyy_mm_dd_v1.0.0.xlsx">标签pdf制作模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+            &nbsp;&nbsp;&nbsp;<a href="../statics/file/pdf_goods_export.xlsx">标签pdf制作模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
             <i-col span="3">
             <i-col span="3">
                 <i-select v-model="q.storeId" placeholder="门店" filterable label-in-value>
                 <i-select v-model="q.storeId" placeholder="门店" filterable label-in-value>
                     <i-option v-for="store in stores" :value="store.id"
                     <i-option v-for="store in stores" :value="store.id"

+ 1 - 1
kmall-admin/src/main/webapp/WEB-INF/page/shop/goodsproduct.html

@@ -56,7 +56,7 @@
                         <i-button type="ghost" icon="ios-cloud-upload-outline">产品备案导入</i-button>
                         <i-button type="ghost" icon="ios-cloud-upload-outline">产品备案导入</i-button>
                     </Upload>
                     </Upload>
                 </i-col>
                 </i-col>
-                <a href="../statics/file/goods_product_import_yyyy_mm_dd_v1.0.0.xlsx">产品备案excel导入模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                <a href="../statics/file/goods_product_import.xlsx">产品备案excel导入模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
             </div>
             </div>
         </Row>
         </Row>
         <Row :gutter="16">
         <Row :gutter="16">

+ 1 - 1
kmall-admin/src/main/webapp/WEB-INF/page/shop/goodstransportinfodetail.html

@@ -19,7 +19,7 @@
                 <i-button @click="reloadSearch">重置</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
             </div>
             </div>
             <div class="buttons-group">
             <div class="buttons-group">
-                <a href="../statics/file/goods_transport_info_detail_import_yyyymmdd.v1.0.0.xls">
+                <a href="../statics/file/goods_transport_info_detail_import.xls">
                     <i-button type="ghost" icon="ios-cloud-upload-outline">在途商品明细模板下载</i-button>
                     <i-button type="ghost" icon="ios-cloud-upload-outline">在途商品明细模板下载</i-button>
                 </a>&nbsp;&nbsp;&nbsp;
                 </a>&nbsp;&nbsp;&nbsp;
                 <i-col style="display: inline-grid;">
                 <i-col style="display: inline-grid;">

+ 2 - 2
kmall-admin/src/main/webapp/WEB-INF/page/shop/mallpaymentorderdata.html

@@ -37,8 +37,8 @@
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
                 #end
                 #end
                 #if($shiro.hasPermission("mallpaymentorderdata:down"))
                 #if($shiro.hasPermission("mallpaymentorderdata:down"))
-                <a href="../statics/file/wx_yyyy_mm_dd_v1.0.0.xls">微信账单模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
-                <a href="../statics/file/ali_yyyy_mm_dd_v1.0.0.xls">支付宝账单模版下载</a>
+                <a href="../statics/file/wx.xls">微信账单模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                <a href="../statics/file/ali.xls">支付宝账单模版下载</a>
                 #end
                 #end
                 #if($shiro.hasPermission("mallpaymentorderdata:exportDataFormat"))
                 #if($shiro.hasPermission("mallpaymentorderdata:exportDataFormat"))
                 <i-button type="primary" @click="exportDataFormat"><i class="fa fa-cloud-download"></i>&nbsp;导出数据</i-button>
                 <i-button type="primary" @click="exportDataFormat"><i class="fa fa-cloud-download"></i>&nbsp;导出数据</i-button>

+ 1 - 1
kmall-admin/src/main/webapp/WEB-INF/page/shop/order.html

@@ -101,7 +101,7 @@
                     #end
                     #end
                     #if($shiro.hasPermission("order:down"))
                     #if($shiro.hasPermission("order:down"))
                     &nbsp;&nbsp;&nbsp;&nbsp;
                     &nbsp;&nbsp;&nbsp;&nbsp;
-                    <a href="../statics/file/order_express_export_yyyy_mm_dd_v1.0.0.xls">订单快递模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                    <a href="../statics/file/order_express_export.xls">订单快递模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
                     <a href="../statics/file/epress_data.xls">快递公司简写数据下载</a>
                     <a href="../statics/file/epress_data.xls">快递公司简写数据下载</a>
                     #end
                     #end
                 </div>
                 </div>

+ 1 - 0
kmall-admin/src/main/webapp/WEB-INF/page/shop/product.html

@@ -16,6 +16,7 @@
                     <i-input v-model="q.goodsSn" @on-enter="query" placeholder="商品序列号"/>
                     <i-input v-model="q.goodsSn" @on-enter="query" placeholder="商品序列号"/>
                 </i-col>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="query">查询</i-button>
+                <i-button @click="reloadSearch">重置</i-button>
             </div>
             </div>
             <div class="buttons-group">
             <div class="buttons-group">
                 #if($shiro.hasPermission("product:save"))
                 #if($shiro.hasPermission("product:save"))

+ 1 - 1
kmall-admin/src/main/webapp/WEB-INF/page/shop/store.html

@@ -44,7 +44,7 @@
                 </i-col>
                 </i-col>
                 #end
                 #end
                 #if($shiro.hasPermission("store:down"))
                 #if($shiro.hasPermission("store:down"))
-                &nbsp;&nbsp;&nbsp;<a href="../statics/file/store_export_yyyy_mm_dd_v1.0.0.xls">门店模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                &nbsp;&nbsp;&nbsp;<a href="../statics/file/store_export.xls">门店模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
                 #end
                 #end
                 #if($shiro.hasPermission("store:export"))
                 #if($shiro.hasPermission("store:export"))
                 <i-button type="primary" @click="exportStore"><i class="fa fa-cloud-download"></i>&nbsp;门店id导出</i-button>
                 <i-button type="primary" @click="exportStore"><i class="fa fa-cloud-download"></i>&nbsp;门店id导出</i-button>

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

@@ -147,7 +147,7 @@
                     </Upload>
                     </Upload>
                 </i-col>
                 </i-col>
                 #if($shiro.hasPermission("productstorerela:down"))
                 #if($shiro.hasPermission("productstorerela:down"))
-                &nbsp;&nbsp;&nbsp;<a href="../statics/file/store_goods_export_yyyy_mm_dd_v1.0.0.xlsx">门店商品模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                &nbsp;&nbsp;&nbsp;<a href="../statics/file/store_goods_export.xlsx">门店商品模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
                 #end
                 #end
             </div>
             </div>
         </Row>
         </Row>

+ 1 - 1
kmall-admin/src/main/webapp/WEB-INF/page/shop/storetransferinventoryorder.html

@@ -36,7 +36,7 @@
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                         <i-button type="ghost" icon="ios-cloud-upload-outline">导入</i-button>
                     </Upload>
                     </Upload>
                 </i-col>
                 </i-col>
-                <a href="../statics/file/store_transfer_inventory_order_import_yyyy_mm_dd_v1.0.0.xls">导入模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                <a href="../statics/file/store_transfer_inventory_order_import.xls">导入模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
             </div>
             </div>
         </Row>
         </Row>
 	    <table id="jqGrid"></table>
 	    <table id="jqGrid"></table>

+ 1 - 1
kmall-admin/src/main/webapp/WEB-INF/page/sys/user.html

@@ -35,7 +35,7 @@
                 </i-col>
                 </i-col>
                 #end
                 #end
                 #if($shiro.hasPermission("sys:user:down"))
                 #if($shiro.hasPermission("sys:user:down"))
-                &nbsp;&nbsp;&nbsp;<a href="../statics/file/sys_user_export_yyyy_mm_dd_v1.0.0.xls">管理员模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                &nbsp;&nbsp;&nbsp;<a href="../statics/file/sys_user_export.xls">管理员模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
                 #end
                 #end
             </div>
             </div>
         </Row>
         </Row>

+ 1 - 1
kmall-admin/src/main/webapp/js/shop/brand.js

@@ -468,7 +468,7 @@ var vm = new Vue({
                 content: 'Loading...',
                 content: 'Loading...',
                 duration: 0
                 duration: 0
             });
             });
-            window.location.href='../statics/file/brand_export_yyyy_mm_dd_v1.0.0.xls';
+            window.location.href='../../statics/file/brand.xls';
             setTimeout(msg, 1000);
             setTimeout(msg, 1000);
         },
         },
         exportBrand: function () {
         exportBrand: function () {

+ 8 - 1
kmall-admin/src/main/webapp/js/shop/product.js

@@ -9,7 +9,7 @@ $(function () {
         datatype: "json",
         datatype: "json",
         colModel: [
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, width: 120},
             {label: 'id', name: 'id', index: 'id', key: true, width: 120},
-            {label: '商品', name: 'goodsName', index: 'goods_id', width: 380},
+            {label: '商品名称', name: 'goodsName', index: 'goods_id', width: 380},
             {
             {
                 label: '商品规格',
                 label: '商品规格',
                 name: 'goodsSpecificationNameValue',
                 name: 'goodsSpecificationNameValue',
@@ -175,6 +175,13 @@ let vm = new Vue({
             $.get("../goods/queryAll/", function (r) {
             $.get("../goods/queryAll/", function (r) {
                 vm.goodss = r.list;
                 vm.goodss = r.list;
             });
             });
+        },
+        reloadSearch: function() {
+            vm.q = {
+                goodsName: '',
+                goodsSn: ''
+            }
+            vm.reload();
         }
         }
     }
     }
 });
 });

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

@@ -183,7 +183,7 @@ let vm = new Vue({
                 content: 'Loading...',
                 content: 'Loading...',
                 duration: 0
                 duration: 0
             });
             });
-            window.location.href='../statics/file/supplier_export_yyyy_mm_dd_v1.0.0.xls';
+            window.location.href='../../statics/file/supplier_export.xls';
             setTimeout(msg, 1000);
             setTimeout(msg, 1000);
         },
         },
         // 上传方法开始 ----
         // 上传方法开始 ----

+ 1 - 1
kmall-admin/src/main/webapp/js/shop/syscusnationcode.js

@@ -170,7 +170,7 @@ let vm = new Vue({
                 content: 'Loading...',
                 content: 'Loading...',
                 duration: 0
                 duration: 0
             });
             });
-            window.location.href='../statics/file/sys_cus_nation_code_export_yyyy_mm_dd_v1.0.0.xls';
+            window.location.href='../../statics/file/sys_cus_nation_code_export.xls';
             setTimeout(msg, 1000);
             setTimeout(msg, 1000);
         },
         },
         // 上传方法开始 ----
         // 上传方法开始 ----

+ 1 - 1
kmall-admin/src/main/webapp/js/shop/syscusunitcode.js

@@ -164,7 +164,7 @@ let vm = new Vue({
                 content: 'Loading...',
                 content: 'Loading...',
                 duration: 0
                 duration: 0
             });
             });
-            window.location.href='../statics/file/sys_cus_unit_code_export_yyyy_mm_dd_v1.0.0.xls';
+            window.location.href='../../statics/file/sys_cus_unit_code_export.xls';
             setTimeout(msg, 1000);
             setTimeout(msg, 1000);
         },
         },
         // 上传方法开始 ----
         // 上传方法开始 ----

+ 1 - 1
kmall-admin/src/main/webapp/js/sys/generator.js

@@ -61,7 +61,7 @@ var vm = new Vue({
             if (tableNames == null) {
             if (tableNames == null) {
                 return;
                 return;
             }
             }
-            location.href = "../sys/generator/code?tables=" + JSON.stringify(tableNames);
+            location.href = "../sys/generator/code?tables="+tableNames;
         }
         }
     }
     }
 });
 });

+ 0 - 0
kmall-admin/src/main/webapp/statics/file/activities_combination_price_yyyy_mm_dd_v1.0.0.xlsx → kmall-admin/src/main/webapp/statics/file/activities_combination_price.xlsx


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/activities_coupon_yyyy_mm_dd_v1.0.0.xlsx → kmall-admin/src/main/webapp/statics/file/activities_coupon.xlsx


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/activities_discount_yyyy_mm_dd_v1.0.0.xlsx → kmall-admin/src/main/webapp/statics/file/activities_discount.xlsx


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/activities_full_gift_yyyy_mm_dd_v1.0.0.xlsx → kmall-admin/src/main/webapp/statics/file/activities_full_gift.xlsx


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/activities_full_reduction_yyyy_mm_dd_v1.0.0.xlsx → kmall-admin/src/main/webapp/statics/file/activities_full_reduction.xlsx


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/activities_get_one_free_goods_yyyy_mm_dd_v1.0.0.xlsx → kmall-admin/src/main/webapp/statics/file/activities_get_one_free_goods.xlsx


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/activities_half_price_yyyy_mm_dd_v1.0.0.xlsx → kmall-admin/src/main/webapp/statics/file/activities_half_price.xlsx


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/activities_promotion_yyyy_mm_dd_v1.0.0.xlsx → kmall-admin/src/main/webapp/statics/file/activities_promotion.xlsx


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/activities_score_yyyy_mm_dd_v1.0.0.xlsx → kmall-admin/src/main/webapp/statics/file/activities_score.xlsx


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/ali_yyyy_mm_dd_v1.0.0.xls → kmall-admin/src/main/webapp/statics/file/ali.xls


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/brand_export_yyyy_mm_dd_v1.0.0.xls → kmall-admin/src/main/webapp/statics/file/brand.xls


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/category_store_export_yyyy_mm_dd_v1.0.0.xls → kmall-admin/src/main/webapp/statics/file/category_store_export.xls


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/daily_activities_yyyy_mm_dd_v1.0.0.xlsx → kmall-admin/src/main/webapp/statics/file/daily_activities.xlsx


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/general_goods_export_yyyy_mm_dd_v1.0.0.xls → kmall-admin/src/main/webapp/statics/file/general_goods_export.xls


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/goods_export_yyyy_mm_dd_v1.0.0.xls → kmall-admin/src/main/webapp/statics/file/goods_export.xls


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/goods_product_import_yyyy_mm_dd_v1.0.0.xlsx → kmall-admin/src/main/webapp/statics/file/goods_product_import.xlsx


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/goods_transport_info_detail_import_yyyymmdd.v1.0.0.xls → kmall-admin/src/main/webapp/statics/file/goods_transport_info_detail_import.xls


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/order_express_export_yyyy_mm_dd_v1.0.0.xls → kmall-admin/src/main/webapp/statics/file/order_express_export.xls


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/pdf_goods_export_yyyy_mm_dd_v1.0.0.xlsx → kmall-admin/src/main/webapp/statics/file/pdf_goods_export.xlsx


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/store_export_yyyy_mm_dd_v1.0.0.xls → kmall-admin/src/main/webapp/statics/file/store_export.xls


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/store_goods_export_yyyy_mm_dd_v1.0.0.xlsx → kmall-admin/src/main/webapp/statics/file/store_goods_export.xlsx


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/store_id_export_yyyy_mm_dd_v1.0.0.xls → kmall-admin/src/main/webapp/statics/file/store_id_export.xls


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/store_topic_goods_export_yyyy_mm_dd_v1.0.0.xlsx → kmall-admin/src/main/webapp/statics/file/store_topic_goods_export.xlsx


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/store_transfer_inventory_order_import_yyyy_mm_dd_v1.0.0.xls → kmall-admin/src/main/webapp/statics/file/store_transfer_inventory_order_import.xls


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/supplier_export_yyyy_mm_dd_v1.0.0.xls → kmall-admin/src/main/webapp/statics/file/supplier_export.xls


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/sys_cus_nation_code_export_yyyy_mm_dd_v1.0.0.xls → kmall-admin/src/main/webapp/statics/file/sys_cus_nation_code_export.xls


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/sys_cus_unit_code_export_yyyy_mm_dd_v1.0.0.xls → kmall-admin/src/main/webapp/statics/file/sys_cus_unit_code_export.xls


二进制
kmall-admin/src/main/webapp/statics/file/sys_user_export_yyyy_mm_dd_v1.0.0.xls → kmall-admin/src/main/webapp/statics/file/sys_user_export.xls


+ 0 - 0
kmall-admin/src/main/webapp/statics/file/wx_yyyy_mm_dd_v1.0.0.xls → kmall-admin/src/main/webapp/statics/file/wx.xls


+ 3 - 2
kmall-gen/src/main/java/com/kmall/gen/controller/SysGeneratorController.java

@@ -1,6 +1,7 @@
 package com.kmall.gen.controller;
 package com.kmall.gen.controller;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.kmall.gen.service.SysGeneratorService;
 import com.kmall.gen.service.SysGeneratorService;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.Query;
@@ -10,6 +11,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -60,9 +62,8 @@ public class SysGeneratorController {
         //获取表名,不进行xss过滤
         //获取表名,不进行xss过滤
         HttpServletRequest orgRequest = XssHttpServletRequestWrapper.getOrgRequest(request);
         HttpServletRequest orgRequest = XssHttpServletRequestWrapper.getOrgRequest(request);
         String tables = orgRequest.getParameter("tables");
         String tables = orgRequest.getParameter("tables");
-        tableNames = JSON.parseArray(tables).toArray(tableNames);
 
 
-        byte[] data = sysGeneratorService.generatorCode(tableNames);
+        byte[] data = sysGeneratorService.generatorCode(tables.split(","));
 
 
         response.reset();
         response.reset();
         response.setHeader("Content-Disposition", "attachment; filename=\"AutoCode.zip\"");
         response.setHeader("Content-Disposition", "attachment; filename=\"AutoCode.zip\"");