xwh修改除问题5之外的bug

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,6 +120,7 @@ public class Mk2GoodsTopicPriceServiceImpl implements Mk2GoodsTopicPriceService
                 }
                 // 1.保存门店活动
                 if(storeTopicEntity == null){
+                    storeTopicEntity = new StoreTopicEntity();
                     String merchSn = storeTopicGoodsDto.getMerchSn();
                     List<ThirdMerchantBizEntity> byMerchSn = thirdMerchantBizDao.findByMerchSn(merchSn);
                     if(byMerchSn != null && byMerchSn.size() > 0){
@@ -128,7 +129,6 @@ public class Mk2GoodsTopicPriceServiceImpl implements Mk2GoodsTopicPriceService
                     }else{
                         throw new RuntimeException("没有该第三方商户");
                     }
-                    storeTopicEntity = new StoreTopicEntity();
                     storeTopicEntity.setTitle(storeTopicGoodsDto.getTopic()); // 主题
                     storeTopicEntity.setContent(storeTopicGoodsDto.getTopicContent()); // 内容
                     storeTopicEntity.setSubtitle(storeTopicGoodsDto.getTopic());// 子标题

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/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: {