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

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

@@ -62,7 +62,7 @@ public class BrandServiceImpl implements BrandService {
 
         // 品牌唯一标识符正则校验
         String uniqueIdentifier = brand.getUniqueIdentifier();
-        String regex = "(^[0-9a-zA-Z_&]{1,10}$)";
+        String regex = "(^[0-9a-zA-Z_&-]{1,20}$)";
         if (StringUtils.isNotBlank(uniqueIdentifier)) {
             if (!Pattern.matches(regex, uniqueIdentifier)) {
                 throw new RuntimeException("请输入正确的品牌唯一简码,有问题的简码：" + uniqueIdentifier);
@@ -94,7 +94,7 @@ public class BrandServiceImpl implements BrandService {
 
         // 品牌唯一标识符正则校验
         String uniqueIdentifier = brand.getUniqueIdentifier();
-        String regex = "(^[0-9a-zA-Z_&]{1,10}$)";
+        String regex = "(^[0-9a-zA-Z_&-]{1,20}$)";
         if (StringUtils.isNotBlank(uniqueIdentifier)) {
             if (!Pattern.matches(regex, uniqueIdentifier)) {
                 throw new RuntimeException("请输入正确的品牌唯一简码,有问题的简码：" + uniqueIdentifier);

kmall-admin/src/main/webapp/js/cashier/salerecord.js

@@ -10,8 +10,7 @@ $(function () {
 			{label: '店员名称', name: 'sallerName', index: 'sallerName',align: 'center', width: 120},
 			{label: '门店名称', name: 'storeName', index: 'storeName',align: 'center', width: 120},
 			{label: '活动id', name: 'discountId', index: 'discount_id', align: 'center', width: 120,formatter:function(value){
-				console.log(typeof value);
-				if(value === '0'){
+				if(value === '0' || value == null){
 					return '-';
 				}
 				return value;

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

@@ -159,7 +159,7 @@ var vm = new Vue({
             ],
             uniqueIdentifier: [
                 // {required: true, message: '品牌唯一简码不能为空', trigger: 'blur'},
-                {max: 10, message: '品牌唯一简码长度不能超过10', trigger: 'blur'}
+                {max: 20, message: '品牌唯一简码长度不能超过20', trigger: 'blur'}
             ],
             // listPicUrl: [
             //     {required: true, message: '品牌图片不能为空', trigger: 'blur'}
@@ -300,7 +300,7 @@ var vm = new Vue({
 
             // 校验品牌唯一简码
             var uniqueIdentifier = vm.brand.uniqueIdentifier;
-            var uniqueReg = /^[0-9a-zA-Z_]{0,10}$/;
+            var uniqueReg = /^[0-9a-zA-Z_&-]{0,20}$/;
             if(!uniqueReg.test(uniqueIdentifier)){
                 alert("请输入正确的唯一简码");
                 return;

sql/cuspay/merch_noti.sql

@@ -1,4 +1,4 @@
-create table merch_noti
+create table `kmall-haikong`.merch_noti
 (
     noti_sn                varchar(22)                           not null comment '通知编号'
         primary key,
@@ -29,7 +29,8 @@ create table merch_noti
     create_time            varchar(32)                           null comment '创建时间,yyyy-MM-dd HH:mm:ss',
     moder_sn               varchar(22)                           null comment '修改人编号',
     mod_time               varchar(32)                           null comment '修改时间,yyyy-MM-dd HH:mm:ss',
-    tstm                   timestamp   default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '时间戳'
+    tstm                   timestamp   default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '时间戳',
+    order_sn               varchar(32)                           null comment '订单号'
 )
     comment '商户通知，通知编号:支付订单号=1:n' charset = utf8;