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

# Conflicts:
#	kmall-admin/src/main/java/com/kmall/admin/service/impl/mk/Mk2GoodsTopicPriceServiceImpl.java

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

@@ -350,6 +350,7 @@ public class GoodsController {
      * @param request
      * @return
      */
+    @RequiresPermissions("goods:export")
     @RequestMapping(value = "export")
     public R export(@RequestParam Map<String, Object> params, HttpServletResponse response, HttpServletRequest request) {
         ParamUtils.setQueryPowerByRoleType(params, "storeId", "merchSn", "thirdPartyMerchCode");

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

@@ -1059,8 +1059,9 @@ public class OrderController {
 
 
     /**
-     * 线上订单导出请求
+     * 线下订单导出请求
      */
+    @RequiresPermissions("order:exportOffilineOrder")
     @RequestMapping(value = "exportOffilineOrder")
     public R exportOffilineOrder(@RequestParam Map<String, Object> params, HttpServletResponse response, HttpServletRequest request) {
         ParamUtils.setQueryPowerByRoleType(params, "storeId", "merchSn", "thirdPartyMerchCode");

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

@@ -285,7 +285,14 @@ public class ProductStoreRelaController {
         return R.ok("导入成功！");
     }
 
-
+    /**
+     * 门店商品导出
+     * @param params
+     * @param response
+     * @param request
+     * @return
+     */
+    @RequiresPermissions("productstorerela:export")
     @RequestMapping(value = "export")
     public R export(@RequestParam Map<String, Object> params, HttpServletResponse response, HttpServletRequest request) {
         ParamUtils.setQueryPowerByRoleType(params, "storeId", "merchSn", "thirdPartyMerchCode");

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

@@ -255,7 +255,7 @@ public class StoreController {
 
         ExcelExport ee = new ExcelExport("门店id信息");
 
-        String[] header = new String[]{"门店编号", "门店名称", "oms门店编号"};
+        String[] header = new String[]{"门店编号", "门店名称", "门店编号"};
 
         List<Map<String, Object>> list = new ArrayList<>();
         if (storeEntityList != null && storeEntityList.size() != 0) {

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

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 /**
  * 通知Controller
@@ -63,6 +64,7 @@ public class SysNoticeController {
     @RequiresPermissions("sys:notice:save")
     @ResponseBody
     public R save(@RequestBody SysNoticeEntity sysNotice) {
+        sysNotice.setId(UUID.randomUUID().toString().replace("-",""));
         sysNoticeService.save(sysNotice);
 
         return R.ok();

kmall-admin/src/main/java/com/kmall/admin/controller/mk/Mk2GoodsTopicPriceController.java

@@ -139,6 +139,9 @@ public class Mk2GoodsTopicPriceController {
         } catch (ParseException e) {
             e.printStackTrace();
             return R.error("导入失败！");
+        } catch (RuntimeException e){
+            e.printStackTrace();
+            return R.error(e.getMessage());
         }
         //上传文件
         return R.ok("导入成功！");

kmall-admin/src/main/java/com/kmall/admin/fromcomm/service/impl/SysUserServiceImpl.java

@@ -234,6 +234,7 @@ public class SysUserServiceImpl implements SysUserService {
     }
 
     @Override
+    @Transactional
     public int uploadExcel(List<SysUserDto> sysUserDtoList){
         SysUserEntity user = ShiroUtils.getUserEntity();
         String merchSn = user.getMerchSn();
@@ -393,7 +394,7 @@ public class SysUserServiceImpl implements SysUserService {
         }else{
             throw new RRException("导入数据为空，或者检查数据是否为空");
         }
-        throw new RRException("导入成功！");
-//        return 1;
+        //throw new RRException("导入成功！");
+        return 1;
     }
 }

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

@@ -685,6 +685,7 @@ public class GoodsServiceImpl implements GoodsService {
     }
 
     @Override
+    @Transactional
     public int uploadExcel(List<GoodsDto> goodsEntityList,int exportDataType) {
         SysUserEntity user = ShiroUtils.getUserEntity();
         String merchSn = user.getMerchSn();

kmall-admin/src/main/java/com/kmall/admin/service/impl/mk/Mk2GoodsTopicPriceServiceImpl.java

@@ -120,10 +120,15 @@ public class Mk2GoodsTopicPriceServiceImpl implements Mk2GoodsTopicPriceService
                 }
                 // 1.保存门店活动
                 if(storeTopicEntity == null){
+                    storeTopicEntity = new StoreTopicEntity();
                     String merchSn = storeTopicGoodsDto.getMerchSn();
                     List<ThirdMerchantBizEntity> byMerchSn = thirdMerchantBizDao.findByMerchSn(merchSn);
-
-                    storeTopicEntity = new StoreTopicEntity();
+                    if(byMerchSn != null && byMerchSn.size() > 0){
+                        ThirdMerchantBizEntity thirdMerchantBizEntity = byMerchSn.get(0);
+                        storeTopicEntity.setThirdMerchSn(thirdMerchantBizEntity.getThirdMerchSn());
+                    }else{
+                        throw new RuntimeException("没有该第三方商户");
+                    }
                     storeTopicEntity.setTitle(storeTopicGoodsDto.getTopic()); // 主题
                     storeTopicEntity.setContent(storeTopicGoodsDto.getTopicContent()); // 内容
                     storeTopicEntity.setSubtitle(storeTopicGoodsDto.getTopic());// 子标题
@@ -131,12 +136,6 @@ public class Mk2GoodsTopicPriceServiceImpl implements Mk2GoodsTopicPriceService
                     storeTopicEntity.setPromTypeName("每周活动");
                     storeTopicEntity.setStoreId(Integer.parseInt(storeTopicGoodsDto.getShopSn()));
                     storeTopicEntity.setIsValid("0");
-                    if(byMerchSn != null && byMerchSn.size() > 0){
-                        ThirdMerchantBizEntity thirdMerchantBizEntity = byMerchSn.get(0);
-                        storeTopicEntity.setThirdMerchSn(thirdMerchantBizEntity.getThirdMerchSn());
-                    }else{
-                        throw new RuntimeException("没有该第三方商户");
-                    }
                     storeTopicDao.save(storeTopicEntity);
 
                 }

kmall-admin/src/main/resources/conf/fastdfs.properties

@@ -1,7 +1,43 @@
+#\u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4
+connect_timeout=30
+
+#\u7F51\u7EDC\u8D85\u65F6\u65F6\u95F4
+network_timeout=60
+
+#\u6587\u4EF6\u8DEF\u5F84
+base_path=/data/files/
+
+#tracker server\u662FFastDFS\u6587\u4EF6\u7CFB\u7EDF\u7684\u534F\u8C03\u8005,\u5176\u4E3B\u8981\u4F5C\u7528\u662F\u8D1F\u8F7D\u5747\u8861\u548C\u8C03\u5EA6\u3002
+#Tracker server\u5728\u5185\u5B58\u4E2D\u8BB0\u5F55\u5206\u7EC4\u548CStorage server\u7684\u72B6\u6001\u7B49\u4FE1\u606F\uFF0C\u4E0D\u8BB0\u5F55\u6587\u4EF6\u7D22\u5F15\u4FE1\u606F
+tracker_server=192.168.1.251:22122
+
+log_level=info
+
+use_connection_pool = false
+
+connection_pool_max_idle_time = 3600
+
+load_fdfs_parameters_from_tracker=false
+
+use_storage_id = false
+
+storage_ids_filename = storage_ids.conf
+
+#HTTP \u670D\u52A1\u5668\u5730\u5740
+http.tracket_nginx_addr=192.168.1.251
+
+#HTTP \u670D\u52A1\u5668\u7AEF\u53E3\u53F7
+http.tracker_server_port=80
+
+#\u6587\u4EF6\u4F5C\u8005
+file.author=kmall-pt
+
+#
+##############\u751F\u4EA7\u73AF\u5883################
 ###\u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4
 #connect_timeout=30
-#
-##\u7F51\u7EDC\u8D85\u65F6\u65F6\u95F4
+##
+###\u7F51\u7EDC\u8D85\u65F6\u65F6\u95F4
 #network_timeout=60
 #
 ##\u6587\u4EF6\u8DEF\u5F84
@@ -9,7 +45,7 @@
 #
 ##tracker server\u662FFastDFS\u6587\u4EF6\u7CFB\u7EDF\u7684\u534F\u8C03\u8005,\u5176\u4E3B\u8981\u4F5C\u7528\u662F\u8D1F\u8F7D\u5747\u8861\u548C\u8C03\u5EA6\u3002
 ##Tracker server\u5728\u5185\u5B58\u4E2D\u8BB0\u5F55\u5206\u7EC4\u548CStorage server\u7684\u72B6\u6001\u7B49\u4FE1\u606F\uFF0C\u4E0D\u8BB0\u5F55\u6587\u4EF6\u7D22\u5F15\u4FE1\u606F
-#tracker_server=192.168.1.251:22122
+#tracker_server=120.76.26.84:22122
 #
 #log_level=info
 #
@@ -24,46 +60,10 @@
 #storage_ids_filename = storage_ids.conf
 #
 ##HTTP \u670D\u52A1\u5668\u5730\u5740
-#http.tracket_nginx_addr=192.168.1.251
+#http.tracket_nginx_addr=120.76.26.84
 #
 ##HTTP \u670D\u52A1\u5668\u7AEF\u53E3\u53F7
 #http.tracker_server_port=80
 #
 ##\u6587\u4EF6\u4F5C\u8005
 #file.author=kmall-pt
-
-
-#############\u751F\u4EA7\u73AF\u5883################
-##\u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4
-#connect_timeout=30
-#
-##\u7F51\u7EDC\u8D85\u65F6\u65F6\u95F4
-network_timeout=60
-
-#\u6587\u4EF6\u8DEF\u5F84
-base_path=/data/files/
-
-#tracker server\u662FFastDFS\u6587\u4EF6\u7CFB\u7EDF\u7684\u534F\u8C03\u8005,\u5176\u4E3B\u8981\u4F5C\u7528\u662F\u8D1F\u8F7D\u5747\u8861\u548C\u8C03\u5EA6\u3002
-#Tracker server\u5728\u5185\u5B58\u4E2D\u8BB0\u5F55\u5206\u7EC4\u548CStorage server\u7684\u72B6\u6001\u7B49\u4FE1\u606F\uFF0C\u4E0D\u8BB0\u5F55\u6587\u4EF6\u7D22\u5F15\u4FE1\u606F
-tracker_server=120.76.26.84:22122
-
-log_level=info
-
-use_connection_pool = false
-
-connection_pool_max_idle_time = 3600
-
-load_fdfs_parameters_from_tracker=false
-
-use_storage_id = false
-
-storage_ids_filename = storage_ids.conf
-
-#HTTP \u670D\u52A1\u5668\u5730\u5740
-http.tracket_nginx_addr=120.76.26.84
-
-#HTTP \u670D\u52A1\u5668\u7AEF\u53E3\u53F7
-http.tracker_server_port=80
-
-#\u6587\u4EF6\u4F5C\u8005
-file.author=kmall-pt

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

@@ -117,7 +117,9 @@
                 <i-button @click="reloadSearch">重置</i-button>
             </div>
             <div class="buttons-group" style="width: 100%;margin-top: 8px; padding-left: 10px;">
+                #if($shiro.hasPermission("goods:export"))
                 <i-button type="primary" @click="exportGoods"><i class="fa fa-cloud-download"></i>&nbsp;导出</i-button>
+                #end
                 #if($shiro.hasPermission("goods:save"))
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
                 #end

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

@@ -38,7 +38,7 @@
                 <i-input v-model="goodsBatch.sku" placeholder=""/>
             </Form-item>
             <Form-item label="批次到期时间" prop="batchExpireDate">
-                <i-input type='date' v-model="goodsBatch.batchExpireDate" placeholder=""/>
+                <i-input type='date' v-model="goodsBatch.batchExpireDate" placeholder=""  style="width:160px;"/>
             </Form-item>
 
             <Form-item>

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

@@ -32,7 +32,9 @@
                 </i-col>-->
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
+                #if($shiro.hasPermission("order:exportOffilineOrder"))
                 <i-button type="primary" @click="exportOffilineOrder"><i class="fa fa-cloud-download"></i>&nbsp;导出</i-button>
+                #end
             </div>
            <!-- TODO req_hidden_20200610 #if($shiro.hasPermission("order:wxMicropayPay"))
             <div class="buttons-group">

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

@@ -107,7 +107,9 @@
                     </Upload>
                 </i-col>
                 #end-->
+                #if($shiro.hasPermission("productstorerela:export"))
                 <i-button type="primary" @click="exportStoreProductStock"><i class="fa fa-cloud-download"></i>&nbsp;导出</i-button>
+                #end
                 #if($shiro.hasPermission("productstorerela:save"))
                 <i-button type="info" @click="add" v-show="!isSupplierShowByThirdSn||roleType"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
                 #end

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

@@ -65,6 +65,9 @@ let vm = new Vue({
 			],
             sku: [
                 {required: true, message: 'sku不能为空', trigger: 'blur'}
+            ],
+            batchExpireDate: [
+                {required: true, message: '批次到期日期不能为空', trigger: 'blur'}
             ]
 		},
 		q: {

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

@@ -61,9 +61,9 @@ let vm = new Vue({
 		goodsTransportInfoDetail: {},
         ruleValidate: {
             sku:{required: true, message: 'sku不能为空', trigger: 'blur'},
-            supplierId:{required: true, message: '供应商id不能为空', trigger: 'blur'},
+            supplierId:{ type:"number",  required: true, message: '供应商id不能为空', trigger: 'blur'},
             originCountry:{required: true, message: '原产地不能为空', trigger: 'blur'},
-            num:{required: true, message: '数量不能为空', trigger: 'blur'}
+            num:{ type:"number", required: true, message: '数量不能为空', trigger: 'blur'}
         },
 		q: {
             wayStatus: null,

kmall-admin/src/main/webapp/js/sys/notice.js

@@ -100,8 +100,20 @@ let vm = new Vue({
         title: null,
         sysNotice: {},
         ruleValidate: {
-            name: [
-                {required: true, message: '名称不能为空', trigger: 'blur'}
+            context: [
+                {required: true, message: '通知内容不能为空', trigger: 'blur'}
+            ],
+            title: [
+                {required: true, message: '通知标题不能为空', trigger: 'blur'}
+            ],
+            soucre: [
+                {required: true, message: '来源不能为空', trigger: 'blur'}
+            ],
+            status: [
+                {required: true, message: '通知状态不能为空', trigger: 'blur'}
+            ],
+            isUrgent: [
+                {required: true, message: '是否紧急不能为空', trigger: 'blur'}
             ]
         },
         q: {

kmall-manager/src/main/resources/conf/db.properties

@@ -28,7 +28,7 @@ jdbc.validationTimeout=4000
 
 ####========== \u751F\u4EA7\u73AF\u5883 ==========
 #\u963F\u91CC\u4E91\u5185\u7F51\u5730\u5740
-###jdbc.url=jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+##jdbc.url=jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
 #\u963F\u91CC\u4E91\u5916\u7F51\u5730\u5740
 #jdbc.url=jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_cw?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
 #jdbc.username=kmall_cw
@@ -48,8 +48,8 @@ jdbc.validationTimeout=4000
 #jdbc.connectionTimeout=5000
 #jdbc.maximumPoolSize=5
 #jdbc.validationTimeout=4000
-#
-#
+
+
 ###========== \u4E2D\u7F51\u56FD\u9645\u6570\u636E\u5E93\u5F00\u53D1\u73AF\u5883 ==========
 #jdbc.url=jdbc:mysql://120.76.84.45:3306/kmall_pt_global?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
 #jdbc.username=tuser
@@ -69,8 +69,8 @@ jdbc.validationTimeout=4000
 #jdbc.connectionTimeout=5000
 #jdbc.maximumPoolSize=5
 #jdbc.validationTimeout=4000
-
-
+#
+#
 ###========== \u4E2D\u7F51\u56FD\u9645\u6570\u636E\u5E93\u751F\u4EA7\u73AF\u5883 ==========
 ##\u963F\u91CC\u4E91\u5916\u7F51\u5730\u5740
 #jdbc.url=jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_pt_global?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8

kmall-manager/src/main/resources/conf/oms-merch.properties

@@ -18,11 +18,11 @@ merch.livenessRecognitionUrl=http://127.0.0.1:8680/al/faceid/livenessRecognition
 merch.quotaInquiryUrl=http://127.0.0.1:8680/al/cus/yearLimit
 
 
-###oms\u751F\u4EA7\u73AF\u5883\u5BC6\u94A5
+####oms\u751F\u4EA7\u73AF\u5883\u5BC6\u94A5
 #merch.md5Salt=IxyIvP0sJqlUZinx
-##oms\u751F\u4EA7\u73AF\u5883\u6D3B\u4F53\u4EBA\u8138\u6838\u8EAB\u63A5\u53E3
+###oms\u751F\u4EA7\u73AF\u5883\u6D3B\u4F53\u4EBA\u8138\u6838\u8EAB\u63A5\u53E3
 #merch.livenessRecognitionUrl=http://ws.ds-bay.com/al/faceid/livenessRecognition
-##oms\u6D4B\u8BD5\u73AF\u5883\u8DE8\u5883\u989D\u5EA6\u67E5\u8BE2\u63A5\u53E3
+###oms\u6D4B\u8BD5\u73AF\u5883\u8DE8\u5883\u989D\u5EA6\u67E5\u8BE2\u63A5\u53E3
 #merch.quotaInquiryUrl=http://ws.ds-bay.com/al/cus/yearLimit
 
 

kmall-manager/src/main/resources/conf/redis.properties

@@ -1,7 +1,7 @@
 ########## redis \u914D\u7F6E ##########
 
 # [dev, prod]
-redis.env = dev
+redis.env=dev
 
 # \u5F00\u53D1\u73AF\u5883
 redis.dev.keyPrefix=platform

kmall-manager/src/main/resources/conf/wx-mp.properties

@@ -1,7 +1,7 @@
 ########## \u5FAE\u4FE1\u5C0F\u7A0B\u5E8F\u914D\u7F6E ##########
 
 # [dev, prod]
-pay.wx.env = dev
+pay.wx.env=dev
 
 
 #========== \u5F00\u53D1\u73AF\u5883 ==========