修复页面bug

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

@@ -127,6 +127,10 @@ public class CategoryController {
     @RequestMapping("/update")
     @RequiresPermissions("category:update")
     public R update(@RequestBody CategoryEntity category) {
+        if (category.getSortOrder() == null) {
+            category.setSortOrder(0);
+        }
+
         category.setName(HtmlUtils.htmlUnescape(category.getName()));
         category.setFrontDesc(HtmlUtils.htmlUnescape(category.getFrontDesc()));
         categoryService.update(category);

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

@@ -49,6 +49,10 @@ public class MerchServiceImpl
 
     @Override
     public int update(MerchEntity merch) {
+        if (merch.getSortOrder() == null) {
+            merch.setSortOrder(0);
+        }
+
         MerchEntity tempMerch = merchDao.findByMerchSn(merch.getMerchSn());
         if(tempMerch != null && tempMerch.getId() != merch.getId()){
             throw new RRException("商户编号已经存在");

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

@@ -50,6 +50,8 @@ public class SupplierServiceImpl implements SupplierService {
     public int save(SupplierEntity supplier) {
         if(StringUtils.isEmpty(supplier.getLevelMerchSn())){
             throw new RRException("一级商户编号不能为空");
+        } else if (StringUtils.isEmpty(supplier.getThirdPartyMerchCode())) {
+            throw new RRException("第三方商户不能为空");
         }else{
             MerchEntity merchEntity = merchDao.findByMerchSn(supplier.getLevelMerchSn());
             if(merchEntity != null){
@@ -68,8 +70,14 @@ public class SupplierServiceImpl implements SupplierService {
 
     @Override
     public int update(SupplierEntity supplier) {
+        if (supplier.getSortOrder() == null) {
+            supplier.setSortOrder(0);
+        }
+
         if(StringUtils.isEmpty(supplier.getLevelMerchSn())){
             throw new RRException("一级商户编号不能为空");
+        } else if (StringUtils.isEmpty(supplier.getThirdPartyMerchCode())) {
+            throw new RRException("第三方商户不能为空");
         }else{
             MerchEntity merchEntity = merchDao.findByMerchSn(supplier.getLevelMerchSn());
             if(merchEntity != null){

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

@@ -47,7 +47,7 @@
                 <i-input v-model="merch.merchShortName" placeholder="商户简称"/>
             </Form-item>
             <Form-item label="排序" prop="sortOrder">
-                <i-input v-model="merch.sortOrder" placeholder="排序"/>
+                <Input-Number :min="0" :max="999" :step="1" v-model="merch.sortOrder" placeholder="排序" style="width: 188px;"/>
             </Form-item>
             <Form-item label="显示" prop="isShow">
                 <Radio-group v-model="merch.isShow">

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

@@ -64,7 +64,7 @@
                 <i-input v-model="supplier.childSupplierFlag" placeholder="二级供货商标识"/>
             </Form-item>
             <Form-item label="排序" prop="sortOrder">
-                <i-input v-model="supplier.sortOrder" placeholder="排序"/>
+                <Input-Number :min="0" :max="999" :step="1" v-model="supplier.sortOrder" placeholder="排序" style="width: 188px;"/>
             </Form-item>
             <Form-item label="是否禁用" prop="isShow">
                 <!--<i-input v-model="supplier.isShow" placeholder="是否禁用：0：否；1：是"/>-->

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

@@ -67,15 +67,6 @@ let vm = new Vue({
                 {required: true, message: '商户简称不能为空', trigger: 'blur'},
                 {max: 10, message: '商户简称长度不能超过10', trigger: 'blur'}
             ],
-            sortOrder: [
-                {
-                    type: 'integer', message: '排序只能输入正整数，最大不超过9999', trigger: 'blur', min: 0, max: 9999,
-                    transform(value) {
-                        return Number(value);
-                    }
-                },
-                {pattern: /^[1-9]\d*$/, message: '排序只能输入正整数', trigger: 'blur'}
-            ],
             remark: [
                 {max: 32, message: '备注长度不能超过32', trigger: 'blur'}
             ]

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

@@ -52,10 +52,12 @@ let vm = new Vue({
 		supplier: {childSupplierName: '', childSupplierFlag: '', isShow: 0},
 		ruleValidate: {
             childSupplierName: [
-				{required: true, message: '二级供货商名称不能为空', trigger: 'blur'}
+				{required: true, message: '二级供货商名称不能为空', trigger: 'blur'},
+                {max: 32, message: '二级供货商名称长度不能超过32', trigger: 'blur'}
 			],
             childSupplierFlag: [
-                {required: true, message: '二级供货商标识不能为空', trigger: 'blur'}
+                {required: true, message: '二级供货商标识不能为空', trigger: 'blur'},
+                {max: 20, message: '二级供货商标识长度不能超过20', trigger: 'blur'}
             ]
 		},
 		q: {