diff --git a/1 b/1
index 579bf2448e5853c68304b007110e3b2a24f0394f..773dffc8493fa51c88bd9549c1cc4ebec05c6244 100644
--- a/1
+++ b/1
@@ -61,20 +61,41 @@ send_timeout 45;
 
 
     }
+server {
+        listen 80;
+        server_name www.yjlive.cn;
+
+        error_page 500 502 503 504 /50x.html;
+            location = /50x.html {
+            root html;
+        }
 
+		location / {
+            alias /root/jm/h5/;
+            index index.html;
+        }
+
+        location /h5 {
+            alias  /root/jm/mall/;
+			try_files $uri $uri/ @router;
+			index index.html;
+        }
+        location /api {
+            rewrite  ^/api/(.*)$ /$1 break;
+            include  uwsgi_params;
+            proxy_pass   http://39.106.212.32:8081 ;
+        }
+        location @router {
+        rewrite ^.*$ /index.html last;
+        }
+    }
 server {
     listen 8082;
     server_name _;
     root /root/jm/h5;
     index index.html;
 }
-server {
-    listen 8083;
-    server_name _;
-    root /root/jm/mall;
-    index index.html;
-try_files $uri $uri/ /index.html;
-}
+
 server {
     listen 8084;
     server_name _;
@@ -83,13 +104,7 @@ server {
 try_files $uri $uri/ /index.html;
 }
 
-server {
-    listen 8087;
-    server_name _;
-    root /root/jm/jsshop;
-    index index.html;
-try_files $uri $uri/ /index.html;
-}
+
 server {
     listen 8088;
     server_name _;
diff --git a/3 b/3
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..da921e40e28b795286a12d3d9ad3a9b5617fed26 100644
--- a/3
+++ b/3
@@ -0,0 +1,10 @@
+  location /mall {
+                                    alias  /root/jm/mall/;
+                        			try_files $uri $uri/ @router;
+                        			index index.html;
+                                }
+                                  location /jsshop {
+                                                                    alias  /root/jm/jsshop/;
+                                                        			try_files $uri $uri/ @router;
+                                                        			index index.html;
+                                                                }
diff --git a/h b/h
index d2fa5299e5565f0590d5772cda4a84d858532956..9745ce93dea809b504065bef223a1ffe871e6179 100644
--- a/h
+++ b/h
@@ -1,124 +1,126 @@
-CREATE TABLE `sms_bargain_config` (
-  `id` bigint(11) unsigned NOT NULL COMMENT 'id',
-  `plug_ins_id` bigint(11) NOT NULL DEFAULT '0' COMMENT '插件id',
-  `can_num` int(11) DEFAULT NULL COMMENT '能砍的次数',
-  `help_num` int(11) DEFAULT NULL COMMENT '每天最多帮别人砍的次数',
-  `parameter` char(11) DEFAULT NULL COMMENT '每次砍价的参数',
-  `invalid_time` int(11) DEFAULT NULL COMMENT '逾期失效时间',
-  `add_time` datetime NULL DEFAULT NULL COMMENT '修改时间'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='砍价免单设置表';
-
-CREATE TABLE `sms_bargain_record` (
-  `id` bigint(11) unsigned NOT NULL COMMENT 'id',
-  `s_id` bigint(11) NOT NULL DEFAULT '0' COMMENT '属性id',
-  `user_id` bigint(15) NOT NULL COMMENT '用户ID',
-  `money` decimal(12,2) NOT NULL DEFAULT '0.00' COMMENT '金额',
-  `add_time` datetime NULL DEFAULT NULL COMMENT '添加时间',
-  `event` varchar(200) DEFAULT NULL COMMENT '事件',
-  `name` varchar(15) NOT NULL COMMENT '收货人',
-  `tel` char(15) NOT NULL COMMENT '联系方式',
-  `sheng` int(11) NOT NULL DEFAULT '0' COMMENT '省',
-  `city` int(11) NOT NULL DEFAULT '0' COMMENT '市',
-  `quyu` int(11) NOT NULL DEFAULT '0' COMMENT '县',
-  `address` varchar(255) NOT NULL COMMENT '收货地址（不加省市区）',
-  `status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '状态 0:砍价中 1:砍价成功 2:逾期失效 3:生成订单',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='砍价免单记录表';
-
-CREATE TABLE `sms_draw_user` (
-  `id` bigint(11) NOT NULL COMMENT 'ID',
-  `draw_id` bigint(11) DEFAULT NULL COMMENT '拼团ID',
-  `user_id` bigint(30) DEFAULT NULL COMMENT '用户ID',
-  `time` datetime NULL DEFAULT NULL COMMENT '用户参团时间',
-  `role` varchar(30) DEFAULT '0' COMMENT '用户角色（默认 0：团长  userid:该用户分享进来的用户）',
-  `lottery_status` int(11) DEFAULT '0' COMMENT '抽奖状态（0.参团中 1.待抽奖 2.参团失败 3.抽奖失败 4.抽奖成功）'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='抽奖与用户关联表';
-
-CREATE TABLE `sms_experience` (
-  `id` bigint(11) unsigned NOT NULL COMMENT 'id',
-  `user_id` bigint(15) NOT NULL DEFAULT '' COMMENT '用户id',
-  `seller_id` bigint(15) NOT NULL DEFAULT '' COMMENT '商家id',
-  `name` varchar(20) NOT NULL DEFAULT '' COMMENT '姓名',
-  `mobile` varchar(20) DEFAULT NULL COMMENT '手机',
-  `address` varchar(300) DEFAULT NULL COMMENT '地址',
-  `num` int(11) NOT NULL DEFAULT '0' COMMENT '数量',
-  `content` text NOT NULL COMMENT '内容',
-  `add_date` timestamp NULL DEFAULT NULL COMMENT '添加时间',
-  `status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '类型 0:申请预约 1:已预约 2:取消预约 3:完成'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='预约表';
-
-
-CREATE TABLE `sms_detailed_commission` (
-  `id` bigint(11) NOT NULL AUTO_INCREMENT COMMENT 'id',
-  `userid` bigint(50) DEFAULT NULL,
-  `sNo` varchar(255) DEFAULT NULL COMMENT '订单号',
-  `money` float(10,2) DEFAULT '0.00' COMMENT '应发佣金',
-  `s_money` float(10,2) DEFAULT '0.00' COMMENT '实发佣金',
-  `status` int(2) DEFAULT '1' COMMENT '1.未发放，2.已发放',
-  `addtime` datetime DEFAULT NULL COMMENT '添加时间',
-  `type` int(2) DEFAULT NULL COMMENT '类型',
-  `Referee` varchar(50) DEFAULT NULL COMMENT '上级',
-  `recycle` int(2) DEFAULT '0' COMMENT '0 不回收  1.回收',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='分销佣金明细表';
-
-
-CREATE TABLE `sms_sign_activity` (
-  `id` bigint(11) unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
-  `image` char(30) NOT NULL DEFAULT '' COMMENT '图片',
-  `starttime` char(20) NOT NULL DEFAULT '' COMMENT '签到活动开始时间',
-  `endtime` char(20) NOT NULL DEFAULT '' COMMENT '签到活动结束时间',
-  `detail` text COMMENT '签到活动详情',
-  `add_time` timestamp NULL DEFAULT NULL COMMENT '修改时间',
-  `status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '状态 0：未启用 1：启用 2：已结束',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='签到活动';
-
-CREATE TABLE `sms_share` (
-  `id` bigint(11) unsigned NOT NULL COMMENT 'id',
-  `user_id` char(15) DEFAULT NULL COMMENT '用户id',
-  `wx_id` varchar(50) DEFAULT NULL COMMENT '微信id',
-  `wx_name` varchar(150) DEFAULT NULL COMMENT '微信昵称',
-  `sex` int(11) DEFAULT NULL COMMENT '性别 0:未知 1:男 2:女',
-  `type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '类别 0：新闻 1：文章',
-  `Article_id` bigint(11) NOT NULL DEFAULT '0' COMMENT '新闻id',
-  `share_add` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '分享时间',
-  `coupon` decimal(12,2) NOT NULL DEFAULT '0.00' COMMENT '礼券',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='分享列表';
-
-CREATE TABLE `sms_sign_config` (
-  `id` bigint(11) unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
-  `plug_ins_id` bigint(11) NOT NULL DEFAULT '0' COMMENT '插件id',
-  `imgurl` varchar(200) NOT NULL COMMENT '图片',
-  `min_score` int(11) NOT NULL DEFAULT '0' COMMENT '领取的最少积分',
-  `max_score` int(11) NOT NULL DEFAULT '0' COMMENT '领取的最大积分',
-  `continuity_three` int(11) NOT NULL DEFAULT '0' COMMENT '连续签到7天',
-  `continuity_twenty` int(11) NOT NULL DEFAULT '0' COMMENT '连续签到20天',
-  `continuity_thirty` int(11) NOT NULL DEFAULT '0' COMMENT '连续签到30天',
-  `activity_overdue` int(11) NOT NULL DEFAULT '0' COMMENT '活动过期删除时间',
-  `modify_date` timestamp NULL DEFAULT NULL COMMENT '修改时间',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='签到配置表';
-
-CREATE TABLE `sms_sign_record` (
-  `bigint` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
-  `user_id` bigint(15) NOT NULL COMMENT '用户ID',
-  `sign_score` int(11) NOT NULL DEFAULT '0' COMMENT '签到积分',
-  `record` char(20) DEFAULT NULL COMMENT '事件',
-  `sign_time` timestamp NULL DEFAULT NULL COMMENT '签到时间',
-  `type` int(4) NOT NULL DEFAULT '0' COMMENT '类型: 0:签到 1:消费 2:首次关注得积分 3:转积分给好友 4:好友转积分 5:系统扣除 6:系统充值 7:抽奖',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='签到记录';
-
-CREATE TABLE `sms_system_message` (
-  `id` bigint(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
-  `senderid` bigint(30) NOT NULL COMMENT '发送人ID',
-  `recipientid` bigint(30) NOT NULL COMMENT '接收人ID',
-  `title` text COMMENT '标题',
-  `content` text COMMENT '内容',
-  `time` datetime DEFAULT NULL COMMENT '时间',
-  `type` int(2) NOT NULL DEFAULT '1' COMMENT '1未读  2 已读',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='系统消息表';
 
+#user  nobody;
+worker_processes  1;
+
+#error_log  logs/error.log;
+#error_log  logs/error.log  notice;
+#error_log  logs/error.log  info;
+
+#pid        logs/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+    #                  '$status $body_bytes_sent "$http_referer" '
+    #                  '"$http_user_agent" "$http_x_forwarded_for"';
+
+    #access_log  logs/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    #keepalive_timeout  0;
+    keepalive_timeout  165;
+client_header_timeout 45;
+
+client_body_timeout 45;
+
+send_timeout 45;
+
+    #gzip  on;
+
+    server {
+        listen       8090;
+        server_name  39.106.212.32;
+	client_max_body_size 10M;
+        #charset koi8-r;
+
+        #access_log  logs/host.access.log  main;
+        location / {
+  root /root/jm/dist;
+  index index.html;
+}
+
+
+        #error_page  404              /404.html;
+
+        # redirect server error pages to the static page /50x.html
+        #
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+
+
+    }
+server {
+        listen 80;
+        server_name www.yjlive.cn;
+
+        error_page 500 502 503 504 /50x.html;
+            location = /50x.html {
+            root html;
+        }
+
+		location / {
+            alias /root/jm/h5/;
+            index index.html;
+        }
+
+        location /h5 {
+            alias  /root/jm/mall/;
+			try_files $uri $uri/ @router;
+			index index.html;
+        }
+         location /cms {
+                    alias  /root/jm/cms/;
+        			try_files $uri $uri/ @router;
+        			index index.html;
+                }
+                 location /pc {
+                            alias  /root/jm/pc/;
+                			try_files $uri $uri/ @router;
+                			index index.html;
+                        }
+                           location /pcbak {
+                                                    alias  /root/jm/pcbak/;
+                                        			try_files $uri $uri/ @router;
+                                        			index index.html;
+                                                }
+                         location /h5bak {
+                                    alias  /root/jm/h5bak/;
+                        			try_files $uri $uri/ @router;
+                        			index index.html;
+                                }
+
+                                location /mei {
+                                                                    alias  /root/jm/mei/;
+                                                        			try_files $uri $uri/ @router;
+                                                        			index index.html;
+                                                                }
+                                                                 location /mei1 {
+                                                                                                                                    alias  /root/jm/mei1/;
+                                                                                                                        			try_files $uri $uri/ @router;
+                                                                                                                        			index index.html;
+                                                                                                                                }
+        location /api {
+            rewrite  ^/api/(.*)$ /$1 break;
+            include  uwsgi_params;
+            proxy_pass   http://39.106.212.32:8081 ;
+        }
+        location @router {
+        rewrite ^.*$ /index.html last;
+        }
+    }
+
+
+
+ }
diff --git a/mallplus-admin/pom.xml b/mallplus-admin/pom.xml
index 0e57bd5627410bd27ea25e987b7a0e80375afd33..37a48bd8fcd82011e5dc2ce769a70b6ab20d78c0 100644
--- a/mallplus-admin/pom.xml
+++ b/mallplus-admin/pom.xml
@@ -77,6 +77,11 @@
             <artifactId>mallplus-mbg</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.zscat.mallplus</groupId>
+            <artifactId>mallplus-wechat</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/ApiContext.java b/mallplus-admin/src/main/java/com/zscat/mallplus/ApiContext.java
deleted file mode 100644
index f8af47296e3b9fe21e885192c7d7d2554bcd01e0..0000000000000000000000000000000000000000
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/ApiContext.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.zscat.mallplus;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class ApiContext {
-
-
-
-}
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/CommandLineRunnerImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/CommandLineRunnerImpl.java
index fefff8bbd16a504e1d393d76fb8c4ee51bbd013d..86e445dc15f0a3327e4f33c04e8861ab933ac640 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/CommandLineRunnerImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/CommandLineRunnerImpl.java
@@ -14,6 +14,9 @@ public class CommandLineRunnerImpl implements CommandLineRunner {
     @Autowired
     GeneratorMapper generatorMapper;
 
+    public static void main(String[] args) {
+        System.out.println("http://localhost:8080/cms/CmsSubjectCategory/list".replace("//", "a").indexOf("/") + 1);
+    }
 
     @Override
     public void run(String... args) throws Exception {
@@ -30,8 +33,4 @@ public class CommandLineRunnerImpl implements CommandLineRunner {
         }*/
 
     }
-
-    public static void main(String[] args) {
-        System.out.println( "http://localhost:8080/cms/CmsSubjectCategory/list".replace("//","a").indexOf("/") + 1);
-    }
-}
\ No newline at end of file
+}
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/ExportSubject.java b/mallplus-admin/src/main/java/com/zscat/mallplus/ExportSubject.java
index 716799cce15a277b3a8fd84b7735ee7ddf416802..05059184f8116ecf7f91cda7949cc17ef3fc7800 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/ExportSubject.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/ExportSubject.java
@@ -17,8 +17,5 @@ public class ExportSubject {
     private String content;
 
 
-
-
-
 }
 
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/ExportUser.java b/mallplus-admin/src/main/java/com/zscat/mallplus/ExportUser.java
index a68861a8217b958f4264904535c2a5c3ce4ca150..81d73a6de3cb23dfc931635013b09f95fea8e2fa 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/ExportUser.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/ExportUser.java
@@ -1,12 +1,10 @@
 package com.zscat.mallplus;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.aliyun.oss.common.utils.DateUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.text.SimpleDateFormat;
 import java.util.Date;
 
 @Data
@@ -20,6 +18,5 @@ public class ExportUser {
     private Date createTime;
 
 
-
 }
 
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/bill/controller/BillAftersalesController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/bill/controller/BillAftersalesController.java
index e1db08a6c58514bd9360c2668df2705b7ce0fee0..b4bafe088f9f939d1c38ac024dfc5b08ad26bba1 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/bill/controller/BillAftersalesController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/bill/controller/BillAftersalesController.java
@@ -48,6 +48,5 @@ public class BillAftersalesController {
     }
 
 
-
 }
 
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/bo/ColumnInfo.java b/mallplus-admin/src/main/java/com/zscat/mallplus/bo/ColumnInfo.java
index 9e4ab2a8aec4d9b5032835f4dc76e8f6a39428b5..186d25e170839621a8165e00d1251d0170c17b41 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/bo/ColumnInfo.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/bo/ColumnInfo.java
@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * 列的数据信息
+ *
  * @author mallplus
  * @date 2019-01-02
  */
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/bo/SysLogAspect.java b/mallplus-admin/src/main/java/com/zscat/mallplus/bo/SysLogAspect.java
index b1289642f527d2ed7b42079109f40979d6dac6a5..61bb1b75210a8f3164d04cb12d23019f977218a4 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/bo/SysLogAspect.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/bo/SysLogAspect.java
@@ -145,7 +145,7 @@ public class SysLogAspect {
             logger.info(getString(sysLog));
 
             //保存系统日志
-        //    fopSystemOperationLogService.save(sysLog);
+            //    fopSystemOperationLogService.save(sysLog);
         } catch (Exception ex) {
             logger.error("保存系统日志失败");
         }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/bo/TableInfo.java b/mallplus-admin/src/main/java/com/zscat/mallplus/bo/TableInfo.java
index 610d69120441e563eeb521d29522be6e0b162e99..2f19cd2784969531907746002251f2c2210dc784 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/bo/TableInfo.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/bo/TableInfo.java
@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * 表的数据信息
+ *
  * @author mallplus
  * @date 2019-01-02
  */
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildApplyRoomController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildApplyRoomController.java
index 964486a758aa165a9b3047b592cedb3bc785ae14..cd4892df06e007dc47f2de3415be47f05cb281a0 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildApplyRoomController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildApplyRoomController.java
@@ -1,13 +1,12 @@
 package com.zscat.mallplus.build.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildGroupController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildGroupController.java
index a7ca7cd5868ef4ff733ab16c860a13613a3c0a13..5f198fcc82d849f88243835643c704d45e92723f 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildGroupController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildGroupController.java
@@ -21,7 +21,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author zscat
@@ -40,8 +40,8 @@ public class BuildGroupController {
     @GetMapping(value = "/list")
     @PreAuthorize("hasAuthority('build:group:read')")
     public Object getBuildGroupByPage(BuildGroup entity,
-                                    @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
+                                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
     ) {
         try {
             return new CommonResult().success(IBuildGroupService.page(new Page<BuildGroup>(pageNum, pageSize), new QueryWrapper<>(entity)));
@@ -133,6 +133,7 @@ public class BuildGroupController {
             return new CommonResult().failed();
         }
     }
+
     @GetMapping("/exportExcel")
     public void export(HttpServletResponse response, BuildGroup entity) {
         // 模拟从数据库获取需要导出的数据
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildGroupMemberController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildGroupMemberController.java
index 8971f1f1d66f293ef01783f01c805ad3963c5ef3..f144c4cab8ffed0f88b7a133250d41d5aa4ffb00 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildGroupMemberController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildGroupMemberController.java
@@ -21,7 +21,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author zscat
@@ -41,8 +41,8 @@ public class BuildGroupMemberController {
     @GetMapping(value = "/list")
     @PreAuthorize("hasAuthority('build:groupMember:read')")
     public Object getBuildGroupMemberByPage(BuildGroupMember entity,
-                                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
+                                            @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
     ) {
         try {
             return new CommonResult().success(IBuildGroupMemberService.page(new Page<BuildGroupMember>(pageNum, pageSize), new QueryWrapper<>(entity)));
@@ -134,6 +134,7 @@ public class BuildGroupMemberController {
             return new CommonResult().failed();
         }
     }
+
     @GetMapping("/exportExcel")
     public void export(HttpServletResponse response, BuildGroupMember entity) {
         // 模拟从数据库获取需要导出的数据
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildNoticeController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildNoticeController.java
index 724df82713da20c07af3e2389d32fee77e038813..ac8089634cf31c6b67112a53be56a7cd50b4e1af 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildNoticeController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildNoticeController.java
@@ -42,8 +42,8 @@ public class BuildNoticeController {
     @GetMapping(value = "/list")
     @PreAuthorize("hasAuthority('build:notice:read')")
     public Object getBuildNoticeByPage(BuildNotice entity,
-                                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
+                                       @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
     ) {
         try {
             return new CommonResult().success(IBuildNoticeService.page(new Page<BuildNotice>(pageNum, pageSize), new QueryWrapper<>(entity)));
@@ -135,6 +135,7 @@ public class BuildNoticeController {
             return new CommonResult().failed();
         }
     }
+
     @GetMapping("/exportExcel")
     public void export(HttpServletResponse response, BuildNotice entity) {
         // 模拟从数据库获取需要导出的数据
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildRepairController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildRepairController.java
index 13300b6a246aa1e46d2d624feec808efa7bbb89f..ad6c091410716ee90c043a02033687c5a2096f25 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildRepairController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildRepairController.java
@@ -21,7 +21,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author zscat
@@ -132,6 +132,7 @@ public class BuildRepairController {
             return new CommonResult().failed();
         }
     }
+
     @GetMapping("/exportExcel")
     public void export(HttpServletResponse response, BuildRepair entity) {
         // 模拟从数据库获取需要导出的数据
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildTypePriceController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildTypePriceController.java
index 093c43bdc25307d76ce81f7b922950b80b42e7d0..b9c6a4fe26edb17e39da757ec38a5cc38ccea92a 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildTypePriceController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildTypePriceController.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author zscat
@@ -41,8 +41,8 @@ public class BuildTypePriceController {
     @GetMapping(value = "/list")
     @PreAuthorize("hasAuthority('build:typePrice:read')")
     public Object getBuildTypePriceByPage(BuildTypePrice entity,
-                                       @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
+                                          @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
     ) {
         try {
             return new CommonResult().success(IBuildTypePriceService.page(new Page<BuildTypePrice>(pageNum, pageSize), new QueryWrapper<>(entity)));
@@ -134,6 +134,7 @@ public class BuildTypePriceController {
             return new CommonResult().failed();
         }
     }
+
     @GetMapping("/exportExcel")
     public void export(HttpServletResponse response, BuildTypePrice entity) {
         // 模拟从数据库获取需要导出的数据
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildWuyeCompanyController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildWuyeCompanyController.java
index 239ac74564102fa866d319d4eb2d0abb70e1ad7e..46898c10fc7c15e039c53c4fbb3f7c1648993d9b 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildWuyeCompanyController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildWuyeCompanyController.java
@@ -21,7 +21,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author zscat
@@ -40,8 +40,8 @@ public class BuildWuyeCompanyController {
     @GetMapping(value = "/list")
     @PreAuthorize("hasAuthority('build:wuyeCompany:read')")
     public Object getBuildWuyeCompanyByPage(BuildWuyeCompany entity,
-                                          @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
+                                            @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
     ) {
         try {
             return new CommonResult().success(IBuildWuyeCompanyService.page(new Page<BuildWuyeCompany>(pageNum, pageSize), new QueryWrapper<>(entity)));
@@ -133,6 +133,7 @@ public class BuildWuyeCompanyController {
             return new CommonResult().failed();
         }
     }
+
     @GetMapping("/exportExcel")
     public void export(HttpServletResponse response, BuildWuyeCompany entity) {
         // 模拟从数据库获取需要导出的数据
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildWuyePriceController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildWuyePriceController.java
index c06fdbefb82200d44710eedd61b7006c79c2e396..ab8405b594d0e5db3a153db1ef8a4eded2734442 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildWuyePriceController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildWuyePriceController.java
@@ -23,7 +23,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author zscat
@@ -44,8 +44,8 @@ public class BuildWuyePriceController {
     @GetMapping(value = "/list")
     @PreAuthorize("hasAuthority('build:wuyePrice:read')")
     public Object getBuildWuyePriceByPage(BuildWuyePrice entity,
-                                            @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
+                                          @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
     ) {
         try {
             return new CommonResult().success(IBuildWuyePriceService.page(new Page<BuildWuyePrice>(pageNum, pageSize), new QueryWrapper<>(entity)));
@@ -61,11 +61,11 @@ public class BuildWuyePriceController {
     @PreAuthorize("hasAuthority('build:wuyePrice:create')")
     public Object saveBuildWuyePrice(@RequestBody BuildWuyePrice entity) {
         try {
-            if (ValidatorUtils.empty(entity.getAmount())||ValidatorUtils.empty(entity.getPrice())){
+            if (ValidatorUtils.empty(entity.getAmount()) || ValidatorUtils.empty(entity.getPrice())) {
                 return new CommonResult().failed("请输入价格");
             }
-            BuildingRoom room =IBuildingRoomService.getById(entity.getRoomId());
-            if (room!=null && room.getRoomDesc()!=null){
+            BuildingRoom room = IBuildingRoomService.getById(entity.getRoomId());
+            if (room != null && room.getRoomDesc() != null) {
                 entity.setRoomDesc(room.getRoomDesc());
             }
             entity.setCreateDate(new Date());
@@ -145,6 +145,7 @@ public class BuildWuyePriceController {
             return new CommonResult().failed();
         }
     }
+
     @GetMapping("/exportExcel")
     public void export(HttpServletResponse response, BuildWuyePrice entity) {
         // 模拟从数据库获取需要导出的数据
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingCommunityController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingCommunityController.java
index de26224f9640dcfaf6f64e98b051144401699ea0..4b4a3246f004e989a299819da272219fd735dad5 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingCommunityController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingCommunityController.java
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zscat.mallplus.annotation.SysLog;
 import com.zscat.mallplus.build.entity.BuildingCommunity;
 import com.zscat.mallplus.util.EasyPoiUtils;
-import com.zscat.mallplus.util.UserUtils;
 import com.zscat.mallplus.utils.CommonResult;
 import com.zscat.mallplus.utils.ValidatorUtils;
 import io.swagger.annotations.ApiOperation;
@@ -61,10 +60,10 @@ public class BuildingCommunityController {
         try {
             entity.setCreateTime(new Date());
             entity.setStatus(3);
-            if (ValidatorUtils.empty(entity.getCompanyId())){
-                entity.setCompanyId(UserUtils.getCurrentMember().getStoreId());
+            if (ValidatorUtils.empty(entity.getCompanyId())) {
+                //     entity.setCompanyId(UserUtils.getCurrentMember().getStoreId());
             }
-            if (ValidatorUtils.empty(entity.getCompanyId())){
+            if (ValidatorUtils.empty(entity.getCompanyId())) {
                 return new CommonResult().failed("请选择物业攻啊");
             }
             if (IBuildingCommunityService.saveCommunity(entity)) {
@@ -142,8 +141,9 @@ public class BuildingCommunityController {
             return new CommonResult().failed();
         }
     }
+
     @GetMapping("/exportExcel")
-    public void export(HttpServletResponse response,BuildingCommunity entity) {
+    public void export(HttpServletResponse response, BuildingCommunity entity) {
         // 模拟从数据库获取需要导出的数据
         List<BuildingCommunity> personList = IBuildingCommunityService.list(new QueryWrapper<>(entity));
         // 导出操作
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingFloorController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingFloorController.java
index 684afebc7823ba0abe95fe23db82263f29889c1e..7709a2d15f7197e7ab5a552fad8dadc2b9bd21f5 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingFloorController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingFloorController.java
@@ -23,7 +23,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author zscat
@@ -59,7 +59,7 @@ public class BuildingFloorController {
 
     public Object saveBuildingFloor(@RequestBody BuildingFloor entity) {
         try {
-            if (ValidatorUtils.empty(entity.getCommunityId())){
+            if (ValidatorUtils.empty(entity.getCommunityId())) {
                 return new CommonResult().failed("请选择小区");
             }
             entity.setCreateTime(new Date());
@@ -138,6 +138,7 @@ public class BuildingFloorController {
             return new CommonResult().failed();
         }
     }
+
     @GetMapping("/exportExcel")
     public void export(HttpServletResponse response, BuildingFloor entity) {
         // 模拟从数据库获取需要导出的数据
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingOwnerController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingOwnerController.java
index dfa0129577e9dfb3d03e123081173ee315f378da..734e3f1a1203f3ad94e560c8112e00c5471359ee 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingOwnerController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingOwnerController.java
@@ -59,15 +59,15 @@ public class BuildingOwnerController {
 
     public Object saveBuildingOwner(@RequestBody BuildingOwner entity) {
         try {
-            if (ValidatorUtils.empty(entity.getRoomId())){
+            if (ValidatorUtils.empty(entity.getRoomId())) {
                 return new CommonResult().failed("请选择房屋");
             }
             entity.setCreateTime(new Date());
-            if (entity.getType()==2 || entity.getType()==3){
-                List<BuildingOwner> list = IBuildingOwnerService.list(new QueryWrapper<BuildingOwner>().eq("room_id",entity.getRoomId()).eq("type",1).orderByAsc("id"));
-                if (list!=null && list.size()>0){
+            if (entity.getType() == 2 || entity.getType() == 3) {
+                List<BuildingOwner> list = IBuildingOwnerService.list(new QueryWrapper<BuildingOwner>().eq("room_id", entity.getRoomId()).eq("type", 1).orderByAsc("id"));
+                if (list != null && list.size() > 0) {
                     entity.setOwnerId(list.get(0).getId());
-                }else {
+                } else {
                     return new CommonResult().failed("请先添加一个业主");
                 }
             }
@@ -146,6 +146,7 @@ public class BuildingOwnerController {
             return new CommonResult().failed();
         }
     }
+
     @GetMapping("/exportExcel")
     public void export(HttpServletResponse response, BuildingOwner entity) {
         // 模拟从数据库获取需要导出的数据
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingRoomController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingRoomController.java
index a739dc7c3aab846ee8e8507cb3d29f05e6c32273..930b35e09109be759a5cdde0920030c4baa12597 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingRoomController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingRoomController.java
@@ -49,6 +49,7 @@ public class BuildingRoomController {
     private IBuildingFloorService floorService;
     @Resource
     private IBuildingCommunityService communityService;
+
     @SysLog(MODULE = "build", REMARK = "根据条件查询所有房间表列表")
     @ApiOperation("根据条件查询所有房间表列表")
     @GetMapping(value = "/list")
@@ -71,8 +72,8 @@ public class BuildingRoomController {
     public Object withChilds(BuildingFloor entity) {
         try {
             List<BuildingFloor> floors = floorService.list(new QueryWrapper<>(entity));
-            for (BuildingFloor floor : floors){
-               List<BuildingRoom> list = IBuildingRoomService.list(new QueryWrapper<BuildingRoom>().eq("floor_id",floor.getId()));
+            for (BuildingFloor floor : floors) {
+                List<BuildingRoom> list = IBuildingRoomService.list(new QueryWrapper<BuildingRoom>().eq("floor_id", floor.getId()));
                 floor.setChildren(list);
             }
             return new CommonResult().success(floors);
@@ -81,21 +82,23 @@ public class BuildingRoomController {
         }
         return new CommonResult().failed();
     }
+
     @SysLog(MODULE = "build", REMARK = "保存房间表")
     @ApiOperation("保存房间表")
     @PostMapping(value = "/create")
 
     public Object saveBuildingRoom(@RequestBody BuildingRoom entity) {
         try {
-            if (ValidatorUtils.empty(entity.getUnitId())){
+            if (ValidatorUtils.empty(entity.getUnitId())) {
                 return new CommonResult().failed("请选择单元");
             }
             entity.setCreateTime(new Date());
             BuildingUnit unit = unitService.getById(entity.getUnitId());
             BuildingFloor floor = floorService.getById(unit.getFloorId());
-            entity.setFloorId(floor.getId());entity.setCommunityId(floor.getCommunityId());
+            entity.setFloorId(floor.getId());
+            entity.setCommunityId(floor.getCommunityId());
             BuildingCommunity community = communityService.getById(floor.getCommunityId());
-            entity.setRoomDesc(community.getName()+"-"+floor.getName()+"-"+unit.getUnitNum()+"-"+entity.getRoomNum());
+            entity.setRoomDesc(community.getName() + "-" + floor.getName() + "-" + unit.getUnitNum() + "-" + entity.getRoomNum());
             entity.setLayer(floor.getLayerCount());
             entity.setId(IdWorker.getId());
             if (IBuildingRoomService.save(entity)) {
@@ -173,6 +176,7 @@ public class BuildingRoomController {
             return new CommonResult().failed();
         }
     }
+
     @GetMapping("/exportExcel")
     public void export(HttpServletResponse response, BuildingRoom entity) {
         // 模拟从数据库获取需要导出的数据
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingUnitController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingUnitController.java
index ace829faad88cab139e56c08a368d4ab82a028f4..1a65c3432e3b7adba785cd63a1479111070729eb 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingUnitController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingUnitController.java
@@ -23,7 +23,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author zscat
@@ -59,7 +59,7 @@ public class BuildingUnitController {
 
     public Object saveBuildingUnit(@RequestBody BuildingUnit entity) {
         try {
-            if (ValidatorUtils.empty(entity.getFloorId())){
+            if (ValidatorUtils.empty(entity.getFloorId())) {
                 return new CommonResult().failed("请选择楼");
             }
             entity.setCreateTime(new Date());
@@ -138,6 +138,7 @@ public class BuildingUnitController {
             return new CommonResult().failed();
         }
     }
+
     @GetMapping("/exportExcel")
     public void export(HttpServletResponse response, BuildingUnit entity) {
         // 模拟从数据库获取需要导出的数据
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildAdvService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildAdvService.java
index 2f6f2a50490f444b575f47fd1518c7fa504d4c75..167910e23f045e9f75cbf1b5aef99a6bbfd105b1 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildAdvService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildAdvService.java
@@ -1,7 +1,7 @@
 package com.zscat.mallplus.build.service;
 
-import com.zscat.mallplus.build.entity.BuildAdv;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.build.entity.BuildAdv;
 
 /**
  * <p>
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildApplyRoomService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildApplyRoomService.java
index cd00b22db3fce87d26630fc7cd31456b4c74c670..a55ed632b25b0029c2614dd6638938d5129246c2 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildApplyRoomService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildApplyRoomService.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.build.service;
 
-import com.zscat.mallplus.build.entity.BuildApplyRoom;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.build.entity.BuildApplyRoom;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildGroupMemberService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildGroupMemberService.java
index 675391493d11750fa36984303993860407ddfaf6..69eb6f1a5242e26ec539c15a69ec21a0ca970a00 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildGroupMemberService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildGroupMemberService.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.build.service;
 
-import com.zscat.mallplus.build.entity.BuildGroupMember;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.build.entity.BuildGroupMember;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildGroupService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildGroupService.java
index 5ec0a1ad8e195a975914489432498d0ca3c7f0a8..c4cef379cd7121b0beb31b7135cb1ebbe3417032 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildGroupService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildGroupService.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.build.service;
 
-import com.zscat.mallplus.build.entity.BuildGroup;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.build.entity.BuildGroup;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildNoticeService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildNoticeService.java
index 937e7deaa19f4ab1cef15a855cc2fd7b313a06bd..67a11f5f0aba583fbd104b03a3a476c9116a9ca1 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildNoticeService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildNoticeService.java
@@ -1,7 +1,7 @@
 package com.zscat.mallplus.build.service;
 
-import com.zscat.mallplus.build.entity.BuildNotice;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.build.entity.BuildNotice;
 
 /**
  * <p>
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildRepairService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildRepairService.java
index 767d86e9ed42e95073ee52c09c56bbe747d8b563..51a390af2e77ae2790085eb267428db87840588f 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildRepairService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildRepairService.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.build.service;
 
-import com.zscat.mallplus.build.entity.BuildRepair;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.build.entity.BuildRepair;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildTypePriceService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildTypePriceService.java
index 2185d26ffd965a69753f2e70a75488240f83850b..630b03ae9f973106d6f30c3d192b41a7e6ed9b4d 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildTypePriceService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildTypePriceService.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.build.service;
 
-import com.zscat.mallplus.build.entity.BuildTypePrice;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.build.entity.BuildTypePrice;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildWuyeCompanyService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildWuyeCompanyService.java
index d2cd3e5c22b9223c4f3c3c26a07288a0c3172f1c..2ca750ffec390acbf93a6e212f364e0f2c60eb88 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildWuyeCompanyService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildWuyeCompanyService.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.build.service;
 
-import com.zscat.mallplus.build.entity.BuildWuyeCompany;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.build.entity.BuildWuyeCompany;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildWuyePriceService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildWuyePriceService.java
index dd2532bda708e9cc5b4958de18a1f99d8b56a525..dfc979d129dc1eed2660aebaf67e9811cba80c90 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildWuyePriceService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildWuyePriceService.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.build.service;
 
-import com.zscat.mallplus.build.entity.BuildWuyePrice;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.build.entity.BuildWuyePrice;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingCommunityService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingCommunityService.java
index 74ddb20057935ef73ac68714f9e7bd50662bda9d..c7ef9058778324793d514d29c65d2e7fbee3c856 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingCommunityService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingCommunityService.java
@@ -1,7 +1,7 @@
 package com.zscat.mallplus.build.service;
 
-import com.zscat.mallplus.build.entity.BuildingCommunity;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.build.entity.BuildingCommunity;
 
 /**
  * <p>
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingFloorService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingFloorService.java
index eb896f7e012357bb02679917212d40a53038fe64..338f1a382b960b99b8e7891b6cd55537fed8b0c7 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingFloorService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingFloorService.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.build.service;
 
-import com.zscat.mallplus.build.entity.BuildingFloor;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.build.entity.BuildingFloor;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingOwnerService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingOwnerService.java
index 025ce26c7ba6c61c2b54142074d845fc60a220ff..e135411246191535212be1ddca14c2249c68bdf3 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingOwnerService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingOwnerService.java
@@ -1,7 +1,7 @@
 package com.zscat.mallplus.build.service;
 
-import com.zscat.mallplus.build.entity.BuildingOwner;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.build.entity.BuildingOwner;
 
 /**
  * <p>
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingRoomService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingRoomService.java
index 370a45e1f3a9c87a5c2c69d74665c269129a2e03..e4e15dd841eb31bdcb541334aebb8aa0fc25ef4c 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingRoomService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingRoomService.java
@@ -1,7 +1,7 @@
 package com.zscat.mallplus.build.service;
 
-import com.zscat.mallplus.build.entity.BuildingRoom;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.build.entity.BuildingRoom;
 
 /**
  * <p>
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingUnitService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingUnitService.java
index a24b9c4d7f8c80a61f0591c7de630a325984fdfc..25386c8dcbdecf078a4f722135e54c76b2aa0dcd 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingUnitService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingUnitService.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.build.service;
 
-import com.zscat.mallplus.build.entity.BuildingUnit;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.build.entity.BuildingUnit;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildAdvServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildAdvServiceImpl.java
index b4f11fd7eb2425f87a606ea4344ad13892c64df9..e683338db475e63ba3a1416f59359309ec7cadd0 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildAdvServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildAdvServiceImpl.java
@@ -1,9 +1,9 @@
 package com.zscat.mallplus.build.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.build.entity.BuildAdv;
 import com.zscat.mallplus.build.mapper.BuildAdvMapper;
 import com.zscat.mallplus.build.service.IBuildAdvService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildApplyRoomServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildApplyRoomServiceImpl.java
index 6471df4ff7404c8b6013d3a9ecd7427fe716c539..4d40fa8bb6573150e7d5b6c009908fc8e9c7382e 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildApplyRoomServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildApplyRoomServiceImpl.java
@@ -1,14 +1,14 @@
 package com.zscat.mallplus.build.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.build.entity.BuildApplyRoom;
 import com.zscat.mallplus.build.mapper.BuildApplyRoomMapper;
 import com.zscat.mallplus.build.service.IBuildApplyRoomService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildGroupMemberServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildGroupMemberServiceImpl.java
index 5dd5f882da08b56a553875341189acd1fe8bc95a..593aae53085f443ca4988b9873f6d5b1b6a28c51 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildGroupMemberServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildGroupMemberServiceImpl.java
@@ -1,14 +1,14 @@
 package com.zscat.mallplus.build.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.build.entity.BuildGroupMember;
 import com.zscat.mallplus.build.mapper.BuildGroupMemberMapper;
 import com.zscat.mallplus.build.service.IBuildGroupMemberService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildGroupServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildGroupServiceImpl.java
index f83b98431ac430c96d4beb133cb634dcabc990af..44a95869aba584402ba2062bc569a828215275ce 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildGroupServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildGroupServiceImpl.java
@@ -1,14 +1,14 @@
 package com.zscat.mallplus.build.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.build.entity.BuildGroup;
 import com.zscat.mallplus.build.mapper.BuildGroupMapper;
 import com.zscat.mallplus.build.service.IBuildGroupService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildNoticeServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildNoticeServiceImpl.java
index 185ff6aed7b1513f7c1d77dc8a1f3839397de35c..3ae3720b625534f267def05c809944e332c8cde9 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildNoticeServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildNoticeServiceImpl.java
@@ -1,9 +1,9 @@
 package com.zscat.mallplus.build.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.build.entity.BuildNotice;
 import com.zscat.mallplus.build.mapper.BuildNoticeMapper;
 import com.zscat.mallplus.build.service.IBuildNoticeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildRepairServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildRepairServiceImpl.java
index ac5b825f4b5462bb2a2e2356bf91327fe640ad12..c6808e6884098d69ee8996381513ad4e93b23677 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildRepairServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildRepairServiceImpl.java
@@ -1,14 +1,14 @@
 package com.zscat.mallplus.build.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.build.entity.BuildRepair;
 import com.zscat.mallplus.build.mapper.BuildRepairMapper;
 import com.zscat.mallplus.build.service.IBuildRepairService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildTypePriceServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildTypePriceServiceImpl.java
index cbc46e8be444ae6a378ecbf2cdbbc802f6c17fce..52dd1a35d0baf08c05fd9d647d1af6019d2a0536 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildTypePriceServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildTypePriceServiceImpl.java
@@ -1,14 +1,14 @@
 package com.zscat.mallplus.build.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.build.entity.BuildTypePrice;
 import com.zscat.mallplus.build.mapper.BuildTypePriceMapper;
 import com.zscat.mallplus.build.service.IBuildTypePriceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildWuyeCompanyServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildWuyeCompanyServiceImpl.java
index b039bd6fcbd66a8a2e2ce36798f5ebf0db34ab30..25a5a956391a42d2d28631d3a47031e42617ff7c 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildWuyeCompanyServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildWuyeCompanyServiceImpl.java
@@ -18,7 +18,7 @@ import java.util.Date;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
@@ -35,33 +35,35 @@ public class BuildWuyeCompanyServiceImpl extends ServiceImpl<BuildWuyeCompanyMap
     private PasswordEncoder passwordEncoder;
     @Resource
     private SysUserRoleMapper userRoleMapper;
+
     @Transactional
     @Override
     public boolean saveCompany(BuildWuyeCompany entity) {
-       //1 创建物业公司
+        //1 创建物业公司
         entity.setCreateTime(new Date());
         wuyeCompanyMapper.insert(entity);
         // 2 创建物业公司账号
         SysUser user = new SysUser();
         user.setUsername(entity.getName());
         SysUser umsAdminList = userMapper.selectByUserName(entity.getName());
-        if (umsAdminList!=null) {
+        if (umsAdminList != null) {
             throw new ApiMallPlusException("此物业公司已存在");
         }
         user.setStatus(1);
-        user.setStoreId(entity.getId());
+        // user.setStoreId(entity.getId());
         user.setSupplyId(0L);
         user.setPassword(passwordEncoder.encode("123456"));
         user.setCreateTime(new Date());
         user.setSupplyId(0L);
-        user.setNote("物业公司账户：物业公司ID="+entity.getName()+","+entity.getId());
+        user.setNote("物业公司账户：物业公司ID=" + entity.getName() + "," + entity.getId());
         user.setIcon(entity.getPic());
         user.setNickName(entity.getName());
         userMapper.insert(user);
 
         // 3 分配物业公司角色
         SysUserRole userRole = new SysUserRole();
-        userRole.setAdminId(user.getId());userRole.setRoleId(2L);
+        userRole.setAdminId(user.getId());
+        userRole.setRoleId(2L);
         userRoleMapper.insert(userRole);
         return true;
     }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildWuyePriceServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildWuyePriceServiceImpl.java
index 26ad20aa90652134be20ded10d118cb759663cfd..0f8c2a359be81687ae334d7794293f1732267530 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildWuyePriceServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildWuyePriceServiceImpl.java
@@ -1,14 +1,14 @@
 package com.zscat.mallplus.build.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.build.entity.BuildWuyePrice;
 import com.zscat.mallplus.build.mapper.BuildWuyePriceMapper;
 import com.zscat.mallplus.build.service.IBuildWuyePriceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingCommunityServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingCommunityServiceImpl.java
index 9548b3b61e387558241945b7dce0bd4689f9854d..c420b793619e422b7f81f208d2b1925864b4ef20 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingCommunityServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingCommunityServiceImpl.java
@@ -1,9 +1,9 @@
 package com.zscat.mallplus.build.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.build.entity.BuildingCommunity;
 import com.zscat.mallplus.build.mapper.BuildingCommunityMapper;
 import com.zscat.mallplus.build.service.IBuildingCommunityService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.exception.ApiMallPlusException;
 import com.zscat.mallplus.sys.entity.SysUser;
 import com.zscat.mallplus.sys.entity.SysUserRole;
@@ -44,21 +44,22 @@ public class BuildingCommunityServiceImpl extends ServiceImpl<BuildingCommunityM
         SysUser user = new SysUser();
         user.setUsername(entity.getName());
         SysUser umsAdminList = userMapper.selectByUserName(entity.getName());
-        if (umsAdminList!=null) {
+        if (umsAdminList != null) {
             throw new ApiMallPlusException("此小区已存在");
         }
         user.setStatus(1);
-        user.setStoreId(entity.getId());
+        //  user.setStoreId(entity.getId());
         user.setPassword(passwordEncoder.encode("123456"));
         user.setCreateTime(new Date());
         user.setSupplyId(0L);
-        user.setNote("小区账户：小区ID="+entity.getName()+","+entity.getId());
+        user.setNote("小区账户：小区ID=" + entity.getName() + "," + entity.getId());
         user.setNickName(entity.getName());
         userMapper.insert(user);
 
         // 3 分配物业公司角色
         SysUserRole userRole = new SysUserRole();
-        userRole.setAdminId(user.getId());userRole.setRoleId(3L);
+        userRole.setAdminId(user.getId());
+        userRole.setRoleId(3L);
         userRoleMapper.insert(userRole);
         return true;
     }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingFloorServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingFloorServiceImpl.java
index 95e0ca1aaa0e3942e0f217d6a4b77e947ece90da..3db25ca3a7b1488c57acf2e649210d60633f91d5 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingFloorServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingFloorServiceImpl.java
@@ -1,14 +1,14 @@
 package com.zscat.mallplus.build.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.build.entity.BuildingFloor;
 import com.zscat.mallplus.build.mapper.BuildingFloorMapper;
 import com.zscat.mallplus.build.service.IBuildingFloorService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingOwnerServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingOwnerServiceImpl.java
index c94c1c36ccb1b38b5b2dea901ec76b6eade182db..c3cef35171897a71937db704a273f505c282dd59 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingOwnerServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingOwnerServiceImpl.java
@@ -1,9 +1,9 @@
 package com.zscat.mallplus.build.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.build.entity.BuildingOwner;
 import com.zscat.mallplus.build.mapper.BuildingOwnerMapper;
 import com.zscat.mallplus.build.service.IBuildingOwnerService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingRoomServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingRoomServiceImpl.java
index f8d1af2cd35ef98afefbefd6ade21cf826f4bb5c..a675348209d19d7920d93e56c2781f67ae4cf7c1 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingRoomServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingRoomServiceImpl.java
@@ -1,9 +1,9 @@
 package com.zscat.mallplus.build.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.build.entity.BuildingRoom;
 import com.zscat.mallplus.build.mapper.BuildingRoomMapper;
 import com.zscat.mallplus.build.service.IBuildingRoomService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingUnitServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingUnitServiceImpl.java
index 38ee8edfe21a83a1ceb85fd7ed8a4a7c7d53663d..df6c1e10051c5726e0bb25c18e4f49a3d961100c 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingUnitServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingUnitServiceImpl.java
@@ -1,14 +1,14 @@
 package com.zscat.mallplus.build.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.build.entity.BuildingUnit;
 import com.zscat.mallplus.build.mapper.BuildingUnitMapper;
 import com.zscat.mallplus.build.service.IBuildingUnitService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/component/JwtAuthenticationTokenFilter.java b/mallplus-admin/src/main/java/com/zscat/mallplus/component/JwtAuthenticationTokenFilter.java
index cbc24cb5710205da870598a4d735da2828595e22..2cf9779e7a25857ac3fdeef9c1f89beaaa5ca395 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/component/JwtAuthenticationTokenFilter.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/component/JwtAuthenticationTokenFilter.java
@@ -1,6 +1,7 @@
 package com.zscat.mallplus.component;
 
 
+import com.zscat.mallplus.ApiContext;
 import com.zscat.mallplus.sys.entity.SysAdminLog;
 import com.zscat.mallplus.sys.service.ISysAdminLogService;
 import com.zscat.mallplus.util.IpAddressUtil;
@@ -36,6 +37,8 @@ import java.util.Map;
  */
 public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
     private static final Logger LOGGER = LoggerFactory.getLogger(JwtAuthenticationTokenFilter.class);
+    @Resource
+    public ISysAdminLogService fopSystemOperationLogService;
     @Autowired
     private UserDetailsService userDetailsService;
     @Autowired
@@ -44,9 +47,8 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
     private String tokenHeader;
     @Value("${jwt.tokenHead}")
     private String tokenHead;
-
-    @Resource
-    public ISysAdminLogService fopSystemOperationLogService;
+    @Autowired
+    private ApiContext apiContext;
 
     @Override
     protected void doFilterInternal(HttpServletRequest request,
@@ -83,15 +85,15 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
             String authToken = authHeader.substring(this.tokenHead.length());
             username = jwtTokenUtil.getUserNameFromToken(authToken);
             LOGGER.info("checking username:{}", username);
-            if (fullUrl.contains("logout") || fullUrl.contains("login")){
+            if (fullUrl.contains("logout") || fullUrl.contains("login")) {
 
-            }else{
+            } else {
                 if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) {
                     UserDetails userDetails = this.userDetailsService.loadUserByUsername(username);
                     if (jwtTokenUtil.validateToken(authToken, userDetails)) {
                         UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
                         authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
-                        LOGGER.info("authenticated user:{}", username);
+                        LOGGER.info("checking username:{}，storeId:{}", username,apiContext.getCurrentProviderId());
                         SecurityContextHolder.getContext().setAuthentication(authentication);
                     }
                 }
@@ -107,7 +109,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
                 IpAddressUtil.getIpAddr((HttpServletRequest) request), sbParams.toString(), authHeader)
                 + ",\"cost\":\"" + (endTime - startTime) + "ms\"");
         int startIntercept = fullUrl.replace("//", "a").indexOf("/") + 1;
-        String interfaceName = fullUrl.substring(startIntercept,fullUrl.length());
+        String interfaceName = fullUrl.substring(startIntercept, fullUrl.length());
         sysLog.setCreateTime(new Date());
         sysLog.setIp(IpAddressUtil.getIpAddr(request));
         sysLog.setMethod(interfaceName);
@@ -118,7 +120,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
         sysLog.setTimeMin((endTime - startTime));
         if (!"OPTIONS".equals(requestType) && !interfaceName.contains("webjars")
                 && !interfaceName.contains("api-docs")) {
-        //    fopSystemOperationLogService.save(sysLog);
+                fopSystemOperationLogService.save(sysLog);
         }
     }
 
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/component/OssAliyunConfig.java b/mallplus-admin/src/main/java/com/zscat/mallplus/component/OssAliyunConfig.java
index 9784b97a2af76170e7464deda6cee7825caa3c02..35288c1b0ae162234c037e8c50eaa679d1747ba4 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/component/OssAliyunConfig.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/component/OssAliyunConfig.java
@@ -7,19 +7,20 @@ import org.springframework.context.annotation.Configuration;
 
 /**
  * 阿里云配置类
+ *
  * @author: Peter
  * @date: 2018-4-11
  */
 @Configuration
 public class OssAliyunConfig {
 
-    @Bean(value="defaultOssAliyunField")
+    @Bean(value = "defaultOssAliyunField")
     @ConfigurationProperties("oss.aliyun.defalut")
     public OssAliyunField defaultOssAliyunField() {
         return new OssAliyunField();
     }
 
-    @Bean(value="firstOssAliyuField")
+    @Bean(value = "firstOssAliyuField")
     @ConfigurationProperties("oss.aliyun.first")
     public OssAliyunField firstOssAliyuField() {
         return new OssAliyunField();
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/component/OssAliyunUtil.java b/mallplus-admin/src/main/java/com/zscat/mallplus/component/OssAliyunUtil.java
index 20f42d1864e8b3ff918bec466196ef5d4232ef36..53eb05c3641980706868449150fc5b8ec6c29633 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/component/OssAliyunUtil.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/component/OssAliyunUtil.java
@@ -27,8 +27,9 @@ import java.util.UUID;
 @Component
 public class OssAliyunUtil {
 
-    @Resource(name="defaultOssAliyunField")
+    @Resource(name = "defaultOssAliyunField")
     private OssAliyunField defaultOssAliyunField;
+
     /**
      * 上传文件（选择默认的OSS配置）
      *
@@ -48,6 +49,7 @@ public class OssAliyunUtil {
 
     /**
      * 上传文件
+     *
      * @param suffix
      * @param inputStream
      * @return
@@ -55,6 +57,7 @@ public class OssAliyunUtil {
     public String upload(String suffix, InputStream inputStream) {
         return upload(defaultOssAliyunField, getKey(defaultOssAliyunField.getPrefix(), suffix), inputStream);
     }
+
     /**
      * 上传文件
      *
@@ -142,7 +145,7 @@ public class OssAliyunUtil {
      * @param key             文件名
      */
     public void delete(final String accessKeyId, final String accessKeySecret, final String bucketName,
-                              final String endpoint, final String key) {
+                       final String endpoint, final String key) {
         // 创建OSSClient实例
         OSSClient ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret);
         // 删除Object
@@ -172,7 +175,7 @@ public class OssAliyunUtil {
      * @param keys            多个文件名的集合
      */
     public void delete(final String accessKeyId, final String accessKeySecret, final String bucketName,
-                              final String endpoint, final List<String> keys) {
+                       final String endpoint, final List<String> keys) {
         // 创建OSSClient实例
         OSSClient ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret);
         // 删除Objects
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/config/MybatisPlusConfig.java b/mallplus-admin/src/main/java/com/zscat/mallplus/config/MybatisPlusConfig.java
index 173045915590b856f9dc7c044eba2486808197fe..dbf1a0e466c2f8e59c18ae16edbd9053c37ed368 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/config/MybatisPlusConfig.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/config/MybatisPlusConfig.java
@@ -1,16 +1,26 @@
 package com.zscat.mallplus.config;
 
 
+import com.baomidou.mybatisplus.core.parser.ISqlParser;
+import com.baomidou.mybatisplus.core.parser.ISqlParserFilter;
+import com.baomidou.mybatisplus.core.parser.SqlParserHelper;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler;
+import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser;
 import com.zscat.mallplus.ApiContext;
 import com.zscat.mallplus.enums.ConstansValue;
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.LongValue;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.reflection.MetaObject;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+import java.util.ArrayList;
 import java.util.List;
 
 //Spring boot方式
@@ -31,7 +41,54 @@ public class MybatisPlusConfig {
         PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
 
         paginationInterceptor.setDialectType("mysql");
+        /*
+         * 【测试多租户】 SQL 解析处理拦截器<br>
+         * 这里固定写成住户 1 实际情况你可以从cookie读取，因此数据看不到 【 麻花藤 】 这条记录（ 注意观察 SQL ）<br>
+         */
+        List<ISqlParser> sqlParserList = new ArrayList<>();
+        TenantSqlParser tenantSqlParser = new TenantSqlParser();
+        tenantSqlParser.setTenantHandler(new TenantHandler() {
 
+            @Override
+            public Expression getTenantId() {
+                // 从当前系统上下文中取出当前请求的服务商ID，通过解析器注入到SQL中。
+                Long currentProviderId = apiContext.getCurrentProviderId();
+                if (null == currentProviderId) {
+                    currentProviderId = 1l;
+                    System.out.println("#1129 getCurrentProviderId error.");
+                    //  throw new RuntimeException("#1129 getCurrentProviderId error.");
+                }
+                return new LongValue(currentProviderId);
+            }
+
+            @Override
+            public String getTenantIdColumn() {
+                return "store_id";
+            }
+
+            @Override
+            public boolean doTableFilter(String tableName) {
+                if (tableName.startsWith("admin_") || tableName.startsWith("QRTZ_")) {
+                    return true;
+                }
+                return IGNORE_TENANT_TABLES.stream().anyMatch((e) -> e.equalsIgnoreCase(tableName));
+
+            }
+        });
+
+        sqlParserList.add(tenantSqlParser);
+        paginationInterceptor.setSqlParserList(sqlParserList);
+        paginationInterceptor.setSqlParserFilter(new ISqlParserFilter() {
+            @Override
+            public boolean doFilter(MetaObject metaObject) {
+                MappedStatement ms = SqlParserHelper.getMappedStatement(metaObject);
+                // 过滤自定义查询此时无租户信息约束【 麻花藤 】出现
+                if ("com.zscat.mallplus.sys.mapper.SysUserMapper.selectByUserName".equals(ms.getId())) {
+                    return true;
+                }
+                return false;
+            }
+        });
         return paginationInterceptor;
     }
 
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/config/SecurityConfig.java b/mallplus-admin/src/main/java/com/zscat/mallplus/config/SecurityConfig.java
index 25b23f9532c15e5b507d497ab711f4e7b470b50f..ad8dc4a3db38cca5ba39eef83f3d7a31197e3d85 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/config/SecurityConfig.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/config/SecurityConfig.java
@@ -1,5 +1,6 @@
 package com.zscat.mallplus.config;
 
+import com.zscat.mallplus.ApiContext;
 import com.zscat.mallplus.bo.AdminUserDetails;
 import com.zscat.mallplus.component.JwtAuthenticationTokenFilter;
 import com.zscat.mallplus.component.RestAuthenticationEntryPoint;
@@ -8,7 +9,6 @@ import com.zscat.mallplus.sys.entity.SysPermission;
 import com.zscat.mallplus.sys.entity.SysUserVo;
 import com.zscat.mallplus.sys.mapper.SysUserMapper;
 import com.zscat.mallplus.sys.service.ISysUserService;
-import com.zscat.mallplus.ApiContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
@@ -52,6 +52,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Autowired
     private ApiContext apiContext;
+
     @Override
     protected void configure(HttpSecurity httpSecurity) throws Exception {
         httpSecurity.csrf()// 由于使用的是JWT，我们这里不需要csrf
@@ -106,9 +107,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
         //获取登录用户信息
         return username -> {
             SysUserVo admin = userMapper.selectByUserName(username);
-          //  apiContext.setCurrentProviderId(admin.getStoreId());
+            //  apiContext.setCurrentProviderId(admin.getStoreId());
             if (admin != null) {
-                if (admin.getSupplyId()!=null && admin.getSupplyId() == 1L) {
+                if (admin.getSupplyId() != null && admin.getSupplyId() == 1L) {
                     List<SysPermission> permissionList = sysUserService.listPerms();
                     return new AdminUserDetails(admin, permissionList);
                 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsCartItemController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsCartItemController.java
index 0d5c67c3e50f507bbdf6d488d797b3b7cca229a8..d15104d1b6199bc73a2096021a895d74521987a8 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsCartItemController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsCartItemController.java
@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Slf4j
 @RestController
-@Api(tags = "OmsCartItemController", description = "购物车表管理")
+@Api(tags = "oms", description = "购物车表管理")
 @RequestMapping("/oms/OmsCartItem")
 public class OmsCartItemController {
     @Resource
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsCompanyAddressController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsCompanyAddressController.java
index 9c6afbb3518ec1e591f5c18c42e4f329743e9cd7..9f0b49ba39c7b156e527845b6adccb1e8eef73b2 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsCompanyAddressController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsCompanyAddressController.java
@@ -1,10 +1,12 @@
 package com.zscat.mallplus.oms.controller;
 
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zscat.mallplus.annotation.SysLog;
 import com.zscat.mallplus.oms.entity.OmsCompanyAddress;
 import com.zscat.mallplus.oms.service.IOmsCompanyAddressService;
+import com.zscat.mallplus.util.EasyPoiUtils;
 import com.zscat.mallplus.utils.CommonResult;
 import com.zscat.mallplus.utils.ValidatorUtils;
 import io.swagger.annotations.Api;
@@ -13,114 +15,118 @@ import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
- * <p>
- * 公司收发货地址表
- * </p>
- *
- * @author zscat
- * @since 2019-04-19
+ * @author mallplus
+ * @date 2019-12-07
+ * 发货地址
  */
 @Slf4j
+@Api(tags = "oms", description = "发货地址列表")
 @RestController
-@Api(tags = "OmsCompanyAddressController", description = "公司收发货地址表管理")
-@RequestMapping("/oms/OmsCompanyAddress")
+@RequestMapping("/oms/omsCompanyAddress")
 public class OmsCompanyAddressController {
+
     @Resource
     private IOmsCompanyAddressService IOmsCompanyAddressService;
 
-    @SysLog(MODULE = "oms", REMARK = "根据条件查询所有公司收发货地址表列表")
-    @ApiOperation("根据条件查询所有公司收发货地址表列表")
+    @SysLog(MODULE = "oms", REMARK = "根据条件查询所有发货地址列表")
+    @ApiOperation("根据条件查询所有发货地址列表")
     @GetMapping(value = "/list")
     public Object getOmsCompanyAddressByPage(OmsCompanyAddress entity,
                                              @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
     ) {
         try {
+            if (ValidatorUtils.notEmpty(entity.getName())){
+                return new CommonResult().success(IOmsCompanyAddressService.page(new Page<OmsCompanyAddress>(pageNum, pageSize), new QueryWrapper<OmsCompanyAddress>(new OmsCompanyAddress()).like("name",entity.getName())));
+            }
             return new CommonResult().success(IOmsCompanyAddressService.page(new Page<OmsCompanyAddress>(pageNum, pageSize), new QueryWrapper<>(entity)));
         } catch (Exception e) {
-            log.error("根据条件查询所有公司收发货地址表列表：%s", e.getMessage(), e);
+            log.error("根据条件查询所有发货地址列表：%s", e.getMessage(), e);
         }
         return new CommonResult().failed();
     }
 
-    @SysLog(MODULE = "oms", REMARK = "保存公司收发货地址表")
-    @ApiOperation("保存公司收发货地址表")
+    @SysLog(MODULE = "oms", REMARK = "保存发货地址")
+    @ApiOperation("保存发货地址")
     @PostMapping(value = "/create")
+    @PreAuthorize("hasAuthority('oms:omsCompanyAddress:create')")
     public Object saveOmsCompanyAddress(@RequestBody OmsCompanyAddress entity) {
         try {
+
             if (IOmsCompanyAddressService.save(entity)) {
                 return new CommonResult().success();
             }
         } catch (Exception e) {
-            log.error("保存公司收发货地址表：%s", e.getMessage(), e);
-            return new CommonResult().failed();
+            log.error("保存发货地址：%s", e.getMessage(), e);
+            return new CommonResult().failed(e.getMessage());
         }
         return new CommonResult().failed();
     }
 
-    @SysLog(MODULE = "oms", REMARK = "更新公司收发货地址表")
-    @ApiOperation("更新公司收发货地址表")
+    @SysLog(MODULE = "oms", REMARK = "更新发货地址")
+    @ApiOperation("更新发货地址")
     @PostMapping(value = "/update/{id}")
-    @PreAuthorize("hasAuthority('oms:OmsCompanyAddress:update')")
+    @PreAuthorize("hasAuthority('oms:omsCompanyAddress:update')")
     public Object updateOmsCompanyAddress(@RequestBody OmsCompanyAddress entity) {
         try {
             if (IOmsCompanyAddressService.updateById(entity)) {
                 return new CommonResult().success();
             }
         } catch (Exception e) {
-            log.error("更新公司收发货地址表：%s", e.getMessage(), e);
-            return new CommonResult().failed();
+            log.error("更新发货地址：%s", e.getMessage(), e);
+            return new CommonResult().failed(e.getMessage());
         }
         return new CommonResult().failed();
     }
 
-    @SysLog(MODULE = "oms", REMARK = "删除公司收发货地址表")
-    @ApiOperation("删除公司收发货地址表")
+    @SysLog(MODULE = "oms", REMARK = "删除发货地址")
+    @ApiOperation("删除发货地址")
     @GetMapping(value = "/delete/{id}")
-    @PreAuthorize("hasAuthority('oms:OmsCompanyAddress:delete')")
-    public Object deleteOmsCompanyAddress(@ApiParam("公司收发货地址表id") @PathVariable Long id) {
+    @PreAuthorize("hasAuthority('oms:omsCompanyAddress:delete')")
+    public Object deleteOmsCompanyAddress(@ApiParam("发货地址id") @PathVariable Long id) {
         try {
             if (ValidatorUtils.empty(id)) {
-                return new CommonResult().paramFailed("公司收发货地址表id");
+                return new CommonResult().paramFailed("发货地址id");
             }
             if (IOmsCompanyAddressService.removeById(id)) {
                 return new CommonResult().success();
             }
         } catch (Exception e) {
-            log.error("删除公司收发货地址表：%s", e.getMessage(), e);
-            return new CommonResult().failed();
+            log.error("删除发货地址：%s", e.getMessage(), e);
+            return new CommonResult().failed(e.getMessage());
         }
         return new CommonResult().failed();
     }
 
-    @SysLog(MODULE = "oms", REMARK = "给公司收发货地址表分配公司收发货地址表")
-    @ApiOperation("查询公司收发货地址表明细")
+    @SysLog(MODULE = "oms", REMARK = "给发货地址分配发货地址")
+    @ApiOperation("查询发货地址明细")
     @GetMapping(value = "/{id}")
-    @PreAuthorize("hasAuthority('oms:OmsCompanyAddress:read')")
-    public Object getOmsCompanyAddressById(@ApiParam("公司收发货地址表id") @PathVariable Long id) {
+    @PreAuthorize("hasAuthority('oms:omsCompanyAddress:read')")
+    public Object getOmsCompanyAddressById(@ApiParam("发货地址id") @PathVariable Long id) {
         try {
             if (ValidatorUtils.empty(id)) {
-                return new CommonResult().paramFailed("公司收发货地址表id");
+                return new CommonResult().paramFailed("发货地址id");
             }
             OmsCompanyAddress coupon = IOmsCompanyAddressService.getById(id);
             return new CommonResult().success(coupon);
         } catch (Exception e) {
-            log.error("查询公司收发货地址表明细：%s", e.getMessage(), e);
+            log.error("查询发货地址明细：%s", e.getMessage(), e);
             return new CommonResult().failed();
         }
 
     }
 
-    @ApiOperation(value = "批量删除公司收发货地址表")
+    @ApiOperation(value = "批量删除发货地址")
     @RequestMapping(value = "/delete/batch", method = RequestMethod.GET)
-    @ResponseBody
-    @SysLog(MODULE = "pms", REMARK = "批量删除公司收发货地址表")
-    @PreAuthorize("hasAuthority('oms:OmsCompanyAddress:delete')")
+    @SysLog(MODULE = "oms", REMARK = "批量删除发货地址")
+    @PreAuthorize("hasAuthority('oms:omsCompanyAddress:delete')")
     public Object deleteBatch(@RequestParam("ids") List<Long> ids) {
         boolean count = IOmsCompanyAddressService.removeByIds(ids);
         if (count) {
@@ -130,4 +136,23 @@ public class OmsCompanyAddressController {
         }
     }
 
+
+    @SysLog(MODULE = "oms", REMARK = "导出社区数据")
+    @GetMapping("/exportExcel")
+    public void export(HttpServletResponse response, OmsCompanyAddress entity) {
+        // 模拟从数据库获取需要导出的数据
+        List<OmsCompanyAddress> personList = IOmsCompanyAddressService.list(new QueryWrapper<>(entity));
+        // 导出操作
+        EasyPoiUtils.exportExcel(personList, "导出社区数据", "社区数据", OmsCompanyAddress.class, "导出社区数据.xls", response);
+
+    }
+
+    @SysLog(MODULE = "oms", REMARK = "导入社区数据")
+    @PostMapping("/importExcel")
+    public void importUsers(@RequestParam MultipartFile file) {
+        List<OmsCompanyAddress> personList = EasyPoiUtils.importExcel(file, OmsCompanyAddress.class);
+        IOmsCompanyAddressService.saveBatch(personList);
+    }
 }
+
+
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java
index 7190ac3274c16e8172b2bd658365849a484bfb22..ac73ba103b04764c0ac6e35738a7c1876dafb53b 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java
@@ -37,7 +37,7 @@ import java.util.List;
  */
 @Slf4j
 @RestController
-@Api(tags = "OmsOrderController", description = "订单表管理")
+@Api(tags = "oms", description = "订单表管理")
 @RequestMapping("/oms/OmsOrder")
 public class OmsOrderController {
     @Resource
@@ -46,7 +46,8 @@ public class OmsOrderController {
     private IOmsOrderItemService orderItemService;
 
     @Resource
-    private  OmsOrderOperateHistoryMapper omsOrderOperateHistoryMapper;
+    private OmsOrderOperateHistoryMapper omsOrderOperateHistoryMapper;
+
     @SysLog(MODULE = "oms", REMARK = "根据条件查询所有订单表列表")
     @ApiOperation("根据条件查询所有订单表列表")
     @GetMapping(value = "/list")
@@ -64,7 +65,6 @@ public class OmsOrderController {
     }
 
 
-
     @SysLog(MODULE = "oms", REMARK = "删除订单表")
     @ApiOperation("删除订单表")
     @GetMapping(value = "/delete/{id}")
@@ -93,8 +93,8 @@ public class OmsOrderController {
                 return new CommonResult().paramFailed("订单表id");
             }
             OmsOrder coupon = IOmsOrderService.getById(id);
-            coupon.setOrderItemList(orderItemService.list(new QueryWrapper<OmsOrderItem>().eq("order_id",coupon.getId())));
-            coupon.setHistoryList(omsOrderOperateHistoryMapper.selectList(new QueryWrapper<OmsOrderOperateHistory>().eq("order_id",coupon.getId())));
+            coupon.setOrderItemList(orderItemService.list(new QueryWrapper<OmsOrderItem>().eq("order_id", coupon.getId())));
+            coupon.setHistoryList(omsOrderOperateHistoryMapper.selectList(new QueryWrapper<OmsOrderOperateHistory>().eq("order_id", coupon.getId())));
             return new CommonResult().success(coupon);
         } catch (Exception e) {
             log.error("查询订单表明细：%s", e.getMessage(), e);
@@ -128,6 +128,7 @@ public class OmsOrderController {
         }
         return new CommonResult().failed();
     }
+
     @SysLog(MODULE = "oms", REMARK = "批量发货")
     @ApiOperation("批量发货")
     @RequestMapping(value = "/delivery", method = RequestMethod.POST)
@@ -197,14 +198,14 @@ public class OmsOrderController {
                             @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
 
         IPage<OmsOrder> page = null;
-        if (order.getStatus()!=null && order.getStatus()==0){
-            page = IOmsOrderService.page(new Page<OmsOrder>(pageNum, pageSize), new QueryWrapper<OmsOrder>().orderByDesc("create_time").select(ConstansValue.sampleOrderList)) ;
-        }else {
-            page = IOmsOrderService.page(new Page<OmsOrder>(pageNum, pageSize), new QueryWrapper<>(order).orderByDesc("create_time").select(ConstansValue.sampleOrderList)) ;
+        if (order.getStatus() != null && order.getStatus() == 0) {
+            page = IOmsOrderService.page(new Page<OmsOrder>(pageNum, pageSize), new QueryWrapper<OmsOrder>().orderByDesc("create_time").select(ConstansValue.sampleOrderList));
+        } else {
+            page = IOmsOrderService.page(new Page<OmsOrder>(pageNum, pageSize), new QueryWrapper<>(order).orderByDesc("create_time").select(ConstansValue.sampleOrderList));
 
         }
-        for (OmsOrder omsOrder : page.getRecords()){
-            List<OmsOrderItem> itemList = orderItemService.list(new QueryWrapper<OmsOrderItem>().eq("order_id",omsOrder.getId()).eq("type", AllEnum.OrderItemType.GOODS.code()));
+        for (OmsOrder omsOrder : page.getRecords()) {
+            List<OmsOrderItem> itemList = orderItemService.list(new QueryWrapper<OmsOrderItem>().eq("order_id", omsOrder.getId()).eq("type", AllEnum.OrderItemType.GOODS.code()));
             omsOrder.setOrderItemList(itemList);
         }
         return new CommonResult().success(page);
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderItemController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderItemController.java
index 54e90e066b1255445c329687d172b8c65d9cd3c7..120259b03df26edb13cad002a6b61ce78d538998 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderItemController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderItemController.java
@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Slf4j
 @RestController
-@Api(tags = "OmsOrderItemController", description = "订单中所包含的商品管理")
+@Api(tags = "oms", description = "订单中所包含的商品管理")
 @RequestMapping("/oms/OmsOrderItem")
 public class OmsOrderItemController {
     @Resource
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderOperateHistoryController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderOperateHistoryController.java
index c0e99e6532bc48cb06075317a5449cc5b0749072..a4d18ade476f2d0d8c4c8e870528abe51ee661ee 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderOperateHistoryController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderOperateHistoryController.java
@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Slf4j
 @RestController
-@Api(tags = "OmsOrderOperateHistoryController", description = "订单操作历史记录管理")
+@Api(tags = "oms", description = "订单操作历史记录管理")
 @RequestMapping("/oms/OmsOrderOperateHistory")
 public class OmsOrderOperateHistoryController {
     @Resource
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderReturnApplyController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderReturnApplyController.java
index b18ed477ab45c193a7146d6416aeea7e096a8f1b..0b87a085a685df2725a34565fd24c4e1dda893f1 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderReturnApplyController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderReturnApplyController.java
@@ -28,7 +28,7 @@ import java.util.List;
  */
 @Slf4j
 @RestController
-@Api(tags = "OmsOrderReturnApplyController", description = "订单退货申请管理")
+@Api(tags = "oms", description = "订单退货申请管理")
 @RequestMapping("/oms/OmsOrderReturnApply")
 public class OmsOrderReturnApplyController {
     @Resource
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderReturnReasonController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderReturnReasonController.java
index 1843116ed3d0d71a7a19ea9514a2fb9479941fac..e64cf2bccf95626efd7c1e7067c4bf5914fe3d85 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderReturnReasonController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderReturnReasonController.java
@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Slf4j
 @RestController
-@Api(tags = "OmsOrderReturnReasonController", description = "退货原因表管理")
+@Api(tags = "oms", description = "退货原因表管理")
 @RequestMapping("/oms/OmsOrderReturnReason")
 public class OmsOrderReturnReasonController {
     @Resource
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderSettingController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderSettingController.java
index 7774d2c1f79187afaacc3ea2550dff3da875d0d7..a6a43c3494709e54a65365bf65051ed3dcb97c7d 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderSettingController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderSettingController.java
@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Slf4j
 @RestController
-@Api(tags = "OmsOrderSettingController", description = "订单设置表管理")
+@Api(tags = "oms", description = "订单设置表管理")
 @RequestMapping("/oms/OmsOrderSetting")
 public class OmsOrderSettingController {
     @Resource
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsPaymentsController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsPaymentsController.java
new file mode 100644
index 0000000000000000000000000000000000000000..54f0147ef47743c6eea919cd9ed56d7624b9efd4
--- /dev/null
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsPaymentsController.java
@@ -0,0 +1,156 @@
+package com.zscat.mallplus.oms.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zscat.mallplus.annotation.SysLog;
+import com.zscat.mallplus.oms.entity.OmsPayments;
+import com.zscat.mallplus.oms.service.IOmsPaymentsService;
+import com.zscat.mallplus.util.EasyPoiUtils;
+import com.zscat.mallplus.utils.CommonResult;
+import com.zscat.mallplus.utils.ValidatorUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * @author mallplus
+ * @date 2019-12-07
+ * 支付配置
+ */
+@Slf4j
+@Api(tags = "oms", description = "支付配置")
+@RestController
+@RequestMapping("/oms/omsPayments")
+public class OmsPaymentsController {
+
+    @Resource
+    private IOmsPaymentsService IOmsPaymentsService;
+
+    @SysLog(MODULE = "oms", REMARK = "根据条件查询所有支付配置列表")
+    @ApiOperation("根据条件查询所有支付配置列表")
+    @GetMapping(value = "/list")
+    @PreAuthorize("hasAuthority('oms:omsPayments:read')")
+    public Object getOmsPaymentsByPage(OmsPayments entity,
+                                       @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
+    ) {
+        try {
+            return new CommonResult().success(IOmsPaymentsService.page(new Page<OmsPayments>(pageNum, pageSize), new QueryWrapper<>(entity)));
+        } catch (Exception e) {
+            log.error("根据条件查询所有支付配置列表：%s", e.getMessage(), e);
+        }
+        return new CommonResult().failed();
+    }
+
+    @SysLog(MODULE = "oms", REMARK = "保存支付配置")
+    @ApiOperation("保存支付配置")
+    @PostMapping(value = "/create")
+    @PreAuthorize("hasAuthority('oms:omsPayments:create')")
+    public Object saveOmsPayments(@RequestBody OmsPayments entity) {
+        try {
+
+            if (IOmsPaymentsService.save(entity)) {
+                return new CommonResult().success();
+            }
+        } catch (Exception e) {
+            log.error("保存支付配置：%s", e.getMessage(), e);
+            return new CommonResult().failed(e.getMessage());
+        }
+        return new CommonResult().failed();
+    }
+
+    @SysLog(MODULE = "oms", REMARK = "更新支付配置")
+    @ApiOperation("更新支付配置")
+    @PostMapping(value = "/update/{id}")
+    @PreAuthorize("hasAuthority('oms:omsPayments:update')")
+    public Object updateOmsPayments(@RequestBody OmsPayments entity) {
+        try {
+            if (IOmsPaymentsService.updateById(entity)) {
+                return new CommonResult().success();
+            }
+        } catch (Exception e) {
+            log.error("更新支付配置：%s", e.getMessage(), e);
+            return new CommonResult().failed(e.getMessage());
+        }
+        return new CommonResult().failed();
+    }
+
+    @SysLog(MODULE = "oms", REMARK = "删除支付配置")
+    @ApiOperation("删除支付配置")
+    @GetMapping(value = "/delete/{id}")
+    @PreAuthorize("hasAuthority('oms:omsPayments:delete')")
+    public Object deleteOmsPayments(@ApiParam("支付配置id") @PathVariable Long id) {
+        try {
+            if (ValidatorUtils.empty(id)) {
+                return new CommonResult().paramFailed("支付配置id");
+            }
+            if (IOmsPaymentsService.removeById(id)) {
+                return new CommonResult().success();
+            }
+        } catch (Exception e) {
+            log.error("删除支付配置：%s", e.getMessage(), e);
+            return new CommonResult().failed(e.getMessage());
+        }
+        return new CommonResult().failed();
+    }
+
+    @SysLog(MODULE = "oms", REMARK = "给支付配置分配支付配置")
+    @ApiOperation("查询支付配置明细")
+    @GetMapping(value = "/{id}")
+    @PreAuthorize("hasAuthority('oms:omsPayments:read')")
+    public Object getOmsPaymentsById(@ApiParam("支付配置id") @PathVariable Long id) {
+        try {
+            if (ValidatorUtils.empty(id)) {
+                return new CommonResult().paramFailed("支付配置id");
+            }
+            OmsPayments coupon = IOmsPaymentsService.getById(id);
+            return new CommonResult().success(coupon);
+        } catch (Exception e) {
+            log.error("查询支付配置明细：%s", e.getMessage(), e);
+            return new CommonResult().failed();
+        }
+
+    }
+
+    @ApiOperation(value = "批量删除支付配置")
+    @RequestMapping(value = "/delete/batch", method = RequestMethod.GET)
+    @SysLog(MODULE = "oms", REMARK = "批量删除支付配置")
+    @PreAuthorize("hasAuthority('oms:omsPayments:delete')")
+    public Object deleteBatch(@RequestParam("ids") List<Long> ids) {
+        boolean count = IOmsPaymentsService.removeByIds(ids);
+        if (count) {
+            return new CommonResult().success(count);
+        } else {
+            return new CommonResult().failed();
+        }
+    }
+
+
+    @SysLog(MODULE = "oms", REMARK = "导出社区数据")
+    @GetMapping("/exportExcel")
+    public void export(HttpServletResponse response, OmsPayments entity) {
+        // 模拟从数据库获取需要导出的数据
+        List<OmsPayments> personList = IOmsPaymentsService.list(new QueryWrapper<>(entity));
+        // 导出操作
+        EasyPoiUtils.exportExcel(personList, "导出社区数据", "社区数据", OmsPayments.class, "导出社区数据.xls", response);
+
+    }
+
+    @SysLog(MODULE = "oms", REMARK = "导入社区数据")
+    @PostMapping("/importExcel")
+    public void importUsers(@RequestParam MultipartFile file) {
+        List<OmsPayments> personList = EasyPoiUtils.importExcel(file, OmsPayments.class);
+        IOmsPaymentsService.saveBatch(personList);
+    }
+}
+
+
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsCompanyAddressService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsCompanyAddressService.java
index 788f3ff31f1dc5706c1ddd21107f59c1c236626a..fad957714d12138d19d345e6b03d37f755675fe3 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsCompanyAddressService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsCompanyAddressService.java
@@ -4,13 +4,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zscat.mallplus.oms.entity.OmsCompanyAddress;
 
 /**
- * <p>
- * 公司收发货地址表 服务类
- * </p>
- *
- * @author zscat
- * @since 2019-04-17
+ * @author mallplus
+ * @date 2019-12-07
  */
+
 public interface IOmsCompanyAddressService extends IService<OmsCompanyAddress> {
 
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsOrderService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsOrderService.java
index 6bc82a24b5161c490225157d9647565b4a4d5995..5b91185946812c3a88122d533d4f3338b506c552 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsOrderService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsOrderService.java
@@ -49,21 +49,25 @@ public interface IOmsOrderService extends IService<OmsOrder> {
      */
     @Transactional
     int close(List<Long> ids, String note);
+
     @Transactional
     int singleDelivery(OmsOrderDeliveryParam deliveryParamList);
 
     /**
      * 订单日统计
+     *
      * @param date
      * @return
      */
     Map orderDayStatic(String date);
+
     /**
      * 订单月统计
+     *
      * @param date
      * @return
      */
     Map orderMonthStatic(String date);
 
-    Object dayStatic(String date,Integer type);
+    Object dayStatic(String date, Integer type);
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsPaymentsService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsPaymentsService.java
new file mode 100644
index 0000000000000000000000000000000000000000..1a76e934c1ef9fd326238e3df6d0459711d38b7d
--- /dev/null
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsPaymentsService.java
@@ -0,0 +1,13 @@
+package com.zscat.mallplus.oms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.oms.entity.OmsPayments;
+
+/**
+ * @author mallplus
+ * @date 2019-12-07
+ */
+
+public interface IOmsPaymentsService extends IService<OmsPayments> {
+
+}
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsCompanyAddressServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsCompanyAddressServiceImpl.java
index 62b4dcbdf6249dd5fd372dbba17e3ec7afcc9be8..554017e2dfde5f3f4f316b4a79e42d4d914f8f1f 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsCompanyAddressServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsCompanyAddressServiceImpl.java
@@ -6,15 +6,17 @@ import com.zscat.mallplus.oms.mapper.OmsCompanyAddressMapper;
 import com.zscat.mallplus.oms.service.IOmsCompanyAddressService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
- * <p>
- * 公司收发货地址表 服务实现类
- * </p>
- *
- * @author zscat
- * @since 2019-04-17
+ * @author mallplus
+ * @date 2019-12-07
  */
 @Service
 public class OmsCompanyAddressServiceImpl extends ServiceImpl<OmsCompanyAddressMapper, OmsCompanyAddress> implements IOmsCompanyAddressService {
 
+    @Resource
+    private OmsCompanyAddressMapper omsCompanyAddressMapper;
+
+
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
index 67ce6c281b1d7bc63c011bd95cc744840c01da25..239b2c0ab6600b2cd86e207c678ed1a5aefebb1f 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
@@ -109,10 +109,10 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
     }
 
     @Override
-    public Object dayStatic(String date,Integer type) {
-        List<OmsOrder> orders = orderMapper.listByDate(date,type);
-        List<UmsMember> members = memberMapper.listByDate(date,type);
-        List<PmsProduct> products = productMapper.listByDate(date,type);
+    public Object dayStatic(String date, Integer type) {
+        List<OmsOrder> orders = orderMapper.listByDate(date, type);
+        List<UmsMember> members = memberMapper.listByDate(date, type);
+        List<PmsProduct> products = productMapper.listByDate(date, type);
         int nowOrderCount = 0; // 今日订单
         BigDecimal nowOrderPay = new BigDecimal(0); //今日销售总额
         for (OmsOrder order : orders) {
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsPaymentsServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsPaymentsServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..aad195ad309265e1619e1782331095ba1c472f83
--- /dev/null
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsPaymentsServiceImpl.java
@@ -0,0 +1,22 @@
+package com.zscat.mallplus.oms.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zscat.mallplus.oms.entity.OmsPayments;
+import com.zscat.mallplus.oms.mapper.OmsPaymentsMapper;
+import com.zscat.mallplus.oms.service.IOmsPaymentsService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author mallplus
+ * @date 2019-12-07
+ */
+@Service
+public class OmsPaymentsServiceImpl extends ServiceImpl<OmsPaymentsMapper, OmsPayments> implements IOmsPaymentsService {
+
+    @Resource
+    private OmsPaymentsMapper omsPaymentsMapper;
+
+
+}
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsBrandController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsBrandController.java
index 737a80fe9eadb1143dd23bc85a19d8535d785a87..ec536d68538f90ebe831d9fdbc61460d5c726b5c 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsBrandController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsBrandController.java
@@ -36,11 +36,14 @@ public class PmsBrandController {
     @SysLog(MODULE = "pms", REMARK = "根据条件查询所有品牌表列表")
     @ApiOperation("根据条件查询所有品牌表列表")
     @GetMapping(value = "/list")
-    public Object getPmsBrandByPage(PmsBrand entity,
+    public Object getPmsBrandByPage( PmsBrand entity,
                                     @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                     @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
     ) {
         try {
+            if (ValidatorUtils.notEmpty(entity.getName())){
+                return new CommonResult().success(IPmsBrandService.page(new Page<PmsBrand>(pageNum, pageSize), new QueryWrapper<PmsBrand>(new PmsBrand()).like("name",entity.getName())));
+            }
             return new CommonResult().success(IPmsBrandService.page(new Page<PmsBrand>(pageNum, pageSize), new QueryWrapper<>(entity)));
         } catch (Exception e) {
             log.error("根据条件查询所有品牌表列表：%s", e.getMessage(), e);
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsGiftsController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsGiftsController.java
index e0c0a4362f6be96462bbc14eb35b3bc9558914ab..fd58cfe500f512334093bdc852d0ffc8f00de918 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsGiftsController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsGiftsController.java
@@ -42,7 +42,11 @@ public class PmsGiftsController {
                                     @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
     ) {
         try {
+            if (ValidatorUtils.notEmpty(entity.getTitle())){
+                return new CommonResult().success(IPmsGiftsService.page(new Page<PmsGifts>(pageNum, pageSize), new QueryWrapper<PmsGifts>(new PmsGifts()).like("title",entity.getTitle())));
+            }
             return new CommonResult().success(IPmsGiftsService.page(new Page<PmsGifts>(pageNum, pageSize), new QueryWrapper<>(entity)));
+
         } catch (Exception e) {
             log.error("根据条件查询所有帮助表列表：%s", e.getMessage(), e);
         }
@@ -131,5 +135,20 @@ public class PmsGiftsController {
             return new CommonResult().failed();
         }
     }
+    @ApiOperation(value = "批量更新显示状态")
+    @RequestMapping(value = "/update/showStatus", method = RequestMethod.POST)
+    @ResponseBody
+    @SysLog(MODULE = "pms", REMARK = "批量更新显示状态")
+    public Object updateShowStatus(@RequestParam("ids") Long ids,
+                                   @RequestParam("showStatus") Integer showStatus) {
+        PmsGifts g = new PmsGifts();
+        g.setId(ids);
+        g.setShowStatus(showStatus);
+        if (IPmsGiftsService.updateById(g)) {
+            return new CommonResult().success();
+        } else {
+            return new CommonResult().failed();
+        }
+    }
 
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsProductAttributeController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsProductAttributeController.java
index 7586daae5a95a32a859fae5c0c0e8509a6fcc0e3..777702c709a1f49feaf0da2b77d37a8c712ef8e1 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsProductAttributeController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsProductAttributeController.java
@@ -73,7 +73,7 @@ public class PmsProductAttributeController {
     @PreAuthorize("hasAuthority('pms:PmsProductAttribute:create')")
     public Object savePmsProductAttribute(@RequestBody PmsProductAttribute entity) {
         try {
-            if (entity.getType().equals(null)){
+            if (entity.getType().equals(null)) {
                 entity.setType(0);
             }
             if (IPmsProductAttributeService.saveAndUpdate(entity)) {
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsProductConsultController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsProductConsultController.java
index 814515117a9100338a340f2b475d144d545df2a1..38e424679ef9069863acab48b781ad20ffe1a423 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsProductConsultController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsProductConsultController.java
@@ -50,7 +50,6 @@ public class PmsProductConsultController {
     }
 
 
-
     @SysLog(MODULE = "pms", REMARK = "删除产品咨询表")
     @ApiOperation("删除产品咨询表")
     @GetMapping(value = "/delete/{id}")
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsProductController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsProductController.java
index ecce6b4b2eec1f3534718a8813844efac9dfe54c..5b4ad6fb9db428d6e983eeef3a473202921b5c36 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsProductController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsProductController.java
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zscat.mallplus.annotation.SysLog;
 import com.zscat.mallplus.enums.ConstansValue;
-import com.zscat.mallplus.oms.entity.OmsOrder;
 import com.zscat.mallplus.pms.entity.PmsProduct;
 import com.zscat.mallplus.pms.entity.PmsProductVertifyRecord;
 import com.zscat.mallplus.pms.service.IPmsProductService;
@@ -51,10 +50,10 @@ public class PmsProductController {
     ) {
         try {
             IPage<PmsProduct> page = null;
-            if (ValidatorUtils.notEmpty(entity.getKeyword())){
-                page = IPmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<PmsProduct>().eq("name",entity.getKeyword()).orderByDesc("create_time").select(ConstansValue.sampleGoodsList)) ;
-            }else {
-                page = IPmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<>(entity).orderByDesc("create_time").select(ConstansValue.sampleGoodsList)) ;
+            if (ValidatorUtils.notEmpty(entity.getKeyword())) {
+                page = IPmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<PmsProduct>().eq("name", entity.getKeyword()).orderByDesc("create_time").select(ConstansValue.sampleGoodsList));
+            } else {
+                page = IPmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<>(entity).orderByDesc("create_time").select(ConstansValue.sampleGoodsList));
 
             }
             return new CommonResult().success(page);
@@ -63,6 +62,7 @@ public class PmsProductController {
         }
         return new CommonResult().failed();
     }
+
     @ApiOperation("根据商品名称或货号模糊查询")
     @RequestMapping(value = "/simpleList", method = RequestMethod.GET)
     @ResponseBody
@@ -70,6 +70,7 @@ public class PmsProductController {
         List<PmsProduct> productList = IPmsProductService.list(keyword);
         return new CommonResult().success(productList);
     }
+
     @SysLog(MODULE = "pms", REMARK = "保存商品信息")
     @ApiOperation("保存商品信息")
     @PostMapping(value = "/create")
@@ -215,14 +216,16 @@ public class PmsProductController {
     @SysLog(MODULE = "pms", REMARK = "批量上下架")
     public Object updatePublishStatu(@RequestBody IdStatus ids, BindingResult result) {
         PmsProduct product = new PmsProduct();
-        product.setId(ids.getId());product.setPublishStatus(ids.getStatus());
+        product.setId(ids.getId());
+        product.setPublishStatus(ids.getStatus());
         Boolean count = IPmsProductService.updateById(product);
-        if (count ) {
+        if (count) {
             return new CommonResult().success(count);
         } else {
             return new CommonResult().failed();
         }
     }
+
     @ApiOperation("批量推荐商品")
     @RequestMapping(value = "/update/recommendStatus", method = RequestMethod.POST)
     @ResponseBody
@@ -270,16 +273,18 @@ public class PmsProductController {
 
     @GetMapping(value = "/goods/list")
     public Object getPmsProductListByPage(PmsProduct entity,
-                                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
+                                          @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
     ) {
         try {
-            if(entity.getType()==1){
-                return new CommonResult().success(IPmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<PmsProduct>().eq("publish_status",1).gt("stock",0).select(ConstansValue.sampleGoodsList).orderByDesc("create_time")));
-            }if(entity.getType()==2){
-                return new CommonResult().success(IPmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<PmsProduct>().eq("publish_status",0).gt("stock",0).select(ConstansValue.sampleGoodsList).orderByDesc("create_time")));
-            }if(entity.getType()==3){
-                return new CommonResult().success(IPmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<PmsProduct>().lt("stock",1).select(ConstansValue.sampleGoodsList).orderByDesc("create_time")));
+            if (entity.getType() == 1) {
+                return new CommonResult().success(IPmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<PmsProduct>().eq("publish_status", 1).gt("stock", 0).select(ConstansValue.sampleGoodsList).orderByDesc("create_time")));
+            }
+            if (entity.getType() == 2) {
+                return new CommonResult().success(IPmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<PmsProduct>().eq("publish_status", 0).gt("stock", 0).select(ConstansValue.sampleGoodsList).orderByDesc("create_time")));
+            }
+            if (entity.getType() == 3) {
+                return new CommonResult().success(IPmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<PmsProduct>().lt("stock", 1).select(ConstansValue.sampleGoodsList).orderByDesc("create_time")));
             }
 
             return new CommonResult().success(IPmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<PmsProduct>().select(ConstansValue.sampleGoodsList)));
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsSkuStockController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsSkuStockController.java
index 8d9897b3b85ff88666f0ef64b60e75459823ba6f..62345ae340b14c92acc6827059fadce4620e768d 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsSkuStockController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/pms/controller/PmsSkuStockController.java
@@ -104,13 +104,12 @@ public class PmsSkuStockController {
     @ApiOperation("查询sku的库存明细")
     @GetMapping(value = "select/{id}")
     @PreAuthorize("hasAuthority('pms:PmsSkuStock:read')")
-    public Object getPmsSkuStockById(@ApiParam("sku的库存id") @PathVariable Long id) {
+    public Object getPmsSkuStockById(@ApiParam("sku的库存id") @PathVariable Long id, @RequestParam(value = "keyword", required = false) String keyword) {
         try {
             if (ValidatorUtils.empty(id)) {
                 return new CommonResult().paramFailed("sku的库存id");
             }
-            PmsSkuStock coupon = IPmsSkuStockService.getById(id);
-            return new CommonResult().success(coupon);
+            return new CommonResult().success(IPmsSkuStockService.getList(id, keyword));
         } catch (Exception e) {
             log.error("查询sku的库存明细：%s", e.getMessage(), e);
             return new CommonResult().failed();
@@ -143,7 +142,7 @@ public class PmsSkuStockController {
 
     @SysLog(MODULE = "pms", REMARK = "批量更新库存信息")
     @ApiOperation("批量更新库存信息")
-    @RequestMapping(value = "/update/{pid}", method = RequestMethod.POST)
+    @RequestMapping(value = "/updatePid/{pid}", method = RequestMethod.POST)
     @ResponseBody
     public Object update(@PathVariable Long pid, @RequestBody List<PmsSkuStock> skuStockList) {
         int count = IPmsSkuStockService.update(pid, skuStockList);
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/pms/service/impl/PmsProductAttributeServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/pms/service/impl/PmsProductAttributeServiceImpl.java
index 99636a86911f17c3fecb752cc097a52b362cb4d5..69870028b2999b5f09e611d2ad0838ea0b4cbc63 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/pms/service/impl/PmsProductAttributeServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/pms/service/impl/PmsProductAttributeServiceImpl.java
@@ -39,8 +39,8 @@ public class PmsProductAttributeServiceImpl extends ServiceImpl<PmsProductAttrib
     @Transactional
     @Override
     public boolean saveAndUpdate(PmsProductAttribute entity) {
-        int count = productAttributeMapper.selectCount(new QueryWrapper<PmsProductAttribute>().eq("product_attribute_category_id",entity.getProductAttributeCategoryId()).eq("type",entity.getType()));
-        if (count>=3){
+        int count = productAttributeMapper.selectCount(new QueryWrapper<PmsProductAttribute>().eq("product_attribute_category_id", entity.getProductAttributeCategoryId()).eq("type", entity.getType()));
+        if (count >= 3) {
             throw new BusinessMallException("规格或者属性数量不能超过3个");
         }
         productAttributeMapper.insert(entity);
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/pms/service/impl/PmsProductServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/pms/service/impl/PmsProductServiceImpl.java
index 7eeb0184683014e225392053d0514443d4086dbb..90566de7bd496035f4947b1ffe06fe1386b509b4 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/pms/service/impl/PmsProductServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/pms/service/impl/PmsProductServiceImpl.java
@@ -2,6 +2,7 @@ package com.zscat.mallplus.pms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zscat.mallplus.ApiContext;
 import com.zscat.mallplus.cms.service.ICmsPrefrenceAreaProductRelationService;
 import com.zscat.mallplus.cms.service.ICmsSubjectProductRelationService;
 import com.zscat.mallplus.pms.entity.*;
@@ -15,7 +16,6 @@ import com.zscat.mallplus.util.JsonUtil;
 import com.zscat.mallplus.util.UserUtils;
 import com.zscat.mallplus.utils.IdWorker;
 import com.zscat.mallplus.utils.ValidatorUtils;
-import com.zscat.mallplus.ApiContext;
 import com.zscat.mallplus.vo.Rediskey;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -90,20 +90,22 @@ public class PmsProductServiceImpl extends ServiceImpl<PmsProductMapper, PmsProd
         product.setId(null);
         //处理sku的编码
         handleSkuStockCode(productParam.getSkuStockList(), product);
-        if (ValidatorUtils.isEmpty(product.getProductSn())){
-            product.setProductSn(IdWorker.getId()+"");
+        if (ValidatorUtils.isEmpty(product.getProductSn())) {
+            product.setProductSn(IdWorker.getId() + "");
         }
-        if (ValidatorUtils.empty(product.getExpireTime())){
-            product.setExpireTime(DateUtils.strToDate(DateUtils.addDay(new Date(),5)));
+        if (ValidatorUtils.empty(product.getExpireTime())) {
+            product.setExpireTime(DateUtils.strToDate(DateUtils.addDay(new Date(), 5)));
         }
-        if (ValidatorUtils.empty(product.getOriginalPrice())){
+        if (ValidatorUtils.empty(product.getOriginalPrice())) {
             product.setOriginalPrice(product.getPrice());
+        }if (ValidatorUtils.empty(product.getUnit())) {
+            product.setUnit("件");
         }
         productMapper.insert(product);
         //根据促销类型设置价格：、阶梯价格、满减价格
         Long productId = product.getId();
         //会员价格
-     //   relateAndInsertList(memberPriceDao, productParam.getMemberPriceList(), productId);
+        //   relateAndInsertList(memberPriceDao, productParam.getMemberPriceList(), productId);
         //阶梯价格
         relateAndInsertList(productLadderDao, productParam.getProductLadderList(), productId);
         //满减价格
@@ -118,13 +120,13 @@ public class PmsProductServiceImpl extends ServiceImpl<PmsProductMapper, PmsProd
         //关联优选
         relateAndInsertList(prefrenceAreaProductRelationDao, productParam.getPrefrenceAreaProductRelationList(), productId);
         count = 1;
-    //    redisService.set(String.format(Rediskey.GOODSDETAIL, product.getId()), JsonUtil.objectToJson(productParam));
+        //    redisService.set(String.format(Rediskey.GOODSDETAIL, product.getId()), JsonUtil.objectToJson(productParam));
         return count;
     }
 
-    private void  handleSkuStockCode(List<PmsSkuStock> skuStockList, PmsProduct product) {
-        if (CollectionUtils.isEmpty(skuStockList)) return ;
-        int stock = 0 ;
+    private void handleSkuStockCode(List<PmsSkuStock> skuStockList, PmsProduct product) {
+        if (CollectionUtils.isEmpty(skuStockList)) return;
+        int stock = 0;
         for (int i = 0; i < skuStockList.size(); i++) {
             PmsSkuStock skuStock = skuStockList.get(i);
             skuStock.setProductName(product.getName());
@@ -139,7 +141,7 @@ public class PmsProductServiceImpl extends ServiceImpl<PmsProductMapper, PmsProd
                 sb.append(String.format("%03d", i + 1));
                 skuStock.setSkuCode(sb.toString());
             }
-            stock =stock + skuStock.getStock();
+            stock = stock + skuStock.getStock();
         }
         product.setStock(stock);
     }
@@ -156,15 +158,15 @@ public class PmsProductServiceImpl extends ServiceImpl<PmsProductMapper, PmsProd
         //更新商品信息
         PmsProduct product = productParam;
         product.setId(id);
-        if (ValidatorUtils.isEmpty(product.getProductSn())){
-            product.setProductSn(IdWorker.getId()+"");
+        if (ValidatorUtils.isEmpty(product.getProductSn())) {
+            product.setProductSn(IdWorker.getId() + "");
         }
         handleSkuStockCode(productParam.getSkuStockList(), product);
         productMapper.updateById(product);
         redisService.remove(String.format(Rediskey.GOODSDETAIL, product.getId()));
         //会员价格
-      //  memberPriceMapper.delete(new QueryWrapper<>(new PmsMemberPrice()).eq("product_id", id));
-      //  relateAndInsertList(memberPriceDao, productParam.getMemberPriceList(), id);
+        //  memberPriceMapper.delete(new QueryWrapper<>(new PmsMemberPrice()).eq("product_id", id));
+        //  relateAndInsertList(memberPriceDao, productParam.getMemberPriceList(), id);
         //阶梯价格
 
         productLadderMapper.delete(new QueryWrapper<>(new PmsProductLadder()).eq("product_id", id));
@@ -221,11 +223,13 @@ public class PmsProductServiceImpl extends ServiceImpl<PmsProductMapper, PmsProd
         clerGoodsRedis(ids);
         return productMapper.update(record, new QueryWrapper<PmsProduct>().in("id", ids));
     }
+
     public void clerGoodsRedis(List<Long> ids) {
-        for (Long id : ids){
+        for (Long id : ids) {
             redisService.remove(String.format(Rediskey.GOODSDETAIL, id));
         }
     }
+
     @Override
     public int updateRecommendStatus(List<Long> ids, Integer recommendStatus) {
         PmsProduct record = new PmsProduct();
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsBasicMarkingController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsBasicMarkingController.java
index c7e6c7a5a9de9ce007468edb7a6b89a18bfdbcf0..7df5cb4eafc0fb71e9b44cd5f08190bc61e3b1b1 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsBasicMarkingController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsBasicMarkingController.java
@@ -75,39 +75,39 @@ public class SmsBasicMarkingController {
 
     private void validateParam(@RequestBody SmsBasicMarking entity) {
         // 活动商品  1 按类别  2 部分商品
-        if (ValidatorUtils.empty(entity.getActiviGoods())){
+        if (ValidatorUtils.empty(entity.getActiviGoods())) {
             entity.setActiviGoods(3);
         }
-        if (ValidatorUtils.empty(entity.getActiviUser())){
+        if (ValidatorUtils.empty(entity.getActiviUser())) {
             entity.setActiviUser(1);
         }
-        if (ValidatorUtils.empty(entity.getSmallType())){
+        if (ValidatorUtils.empty(entity.getSmallType())) {
             entity.setSmallType(1);
         }
-        if (entity.getActiviGoods()==1){
-            if (ValidatorUtils.notEmpty(entity.getProductCategoryRelationList())){
+        if (entity.getActiviGoods() == 1) {
+            if (ValidatorUtils.notEmpty(entity.getProductCategoryRelationList())) {
                 entity.setGoodsDs(JsonUtil.objectToJson(entity.getProductCategoryRelationList()));
             }
-        }else if (entity.getActiviGoods()==2){
-            if (ValidatorUtils.notEmpty(entity.getProductRelationList())){
+        } else if (entity.getActiviGoods() == 2) {
+            if (ValidatorUtils.notEmpty(entity.getProductRelationList())) {
                 entity.setGoodsDs(JsonUtil.objectToJson(entity.getProductRelationList()));
             }
-        }else {
+        } else {
             entity.setGoodsDs(null);
         }
 
-        if (entity.getActiviUser()==2){
-            if (ValidatorUtils.notEmpty(entity.getMemberLevelList())){
+        if (entity.getActiviUser() == 2) {
+            if (ValidatorUtils.notEmpty(entity.getMemberLevelList())) {
                 entity.setUserLevel(JsonUtil.objectToJson(entity.getMemberLevelList()));
             }
-        }else {
+        } else {
             entity.setUserLevel(null);
         }
-        if (entity.getSmallType()==1) {
+        if (entity.getSmallType() == 1) {
             if (ValidatorUtils.notEmpty(entity.getActrule())) {
                 entity.setRules(JsonUtil.objectToJson(entity.getActrule()));
             }
-        }else  {
+        } else {
             if (ValidatorUtils.notEmpty(entity.getActrule1())) {
                 entity.setRules(JsonUtil.objectToJson(entity.getActrule1()));
             }
@@ -161,30 +161,30 @@ public class SmsBasicMarkingController {
             }
             SmsBasicMarking entity = ISmsBasicMarkingService.getById(id);
             // 活动商品  1 按类别  2 部分商品
-            if (entity.getActiviGoods()==1){
-                if (ValidatorUtils.notEmpty(entity.getGoodsDs())){
+            if (entity.getActiviGoods() == 1) {
+                if (ValidatorUtils.notEmpty(entity.getGoodsDs())) {
                     entity.setProductCategoryRelationList(JsonUtil.jsonToList(entity.getGoodsDs(), BeanKv.class));
                 }
             }
-            if (entity.getActiviGoods()==2){
-                if (ValidatorUtils.notEmpty(entity.getGoodsDs())){
+            if (entity.getActiviGoods() == 2) {
+                if (ValidatorUtils.notEmpty(entity.getGoodsDs())) {
                     entity.setProductRelationList(JsonUtil.jsonToList(entity.getGoodsDs(), BeanKv.class));
 
                 }
             }
-            if (entity.getActiviUser()==2){
-                if (ValidatorUtils.notEmpty(entity.getUserLevel())){
+            if (entity.getActiviUser() == 2) {
+                if (ValidatorUtils.notEmpty(entity.getUserLevel())) {
                     entity.setMemberLevelList(JsonUtil.jsonToList(entity.getUserLevel(), BeanKv.class));
                 }
             }
-            if (entity.getSmallType()==1) {
+            if (entity.getSmallType() == 1) {
                 if (ValidatorUtils.notEmpty(entity.getRules())) {
-                    entity.setActrule(JsonUtil.jsonToList(entity.getRules(),BasicRuls.class));
+                    entity.setActrule(JsonUtil.jsonToList(entity.getRules(), BasicRuls.class));
                 }
             }
-            if (entity.getSmallType()==2) {
+            if (entity.getSmallType() == 2) {
                 if (ValidatorUtils.notEmpty(entity.getRules())) {
-                    entity.setActrule1(JsonUtil.jsonToList(entity.getRules(),BasicRuls.class));
+                    entity.setActrule1(JsonUtil.jsonToList(entity.getRules(), BasicRuls.class));
                 }
             }
             return new CommonResult().success(entity);
@@ -208,14 +208,15 @@ public class SmsBasicMarkingController {
             return new CommonResult().failed();
         }
     }
+
     @ApiOperation("批量上下架")
     @RequestMapping(value = "/publishStatus", method = RequestMethod.POST)
     @ResponseBody
     @SysLog(MODULE = "pms", REMARK = "批量上下架")
-    public Object updatePublishStatus(@RequestParam("id") Long  id,
+    public Object updatePublishStatus(@RequestParam("id") Long id,
                                       @RequestParam("status") Integer status,
                                       @RequestParam("bigType") Integer bigType) {
-        int count = ISmsBasicMarkingService.updateStatus(id, status,bigType);
+        int count = ISmsBasicMarkingService.updateStatus(id, status, bigType);
         return new CommonResult().success(count);
     }
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsContentController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsContentController.java
new file mode 100644
index 0000000000000000000000000000000000000000..48e1dbbf12bd35b8ef18912f0fef79d7471bcb91
--- /dev/null
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsContentController.java
@@ -0,0 +1,155 @@
+package com.zscat.mallplus.sms.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zscat.mallplus.annotation.SysLog;
+import com.zscat.mallplus.sms.entity.SmsContent;
+import com.zscat.mallplus.sms.service.ISmsContentService;
+import com.zscat.mallplus.util.EasyPoiUtils;
+import com.zscat.mallplus.utils.CommonResult;
+import com.zscat.mallplus.utils.ValidatorUtils;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author mallplus
+ * @date 2019-12-07
+ * 短信模版
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sms/smsContent")
+public class SmsContentController {
+
+    @Resource
+    private ISmsContentService ISmsContentService;
+
+    @SysLog(MODULE = "ms", REMARK = "根据条件查询所有短信模版列表")
+    @ApiOperation("根据条件查询所有短信模版列表")
+    @GetMapping(value = "/list")
+    @PreAuthorize("hasAuthority('sms:smsContent:read')")
+    public Object getSmsContentByPage(SmsContent entity,
+                                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
+    ) {
+        try {
+            return new CommonResult().success(ISmsContentService.page(new Page<SmsContent>(pageNum, pageSize), new QueryWrapper<>(entity)));
+        } catch (Exception e) {
+            log.error("根据条件查询所有短信模版列表：%s", e.getMessage(), e);
+        }
+        return new CommonResult().failed();
+    }
+
+    @SysLog(MODULE = "ms", REMARK = "保存短信模版")
+    @ApiOperation("保存短信模版")
+    @PostMapping(value = "/create")
+    @PreAuthorize("hasAuthority('sms:smsContent:create')")
+    public Object saveSmsContent(@RequestBody SmsContent entity) {
+        try {
+            entity.setCreateTime(new Date());
+            if (ISmsContentService.save(entity)) {
+                return new CommonResult().success();
+            }
+        } catch (Exception e) {
+            log.error("保存短信模版：%s", e.getMessage(), e);
+            return new CommonResult().failed(e.getMessage());
+        }
+        return new CommonResult().failed();
+    }
+
+    @SysLog(MODULE = "ms", REMARK = "更新短信模版")
+    @ApiOperation("更新短信模版")
+    @PostMapping(value = "/update/{id}")
+    @PreAuthorize("hasAuthority('sms:smsContent:update')")
+    public Object updateSmsContent(@RequestBody SmsContent entity) {
+        try {
+            if (ISmsContentService.updateById(entity)) {
+                return new CommonResult().success();
+            }
+        } catch (Exception e) {
+            log.error("更新短信模版：%s", e.getMessage(), e);
+            return new CommonResult().failed(e.getMessage());
+        }
+        return new CommonResult().failed();
+    }
+
+    @SysLog(MODULE = "ms", REMARK = "删除短信模版")
+    @ApiOperation("删除短信模版")
+    @GetMapping(value = "/delete/{id}")
+    @PreAuthorize("hasAuthority('sms:smsContent:delete')")
+    public Object deleteSmsContent(@ApiParam("短信模版id") @PathVariable Long id) {
+        try {
+            if (ValidatorUtils.empty(id)) {
+                return new CommonResult().paramFailed("短信模版id");
+            }
+            if (ISmsContentService.removeById(id)) {
+                return new CommonResult().success();
+            }
+        } catch (Exception e) {
+            log.error("删除短信模版：%s", e.getMessage(), e);
+            return new CommonResult().failed(e.getMessage());
+        }
+        return new CommonResult().failed();
+    }
+
+    @SysLog(MODULE = "ms", REMARK = "给短信模版分配短信模版")
+    @ApiOperation("查询短信模版明细")
+    @GetMapping(value = "/{id}")
+    @PreAuthorize("hasAuthority('sms:smsContent:read')")
+    public Object getSmsContentById(@ApiParam("短信模版id") @PathVariable Long id) {
+        try {
+            if (ValidatorUtils.empty(id)) {
+                return new CommonResult().paramFailed("短信模版id");
+            }
+            SmsContent coupon = ISmsContentService.getById(id);
+            return new CommonResult().success(coupon);
+        } catch (Exception e) {
+            log.error("查询短信模版明细：%s", e.getMessage(), e);
+            return new CommonResult().failed();
+        }
+
+    }
+
+    @ApiOperation(value = "批量删除短信模版")
+    @RequestMapping(value = "/delete/batch", method = RequestMethod.GET)
+    @SysLog(MODULE = "ms", REMARK = "批量删除短信模版")
+    @PreAuthorize("hasAuthority('sms:smsContent:delete')")
+    public Object deleteBatch(@RequestParam("ids") List<Long> ids) {
+        boolean count = ISmsContentService.removeByIds(ids);
+        if (count) {
+            return new CommonResult().success(count);
+        } else {
+            return new CommonResult().failed();
+        }
+    }
+
+
+    @SysLog(MODULE = "ms", REMARK = "导出社区数据")
+    @GetMapping("/exportExcel")
+    public void export(HttpServletResponse response, SmsContent entity) {
+        // 模拟从数据库获取需要导出的数据
+        List<SmsContent> personList = ISmsContentService.list(new QueryWrapper<>(entity));
+        // 导出操作
+        EasyPoiUtils.exportExcel(personList, "导出社区数据", "社区数据", SmsContent.class, "导出社区数据.xls", response);
+
+    }
+
+    @SysLog(MODULE = "ms", REMARK = "导入社区数据")
+    @PostMapping("/importExcel")
+    public void importUsers(@RequestParam MultipartFile file) {
+        List<SmsContent> personList = EasyPoiUtils.importExcel(file, SmsContent.class);
+        ISmsContentService.saveBatch(personList);
+    }
+}
+
+
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsDiyPageController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsDiyPageController.java
index 57f16c09182b3bc40ab54031297c307fdf152713..c6f9fe230a0747742e8845ff7d76e39bbdf0051b 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsDiyPageController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsDiyPageController.java
@@ -48,8 +48,8 @@ public class SmsDiyPageController {
     @ApiOperation("根据条件查询所有页面配置列表")
     @GetMapping(value = "/list")
     public Object getSmsDiyPageByPage(SmsDiyPage entity,
-                                     @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                     @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
+                                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
     ) {
         try {
             return new CommonResult().success(ISmsDiyPageService.page(new Page<SmsDiyPage>(pageNum, pageSize), new QueryWrapper<>(entity)));
@@ -58,6 +58,7 @@ public class SmsDiyPageController {
         }
         return new CommonResult().failed();
     }
+
     @SysLog(MODULE = "自定义页面配置", REMARK = "添加自定义页面配置")
     @ApiOperation("添加自定义页面配置")
     @PostMapping(value = "/create")
@@ -77,7 +78,7 @@ public class SmsDiyPageController {
             entity.setCreateTime(sdf.parse(da));
             ISmsDiyPageService.save(entity);
             if (entity.getType() == 2 && entity.getStatus() == 1) {
-                redisRepository.set(String.format(Rediskey.EsShopDiypage, 12),  JsonUtil.objectToJson(entity));
+                redisRepository.set(String.format(Rediskey.EsShopDiypage, 12), JsonUtil.objectToJson(entity));
             }
             return new CommonResult().success("success");
         } catch (Exception e) {
@@ -121,6 +122,7 @@ public class SmsDiyPageController {
             return new CommonResult().failed();
         }
     }
+
     @SysLog(MODULE = "sms", REMARK = "给优惠卷表分配优惠卷表")
     @ApiOperation("查询优惠卷表明细")
     @GetMapping(value = "/{id}")
@@ -137,6 +139,7 @@ public class SmsDiyPageController {
         }
 
     }
+
     @SysLog(MODULE = "自定义页面配置", REMARK = "更改自定义页面配置信息")
     @ApiOperation("更改自定义页面配置信息")
     @PostMapping(value = "/update")
@@ -174,8 +177,8 @@ public class SmsDiyPageController {
     @ApiOperation("查询页面")
     @GetMapping("/selDiyPage")
     public Object selDiyPage(SmsDiyPage entity,
-                                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
+                             @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
     ) {
         try {
             return new CommonResult().success(ISmsDiyPageService.page(new Page<SmsDiyPage>(pageNum, pageSize), new QueryWrapper<>(entity)));
@@ -192,7 +195,7 @@ public class SmsDiyPageController {
                                    @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         try {
-            return new CommonResult().success(ISmsDiyPageService.page(new Page<SmsDiyPage>(pageNum, pageSize), new QueryWrapper<>(entity).like("name",entity.getName())));
+            return new CommonResult().success(ISmsDiyPageService.page(new Page<SmsDiyPage>(pageNum, pageSize), new QueryWrapper<>(entity).like("name", entity.getName())));
         } catch (Exception e) {
             return new CommonResult().failed();
         }
@@ -272,6 +275,7 @@ public class SmsDiyPageController {
         }
 
     }
+
     @ApiOperation("修改展示状态")
     @RequestMapping(value = "/update/updateShowStatus")
     @ResponseBody
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsDiypageTemplateCategoryController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsDiypageTemplateCategoryController.java
index a454e6119afef4846edeb4b2607811b2efec8a8d..65b2ec58c8cf48d24145ac11ac364e760105b376 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsDiypageTemplateCategoryController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsDiypageTemplateCategoryController.java
@@ -21,32 +21,32 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
-* @author mallplus
-* @date 2019-12-04
-*  页面模版
-*/
+ * @author mallplus
+ * @date 2019-12-04
+ * 页面模版
+ */
 @Slf4j
 @RestController
 @RequestMapping("/sms/smsDiypageTemplateCategory")
 public class SmsDiypageTemplateCategoryController {
 
-@Resource
-private ISmsDiypageTemplateCategoryService ISmsDiypageTemplateCategoryService;
-
-@SysLog(MODULE = "sms", REMARK = "根据条件查询所有页面模版列表")
-@ApiOperation("根据条件查询所有页面模版列表")
-@GetMapping(value = "/list")
-@PreAuthorize("hasAuthority('sms:smsDiypageTemplateCategory:read')")
-public Object getSmsDiypageTemplateCategoryByPage(SmsDiypageTemplateCategory entity,
-@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
-) {
-try {
-return new CommonResult().success(ISmsDiypageTemplateCategoryService.page(new Page<SmsDiypageTemplateCategory>(pageNum, pageSize), new QueryWrapper<>(entity)));
-    } catch (Exception e) {
-    log.error("根据条件查询所有页面模版列表：%s", e.getMessage(), e);
-    }
-    return new CommonResult().failed();
+    @Resource
+    private ISmsDiypageTemplateCategoryService ISmsDiypageTemplateCategoryService;
+
+    @SysLog(MODULE = "sms", REMARK = "根据条件查询所有页面模版列表")
+    @ApiOperation("根据条件查询所有页面模版列表")
+    @GetMapping(value = "/list")
+    @PreAuthorize("hasAuthority('sms:smsDiypageTemplateCategory:read')")
+    public Object getSmsDiypageTemplateCategoryByPage(SmsDiypageTemplateCategory entity,
+                                                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
+    ) {
+        try {
+            return new CommonResult().success(ISmsDiypageTemplateCategoryService.page(new Page<SmsDiypageTemplateCategory>(pageNum, pageSize), new QueryWrapper<>(entity)));
+        } catch (Exception e) {
+            log.error("根据条件查询所有页面模版列表：%s", e.getMessage(), e);
+        }
+        return new CommonResult().failed();
     }
 
     @SysLog(MODULE = "sms", REMARK = "保存页面模版")
@@ -54,16 +54,16 @@ return new CommonResult().success(ISmsDiypageTemplateCategoryService.page(new Pa
     @PostMapping(value = "/create")
     @PreAuthorize("hasAuthority('sms:smsDiypageTemplateCategory:create')")
     public Object saveSmsDiypageTemplateCategory(@RequestBody SmsDiypageTemplateCategory entity) {
-    try {
+        try {
 
-    if (ISmsDiypageTemplateCategoryService.save(entity)) {
-    return new CommonResult().success();
-    }
-    } catch (Exception e) {
-    log.error("保存页面模版：%s", e.getMessage(), e);
-    return new CommonResult().failed(e.getMessage());
-    }
-    return new CommonResult().failed();
+            if (ISmsDiypageTemplateCategoryService.save(entity)) {
+                return new CommonResult().success();
+            }
+        } catch (Exception e) {
+            log.error("保存页面模版：%s", e.getMessage(), e);
+            return new CommonResult().failed(e.getMessage());
+        }
+        return new CommonResult().failed();
     }
 
     @SysLog(MODULE = "sms", REMARK = "更新页面模版")
@@ -71,15 +71,15 @@ return new CommonResult().success(ISmsDiypageTemplateCategoryService.page(new Pa
     @PostMapping(value = "/update/{id}")
     @PreAuthorize("hasAuthority('sms:smsDiypageTemplateCategory:update')")
     public Object updateSmsDiypageTemplateCategory(@RequestBody SmsDiypageTemplateCategory entity) {
-    try {
-    if (ISmsDiypageTemplateCategoryService.updateById(entity)) {
-    return new CommonResult().success();
-    }
-    } catch (Exception e) {
-    log.error("更新页面模版：%s", e.getMessage(), e);
-    return new CommonResult().failed(e.getMessage());
-    }
-    return new CommonResult().failed();
+        try {
+            if (ISmsDiypageTemplateCategoryService.updateById(entity)) {
+                return new CommonResult().success();
+            }
+        } catch (Exception e) {
+            log.error("更新页面模版：%s", e.getMessage(), e);
+            return new CommonResult().failed(e.getMessage());
+        }
+        return new CommonResult().failed();
     }
 
     @SysLog(MODULE = "sms", REMARK = "删除页面模版")
@@ -87,18 +87,18 @@ return new CommonResult().success(ISmsDiypageTemplateCategoryService.page(new Pa
     @GetMapping(value = "/delete/{id}")
     @PreAuthorize("hasAuthority('sms:smsDiypageTemplateCategory:delete')")
     public Object deleteSmsDiypageTemplateCategory(@ApiParam("页面模版id") @PathVariable Long id) {
-    try {
-    if (ValidatorUtils.empty(id)) {
-    return new CommonResult().paramFailed("页面模版id");
-    }
-    if (ISmsDiypageTemplateCategoryService.removeById(id)) {
-    return new CommonResult().success();
-    }
-    } catch (Exception e) {
-    log.error("删除页面模版：%s", e.getMessage(), e);
-    return new CommonResult().failed(e.getMessage());
-    }
-    return new CommonResult().failed();
+        try {
+            if (ValidatorUtils.empty(id)) {
+                return new CommonResult().paramFailed("页面模版id");
+            }
+            if (ISmsDiypageTemplateCategoryService.removeById(id)) {
+                return new CommonResult().success();
+            }
+        } catch (Exception e) {
+            log.error("删除页面模版：%s", e.getMessage(), e);
+            return new CommonResult().failed(e.getMessage());
+        }
+        return new CommonResult().failed();
     }
 
     @SysLog(MODULE = "sms", REMARK = "给页面模版分配页面模版")
@@ -106,16 +106,16 @@ return new CommonResult().success(ISmsDiypageTemplateCategoryService.page(new Pa
     @GetMapping(value = "/{id}")
     @PreAuthorize("hasAuthority('sms:smsDiypageTemplateCategory:read')")
     public Object getSmsDiypageTemplateCategoryById(@ApiParam("页面模版id") @PathVariable Long id) {
-    try {
-    if (ValidatorUtils.empty(id)) {
-    return new CommonResult().paramFailed("页面模版id");
-    }
-    SmsDiypageTemplateCategory coupon = ISmsDiypageTemplateCategoryService.getById(id);
-    return new CommonResult().success(coupon);
-    } catch (Exception e) {
-    log.error("查询页面模版明细：%s", e.getMessage(), e);
-    return new CommonResult().failed();
-    }
+        try {
+            if (ValidatorUtils.empty(id)) {
+                return new CommonResult().paramFailed("页面模版id");
+            }
+            SmsDiypageTemplateCategory coupon = ISmsDiypageTemplateCategoryService.getById(id);
+            return new CommonResult().success(coupon);
+        } catch (Exception e) {
+            log.error("查询页面模版明细：%s", e.getMessage(), e);
+            return new CommonResult().failed();
+        }
 
     }
 
@@ -126,30 +126,29 @@ return new CommonResult().success(ISmsDiypageTemplateCategoryService.page(new Pa
     public Object deleteBatch(@RequestParam("ids") List<Long> ids) {
         boolean count = ISmsDiypageTemplateCategoryService.removeByIds(ids);
         if (count) {
-        return new CommonResult().success(count);
+            return new CommonResult().success(count);
         } else {
-        return new CommonResult().failed();
+            return new CommonResult().failed();
         }
-        }
-
+    }
 
 
-        @SysLog(MODULE = "sms", REMARK = "导出社区数据")
-        @GetMapping("/exportExcel")
-        public void export(HttpServletResponse response, SmsDiypageTemplateCategory entity) {
+    @SysLog(MODULE = "sms", REMARK = "导出社区数据")
+    @GetMapping("/exportExcel")
+    public void export(HttpServletResponse response, SmsDiypageTemplateCategory entity) {
         // 模拟从数据库获取需要导出的数据
         List<SmsDiypageTemplateCategory> personList = ISmsDiypageTemplateCategoryService.list(new QueryWrapper<>(entity));
-            // 导出操作
-            EasyPoiUtils.exportExcel(personList, "导出社区数据", "社区数据", SmsDiypageTemplateCategory.class, "导出社区数据.xls", response);
+        // 导出操作
+        EasyPoiUtils.exportExcel(personList, "导出社区数据", "社区数据", SmsDiypageTemplateCategory.class, "导出社区数据.xls", response);
 
-            }
+    }
 
-            @SysLog(MODULE = "sms", REMARK = "导入社区数据")
-            @PostMapping("/importExcel")
-            public void importUsers(@RequestParam MultipartFile file) {
-            List<SmsDiypageTemplateCategory> personList = EasyPoiUtils.importExcel(file, SmsDiypageTemplateCategory.class);
-                ISmsDiypageTemplateCategoryService.saveBatch(personList);
-                }
-                }
+    @SysLog(MODULE = "sms", REMARK = "导入社区数据")
+    @PostMapping("/importExcel")
+    public void importUsers(@RequestParam MultipartFile file) {
+        List<SmsDiypageTemplateCategory> personList = EasyPoiUtils.importExcel(file, SmsDiypageTemplateCategory.class);
+        ISmsDiypageTemplateCategoryService.saveBatch(personList);
+    }
+}
 
 
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsGroupActivityController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsGroupActivityController.java
index a6f07ede70757b7b1301551f367f271861d34feb..d192432839f0769c2c9fc5982601e66317035208 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsGroupActivityController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsGroupActivityController.java
@@ -20,7 +20,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author zscat
@@ -38,8 +38,8 @@ public class SmsGroupActivityController {
     @ApiOperation("根据条件查询所有团购活动表列表")
     @GetMapping(value = "/list")
     public Object getSmsGroupActivityByPage(SmsGroupActivity entity,
-                                           @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                           @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
+                                            @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
     ) {
         try {
             return new CommonResult().success(smsGroupActivityService.page(new Page<SmsGroupActivity>(pageNum, pageSize), new QueryWrapper<>(entity)));
@@ -56,13 +56,13 @@ public class SmsGroupActivityController {
         try {
             List<PmsProduct> list = entity.getProductList();
             String goodsIs = "";
-            BigDecimal originPrice= BigDecimal.ZERO;
-            for (PmsProduct p: list){
-                originPrice=originPrice.add(p.getPrice());
-                goodsIs=goodsIs+p.getId()+",";
+            BigDecimal originPrice = BigDecimal.ZERO;
+            for (PmsProduct p : list) {
+                originPrice = originPrice.add(p.getPrice());
+                goodsIs = goodsIs + p.getId() + ",";
             }
             entity.setOriginprice(originPrice);
-            entity.setGoodsIds(goodsIs.substring(0,goodsIs.length()-1));
+            entity.setGoodsIds(goodsIs.substring(0, goodsIs.length() - 1));
             if (smsGroupActivityService.save(entity)) {
                 return new CommonResult().success();
             }
@@ -80,13 +80,13 @@ public class SmsGroupActivityController {
         try {
             List<PmsProduct> list = entity.getProductList();
             String goodsIs = "";
-            BigDecimal originPrice= BigDecimal.ZERO;
-            for (PmsProduct p: list){
-                originPrice=originPrice.add(p.getPrice());
-                goodsIs=goodsIs+p.getId()+",";
+            BigDecimal originPrice = BigDecimal.ZERO;
+            for (PmsProduct p : list) {
+                originPrice = originPrice.add(p.getPrice());
+                goodsIs = goodsIs + p.getId() + ",";
             }
             entity.setOriginprice(originPrice);
-            entity.setGoodsIds(goodsIs.substring(0,goodsIs.length()-1));
+            entity.setGoodsIds(goodsIs.substring(0, goodsIs.length() - 1));
             if (smsGroupActivityService.updateById(entity)) {
                 return new CommonResult().success();
             }
@@ -144,6 +144,7 @@ public class SmsGroupActivityController {
             return new CommonResult().failed();
         }
     }
+
     @ApiOperation("修改展示状态")
     @RequestMapping(value = "/update/updateShowStatus")
     @ResponseBody
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsGroupController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsGroupController.java
index cc081a3451eddc5b62b4f5afe35b4e673201972f..81f655c771e8c6b6810457fc5f5f14368c69f226 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsGroupController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsGroupController.java
@@ -5,9 +5,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zscat.mallplus.annotation.SysLog;
 import com.zscat.mallplus.sms.entity.SmsGroup;
 import com.zscat.mallplus.sms.entity.SmsGroupMember;
+import com.zscat.mallplus.sms.entity.SmsGroupRecord;
 import com.zscat.mallplus.sms.mapper.SmsGroupMemberMapper;
+import com.zscat.mallplus.sms.mapper.SmsGroupRecordMapper;
 import com.zscat.mallplus.sms.service.ISmsGroupService;
-import com.zscat.mallplus.ums.entity.UmsMember;
 import com.zscat.mallplus.ums.service.IUmsMemberService;
 import com.zscat.mallplus.utils.CommonResult;
 import com.zscat.mallplus.utils.ValidatorUtils;
@@ -19,8 +20,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -37,8 +36,14 @@ import java.util.List;
 @Api(tags = "SmsGroupController", description = "管理")
 @RequestMapping("/sms/SmsGroup")
 public class SmsGroupController {
+    @Resource
+    private SmsGroupRecordMapper groupRecordMapper;
     @Resource
     private ISmsGroupService ISmsGroupService;
+    @Resource
+    private IUmsMemberService memberService;
+    @Resource
+    private SmsGroupMemberMapper groupMemberMapper;
 
     @SysLog(MODULE = "sms", REMARK = "根据条件查询所有列表")
     @ApiOperation("根据条件查询所有列表")
@@ -56,29 +61,21 @@ public class SmsGroupController {
         }
         return new CommonResult().failed();
     }
-    @Resource
-    private IUmsMemberService memberService;
-    @Resource
-    private SmsGroupMemberMapper groupMemberMapper;
+
     @SysLog(MODULE = "sms", REMARK = "根据条件查询所有列表")
     @ApiOperation("根据条件查询所有列表")
     @GetMapping(value = "/listGroupMember")
-    public Object listGroupMember(SmsGroupMember entity,
-                                    @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
+    public Object listGroupMember(SmsGroupRecord entity,
+                                  @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
     ) {
         try {
-            List<SmsGroupMember> list = new ArrayList<>();
-            List<SmsGroupMember> groupMembers = groupMemberMapper.selectList(new QueryWrapper<SmsGroupMember>().eq("group_id",entity.getGroupId()));
-            for (SmsGroupMember groupMember : groupMembers){
-                if (ValidatorUtils.notEmpty(groupMember.getMemberId()) ){
-                    List<String> ids = Arrays.asList(groupMember.getMemberId().split(","));
-                    groupMember.setList((List<UmsMember>) memberService.listByIds(ids));
-                    list.add(groupMember);
-
-                }
+            List<SmsGroupRecord> groupRecords = groupRecordMapper.selectList(new QueryWrapper<SmsGroupRecord>().eq("group_id", entity.getId()));
+            for (SmsGroupRecord groupRecord : groupRecords) {
+                List<SmsGroupMember> groupMembers = groupMemberMapper.selectList(new QueryWrapper<SmsGroupMember>().eq("group_record_id", groupRecord.getId()).eq("status", 2));
+                groupRecord.setList(groupMembers);
             }
-            return new CommonResult().success(list);
+            return new CommonResult().success(groupRecords);
 
         } catch (Exception e) {
             log.error("根据条件查询所有列表：%s", e.getMessage(), e);
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsHomeNewProductController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsHomeNewProductController.java
index a44c9941181909dee0a0c8bba5d0d8ebbc39cd3f..f4efe4717b06b062480ab48869107c7057f8e97f 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsHomeNewProductController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsHomeNewProductController.java
@@ -144,7 +144,6 @@ public class SmsHomeNewProductController {
     }
 
 
-
     @ApiOperation("批量修改推荐状态")
     @RequestMapping(value = "/update/recommendStatus", method = RequestMethod.POST)
     @ResponseBody
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsHomeRecommendProductController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsHomeRecommendProductController.java
index cdf277ad90a337e11dd0c2e67068f1ca9e849c3b..64e86f5166d62500eca35ba80ec9552c879844cc 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsHomeRecommendProductController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsHomeRecommendProductController.java
@@ -48,6 +48,7 @@ public class SmsHomeRecommendProductController {
         }
         return new CommonResult().failed();
     }
+
     @ApiOperation("添加首页推荐")
     @RequestMapping(value = "/create", method = RequestMethod.POST)
     @ResponseBody
@@ -58,6 +59,7 @@ public class SmsHomeRecommendProductController {
         }
         return new CommonResult().failed();
     }
+
     @SysLog(MODULE = "sms", REMARK = "保存人气推荐商品表")
     @ApiOperation("保存人气推荐商品表")
     @PostMapping(value = "/creates")
@@ -142,7 +144,6 @@ public class SmsHomeRecommendProductController {
     }
 
 
-
     @ApiOperation("修改推荐排序")
     @RequestMapping(value = "/update/sort/{id}", method = RequestMethod.POST)
     @ResponseBody
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsHomeRecommendSubjectController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsHomeRecommendSubjectController.java
index 692c97cb56728f7e6cbd180ff98e201800445e8d..409a8a978d1924a41e05c2d814db91240021296b 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsHomeRecommendSubjectController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsHomeRecommendSubjectController.java
@@ -144,7 +144,6 @@ public class SmsHomeRecommendSubjectController {
     }
 
 
-
     @ApiOperation("修改推荐排序")
     @RequestMapping(value = "/update/sort/{id}", method = RequestMethod.POST)
     @ResponseBody
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsPaimaiController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsPaimaiController.java
index 4ff6ff641de7f1400bf80493a28bf4312c5cefc5..1a5213bf103e02914adcb50f0d0521db6d39747c 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsPaimaiController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsPaimaiController.java
@@ -50,12 +50,13 @@ public class SmsPaimaiController {
         }
         return new CommonResult().failed();
     }
+
     @SysLog(MODULE = "sms", REMARK = "根据条件查询所有竞拍表列表")
     @ApiOperation("根据条件查询所有竞拍表列表")
     @GetMapping(value = "/fetchPaiMaiLog")
     public Object fetchPaiMaiLog(SmsPaimaiLog entity,
-                                     @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                     @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
+                                 @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
     ) {
         try {
             return new CommonResult().success(smsPaimaiLogService.page(new Page<SmsPaimaiLog>(pageNum, pageSize), new QueryWrapper<>(entity).orderByDesc("create_time")));
@@ -64,6 +65,7 @@ public class SmsPaimaiController {
         }
         return new CommonResult().failed();
     }
+
     @SysLog(MODULE = "sms", REMARK = "保存竞拍表")
     @ApiOperation("保存竞拍表")
     @PostMapping(value = "/create")
@@ -130,6 +132,7 @@ public class SmsPaimaiController {
         }
 
     }
+
     @ApiOperation("修改展示状态")
     @RequestMapping(value = "/update/updateShowStatus")
     @ResponseBody
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsShareController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsShareController.java
index 855b2232d99f0c8771415492fef7873df9a6b50b..d43088cc2392e8409204d0184fdfee081bbbb414 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsShareController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/controller/SmsShareController.java
@@ -47,6 +47,5 @@ public class SmsShareController {
     }
 
 
-
 }
 
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsBasicGiftsService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsBasicGiftsService.java
index a82ccd86b883e9ca77bd5b8bbb2a423cce78fed8..2fed5e6debc20229d7d34dae79adeb0f9da8416d 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsBasicGiftsService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsBasicGiftsService.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.sms.entity.SmsBasicGifts;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsBasicMarkingService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsBasicMarkingService.java
index e62fac4991de9e798c0da3086611509ea6aa3805..0ffaf3e73d6dd18303953468d17d698f97f130ac 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsBasicMarkingService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsBasicMarkingService.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.sms.entity.SmsBasicMarking;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
@@ -13,5 +13,5 @@ import com.zscat.mallplus.sms.entity.SmsBasicMarking;
  */
 public interface ISmsBasicMarkingService extends IService<SmsBasicMarking> {
 
-    int updateStatus(Long id, Integer status,Integer bigType);
+    int updateStatus(Long id, Integer status, Integer bigType);
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsContentService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsContentService.java
new file mode 100644
index 0000000000000000000000000000000000000000..0837946a48e570041bd1d09a750be04baa9e36e9
--- /dev/null
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsContentService.java
@@ -0,0 +1,13 @@
+package com.zscat.mallplus.sms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.sms.entity.SmsContent;
+
+/**
+ * @author mallplus
+ * @date 2019-12-07
+ */
+
+public interface ISmsContentService extends IService<SmsContent> {
+
+}
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsDiyPageService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsDiyPageService.java
index d37ebbaa32dbdaeb7a5915a46b32392dbf7c6d2a..854e56256e3d2380898925b8f71946e877585994 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsDiyPageService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsDiyPageService.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.sms.service;
 
-import com.zscat.mallplus.sms.entity.SmsDiyPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.sms.entity.SmsDiyPage;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsDiypageTemplateCategoryService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsDiypageTemplateCategoryService.java
index 0a9d0cc7718f226a3003329a4c0e1b83f06eb48d..bc090a90ea1d7faa71913e5217954054479cd6df 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsDiypageTemplateCategoryService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsDiypageTemplateCategoryService.java
@@ -1,12 +1,12 @@
 package com.zscat.mallplus.sms.service;
 
-import com.zscat.mallplus.sms.entity.SmsDiypageTemplateCategory;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.sms.entity.SmsDiypageTemplateCategory;
 
 /**
-* @author mallplus
-* @date 2019-12-04
-*/
+ * @author mallplus
+ * @date 2019-12-04
+ */
 
 public interface ISmsDiypageTemplateCategoryService extends IService<SmsDiypageTemplateCategory> {
 
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsGroupActivityService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsGroupActivityService.java
index 9945993ae559f86f7ffc57814c381be82e574220..37c65e28bf4c49aa8e57c38d36f844f1f66fe80e 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsGroupActivityService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsGroupActivityService.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.sms.entity.SmsGroupActivity;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsPaimaiLogService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsPaimaiLogService.java
index 7a61ec02ac69361ab4189fa81849bbf65fbce5ba..f26afda321ef7b8c557ce0e28942a43647caf09c 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsPaimaiLogService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/ISmsPaimaiLogService.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.sms.entity.SmsPaimaiLog;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsBasicGiftsServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsBasicGiftsServiceImpl.java
index a2f2e4b2b11e2da6384d4383b544994fd3ff38ab..c0f0794a332440338ec5782dbf64d1086f0e1324 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsBasicGiftsServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsBasicGiftsServiceImpl.java
@@ -10,7 +10,7 @@ import javax.annotation.Resource;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
@@ -20,7 +20,8 @@ import javax.annotation.Resource;
 public class SmsBasicGiftsServiceImpl extends ServiceImpl<SmsBasicGiftsMapper, SmsBasicGifts> implements ISmsBasicGiftsService {
 
     @Resource
-    private  SmsBasicGiftsMapper giftsMapper;
+    private SmsBasicGiftsMapper giftsMapper;
+
     @Override
     public int updateStatus(Long id, Integer status) {
         SmsBasicGifts gifts = new SmsBasicGifts();
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsBasicMarkingServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsBasicMarkingServiceImpl.java
index a6f2c908037728fd200f8456387a94c038fbe514..0c76a448cc9fa64bd59e55966d4f67fa1b63cf35 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsBasicMarkingServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsBasicMarkingServiceImpl.java
@@ -12,7 +12,7 @@ import javax.annotation.Resource;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
@@ -23,23 +23,25 @@ public class SmsBasicMarkingServiceImpl extends ServiceImpl<SmsBasicMarkingMappe
 
     @Resource
     private SmsBasicMarkingMapper markingMapper;
+
     /**
-     *   * 1 有效2 无效
+     * * 1 有效2 无效
+     *
      * @param id
      * @param status
      * @return
      */
     @Transactional
     @Override
-    public int updateStatus(Long id, Integer status,Integer bigType) {
+    public int updateStatus(Long id, Integer status, Integer bigType) {
         SmsBasicMarking marking = new SmsBasicMarking();
-        if (status==1){
+        if (status == 1) {
             marking.setId(id);
             marking.setStatus(1);
             markingMapper.updateById(marking);
-        }else {
+        } else {
             marking.setStatus(1);
-            markingMapper.update(marking,new QueryWrapper<SmsBasicMarking>().eq("big_type",bigType));
+            markingMapper.update(marking, new QueryWrapper<SmsBasicMarking>().eq("big_type", bigType));
             marking.setId(id);
             marking.setStatus(0);
             markingMapper.updateById(marking);
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsContentServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsContentServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..eaff2f0d809c1005ab825883e6dc850748abf6c8
--- /dev/null
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsContentServiceImpl.java
@@ -0,0 +1,22 @@
+package com.zscat.mallplus.sms.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zscat.mallplus.sms.entity.SmsContent;
+import com.zscat.mallplus.sms.mapper.SmsContentMapper;
+import com.zscat.mallplus.sms.service.ISmsContentService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author mallplus
+ * @date 2019-12-07
+ */
+@Service
+public class SmsContentServiceImpl extends ServiceImpl<SmsContentMapper, SmsContent> implements ISmsContentService {
+
+    @Resource
+    private SmsContentMapper smsContentMapper;
+
+
+}
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsDiyPageServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsDiyPageServiceImpl.java
index 4f39074d77f3a35beec6d6220264cc112c9b6305..e462109188cb8fb1656b2a31b9de49e523309293 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsDiyPageServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsDiyPageServiceImpl.java
@@ -1,17 +1,17 @@
 package com.zscat.mallplus.sms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.sms.entity.SmsDiyPage;
 import com.zscat.mallplus.sms.mapper.SmsDiyPageMapper;
 import com.zscat.mallplus.sms.service.ISmsDiyPageService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
@@ -22,9 +22,10 @@ public class SmsDiyPageServiceImpl extends ServiceImpl<SmsDiyPageMapper, SmsDiyP
 
     @Resource
     private SmsDiyPageMapper diyPageMapper;
+
     @Override
     public Integer selDiyPageTypeId(Integer typeId, Long id) {
-        return diyPageMapper.selectCount(new QueryWrapper<SmsDiyPage>().eq("status",1).eq("type",typeId).ne("id",id));
+        return diyPageMapper.selectCount(new QueryWrapper<SmsDiyPage>().eq("status", 1).eq("type", typeId).ne("id", id));
     }
 
     @Override
@@ -34,6 +35,6 @@ public class SmsDiyPageServiceImpl extends ServiceImpl<SmsDiyPageMapper, SmsDiyP
 
     @Override
     public Integer selectCounts(Long id, String name) {
-        return diyPageMapper.selectCount(new QueryWrapper<SmsDiyPage>().eq("name",name).ne("id",id));
+        return diyPageMapper.selectCount(new QueryWrapper<SmsDiyPage>().eq("name", name).ne("id", id));
     }
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsDiypageTemplateCategoryServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsDiypageTemplateCategoryServiceImpl.java
index 196b5fcb00da3cd41270a93796df7bdb95b16295..75973244e69197ecb9fab6ec72b4411f1f902561 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsDiypageTemplateCategoryServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsDiypageTemplateCategoryServiceImpl.java
@@ -1,21 +1,23 @@
 package com.zscat.mallplus.sms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.sms.entity.SmsDiypageTemplateCategory;
 import com.zscat.mallplus.sms.mapper.SmsDiypageTemplateCategoryMapper;
 import com.zscat.mallplus.sms.service.ISmsDiypageTemplateCategoryService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
+
 /**
-* @author mallplus
-* @date 2019-12-04
-*/
+ * @author mallplus
+ * @date 2019-12-04
+ */
 @Service
 public class SmsDiypageTemplateCategoryServiceImpl extends ServiceImpl<SmsDiypageTemplateCategoryMapper, SmsDiypageTemplateCategory> implements ISmsDiypageTemplateCategoryService {
 
     @Resource
-    private  SmsDiypageTemplateCategoryMapper smsDiypageTemplateCategoryMapper;
+    private SmsDiypageTemplateCategoryMapper smsDiypageTemplateCategoryMapper;
 
 
     @Override
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsGroupActivityServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsGroupActivityServiceImpl.java
index 26df4543cf7a6bdec8ed60b99df432e3ffa68ea7..3d1f00b4a91d6434a12d1fb0f64a96ef211d7c41 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsGroupActivityServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsGroupActivityServiceImpl.java
@@ -11,7 +11,7 @@ import javax.annotation.Resource;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
@@ -22,6 +22,7 @@ public class SmsGroupActivityServiceImpl extends ServiceImpl<SmsGroupActivityMap
 
     @Resource
     SmsGroupActivityMapper activityMapper;
+
     @Override
     public int updateShowStatus(Long ids, Integer status) {
         SmsGroupActivity record = new SmsGroupActivity();
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsHomeBrandServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsHomeBrandServiceImpl.java
index cb93f84895ace96a13fb07c4145027c9b2eaf7fc..35c0bcf68b02c392e22eaff54ba7495dff6b6c96 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsHomeBrandServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsHomeBrandServiceImpl.java
@@ -38,6 +38,7 @@ public class SmsHomeBrandServiceImpl extends ServiceImpl<SmsHomeBrandMapper, Sms
         record.setRecommendStatus(recommendStatus);
         return homeBrandMapper.update(record, new QueryWrapper<SmsHomeBrand>().in("id", ids));
     }
+
     @Override
     public int create(List<SmsHomeBrand> homeBrandList) {
         for (SmsHomeBrand smsHomeBrand : homeBrandList) {
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsHomeNewProductServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsHomeNewProductServiceImpl.java
index 248431ca982f3007feaabc1b547cbe29852a1d6a..5f812db840cce1078ca683161cb5cd2bb46dbfb7 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsHomeNewProductServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsHomeNewProductServiceImpl.java
@@ -37,6 +37,7 @@ public class SmsHomeNewProductServiceImpl extends ServiceImpl<SmsHomeNewProductM
         homeNewProduct.setSort(sort);
         return homeNewProductMapper.updateById(homeNewProduct);
     }
+
     @Override
     public int create(List<SmsHomeNewProduct> homeNewProductList) {
         for (SmsHomeNewProduct SmsHomeNewProduct : homeNewProductList) {
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsHomeRecommendProductServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsHomeRecommendProductServiceImpl.java
index f5381eff9cb422787da6235b14333eead9afa240..d9a84733f9fb80fa4ffb8bfac235b4851d78bfe4 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsHomeRecommendProductServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsHomeRecommendProductServiceImpl.java
@@ -37,6 +37,7 @@ public class SmsHomeRecommendProductServiceImpl extends ServiceImpl<SmsHomeRecom
         record.setRecommendStatus(recommendStatus);
         return recommendProductMapper.update(record, new QueryWrapper<SmsHomeRecommendProduct>().in("id", ids));
     }
+
     @Override
     public int create(List<SmsHomeRecommendProduct> homeRecommendProductList) {
         for (SmsHomeRecommendProduct recommendProduct : homeRecommendProductList) {
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsHomeRecommendSubjectServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsHomeRecommendSubjectServiceImpl.java
index b2d152ae1011e6c4f9d64619251ba782ae2dad9c..f03a988419c0d230dc54dd093c5071076c013c92 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsHomeRecommendSubjectServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsHomeRecommendSubjectServiceImpl.java
@@ -38,6 +38,7 @@ public class SmsHomeRecommendSubjectServiceImpl extends ServiceImpl<SmsHomeRecom
         record.setRecommendStatus(recommendStatus);
         return recommendProductMapper.update(record, new QueryWrapper<SmsHomeRecommendSubject>().in("id", ids));
     }
+
     @Override
     public int create(List<SmsHomeRecommendSubject> recommendSubjectList) {
         for (SmsHomeRecommendSubject recommendProduct : recommendSubjectList) {
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsPaimaiLogServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsPaimaiLogServiceImpl.java
index 8feaee433f8703bec456b16f8c841527f801e79f..d035a78590fc40c534d76b2b8a44033a67598545 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsPaimaiLogServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sms/service/impl/SmsPaimaiLogServiceImpl.java
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/AdminSysJobController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/AdminSysJobController.java
index f7f6b81ad782ebc030054fc9a0573c9e3a299cb1..45e0b2731dda9cfaa2023fb519695d5318d6f66c 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/AdminSysJobController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/AdminSysJobController.java
@@ -54,11 +54,11 @@ public class AdminSysJobController {
 
     public Object saveAdminSysJob(@RequestBody AdminSysJob entity) {
         try {
-            if (!adminSysJobService.checkCronExpressionIsValid(entity.getCronExpression())){
+            if (!adminSysJobService.checkCronExpressionIsValid(entity.getCronExpression())) {
                 return new CommonResult().failed("表达式错误");
             }
             adminSysJobService.insertJob(entity);
-                return new CommonResult().success();
+            return new CommonResult().success();
 
         } catch (Exception e) {
             log.error("保存定时器日志表：%s", e.getMessage(), e);
@@ -73,11 +73,11 @@ public class AdminSysJobController {
 
     public Object updateAdminSysJob(@RequestBody AdminSysJob entity) {
         try {
-            if (!adminSysJobService.checkCronExpressionIsValid(entity.getCronExpression())){
+            if (!adminSysJobService.checkCronExpressionIsValid(entity.getCronExpression())) {
                 return new CommonResult().failed("表达式错误");
             }
-           adminSysJobService.updateJob(entity) ;
-                return new CommonResult().success();
+            adminSysJobService.updateJob(entity);
+            return new CommonResult().success();
 
         } catch (Exception e) {
             log.error("更新定时器日志表：%s", e.getMessage(), e);
@@ -149,12 +149,13 @@ public class AdminSysJobController {
             return new CommonResult().failed();
         }
     }
+
     @ApiOperation("修改展示状态")
     @RequestMapping(value = "/run")
     @ResponseBody
     @SysLog(MODULE = "cms", REMARK = "修改展示状态")
     public Object run(@RequestBody AdminSysJob entity) {
-         adminSysJobService.run(entity);
+        adminSysJobService.run(entity);
         return new CommonResult().success();
 
     }
@@ -164,8 +165,7 @@ public class AdminSysJobController {
      */
     @PostMapping("/checkCronExpressionIsValid")
     @ResponseBody
-    public Object checkCronExpressionIsValid(@RequestBody AdminSysJob job)
-    {
+    public Object checkCronExpressionIsValid(@RequestBody AdminSysJob job) {
         adminSysJobService.checkCronExpressionIsValid(job.getCronExpression());
         return new CommonResult().success();
     }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/AdminSysJobLogController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/AdminSysJobLogController.java
index c4c0735e99f4b7515e80b570445bd2860f48a575..c6186af1e4ee046f1820148529035f48193f59ae 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/AdminSysJobLogController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/AdminSysJobLogController.java
@@ -37,8 +37,8 @@ public class AdminSysJobLogController {
     @GetMapping(value = "/list")
 
     public Object getAdminSysJobLogByPage(AdminSysJobLog entity,
-                                       @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
+                                          @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
     ) {
         try {
             return new CommonResult().success(adminSysJobService.page(new Page<AdminSysJobLog>(pageNum, pageSize), new QueryWrapper<>(entity).orderByDesc("create_time")));
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/AliPayController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/AliPayController.java
index 747cb8fdf21f849134562807ce493aedcede7607..099d533b6da1b8bd5cf450a6760938c4a6149385 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/AliPayController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/AliPayController.java
@@ -33,21 +33,21 @@ import java.util.Map;
 public class AliPayController {
 
     @Resource
-    private  AlipayUtils alipayUtils;
+    private AlipayUtils alipayUtils;
 
     @Resource
-    private  ISysAlipayConfigService alipayService;
+    private ISysAlipayConfigService alipayService;
 
 
     @GetMapping(value = "/{id}")
-    public Object get(){
+    public Object get() {
         return new CommonResult().success(alipayService.getOne(new QueryWrapper<>()));
     }
 
 
     @ApiOperation("配置支付宝")
     @PostMapping(value = "/update")
-    public Object payConfig(@Validated @RequestBody SysAlipayConfig alipayConfig){
+    public Object payConfig(@Validated @RequestBody SysAlipayConfig alipayConfig) {
 
         alipayService.updateById(alipayConfig);
         return new CommonResult().success();
@@ -56,43 +56,43 @@ public class AliPayController {
 
     @ApiOperation("PC网页支付")
     @PostMapping(value = "/toPayAsPC")
-    public Object toPayAsPC(@Validated @RequestBody TradeVo trade) throws Exception{
+    public Object toPayAsPC(@Validated @RequestBody TradeVo trade) throws Exception {
         log.info("toPayAsPC");
         SysAlipayConfig alipay = alipayService.getOne(new QueryWrapper<>());
         trade.setOutTradeNo(alipayUtils.getOrderCode());
-        String payUrl = alipayService.toPayAsPC(alipay,trade);
+        String payUrl = alipayService.toPayAsPC(alipay, trade);
         return new CommonResult().success(payUrl);
     }
 
 
     @ApiOperation("手机网页支付")
     @PostMapping(value = "/toPayAsWeb")
-    public Object toPayAsWeb(@Validated @RequestBody TradeVo trade) throws Exception{
+    public Object toPayAsWeb(@Validated @RequestBody TradeVo trade) throws Exception {
         log.info("toPayAsWeb");
         SysAlipayConfig alipay = alipayService.getOne(new QueryWrapper<>());
         trade.setOutTradeNo(alipayUtils.getOrderCode());
-        String payUrl = alipayService.toPayAsWeb(alipay,trade);
+        String payUrl = alipayService.toPayAsWeb(alipay, trade);
         return new CommonResult().success(payUrl);
     }
 
     @ApiIgnore
     @GetMapping("/return")
     @ApiOperation("支付之后跳转的链接")
-    public Object returnPage(HttpServletRequest request, HttpServletResponse response){
+    public Object returnPage(HttpServletRequest request, HttpServletResponse response) {
         log.info("returnPage");
         SysAlipayConfig alipay = alipayService.getOne(new QueryWrapper<>());
         response.setContentType("text/html;charset=" + alipay.getCharset());
         //内容验签，防止黑客篡改参数
-        if(alipayUtils.rsaCheck(request,alipay)){
+        if (alipayUtils.rsaCheck(request, alipay)) {
             //商户订单号
             String outTradeNo = new String(request.getParameter("out_trade_no").getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
             //支付宝交易号
             String tradeNo = new String(request.getParameter("trade_no").getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
-            System.out.println("商户订单号"+outTradeNo+"  "+"第三方交易号"+tradeNo);
+            System.out.println("商户订单号" + outTradeNo + "  " + "第三方交易号" + tradeNo);
 
             // 根据业务需要返回数据，这里统一返回OK
             return new CommonResult().success("payment successful", HttpStatus.OK);
-        }else{
+        } else {
             // 根据业务需要返回数据
             return new CommonResult().success(HttpStatus.BAD_REQUEST);
         }
@@ -101,12 +101,12 @@ public class AliPayController {
     @ApiIgnore
     @RequestMapping("/notify")
     @ApiOperation("支付异步通知(要公网访问)，接收异步通知，检查通知内容app_id、out_trade_no、total_amount是否与请求中的一致，根据trade_status进行后续业务处理")
-    public Object notify(HttpServletRequest request){
+    public Object notify(HttpServletRequest request) {
         log.info("notify");
         SysAlipayConfig alipay = alipayService.getOne(new QueryWrapper<>());
         Map<String, String[]> parameterMap = request.getParameterMap();
         //内容验签，防止黑客篡改参数
-        if (alipayUtils.rsaCheck(request,alipay)) {
+        if (alipayUtils.rsaCheck(request, alipay)) {
             //交易状态
             String tradeStatus = new String(request.getParameter("trade_status").getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
             // 商户订单号
@@ -116,8 +116,8 @@ public class AliPayController {
             //付款金额
             String totalAmount = new String(request.getParameter("total_amount").getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
             //验证
-            if(tradeStatus.equals(AliPayStatusEnum.SUCCESS.getValue())||tradeStatus.equals(AliPayStatusEnum.FINISHED.getValue())){
-               // 验证通过后应该根据业务需要处理订单
+            if (tradeStatus.equals(AliPayStatusEnum.SUCCESS.getValue()) || tradeStatus.equals(AliPayStatusEnum.FINISHED.getValue())) {
+                // 验证通过后应该根据业务需要处理订单
             }
             return new CommonResult().success(HttpStatus.OK);
         }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/GeneratorController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/GeneratorController.java
index a01815bac9248c87ca157b609a829f1055718162..59b1c0789a69c9adfc1c8a182c0230a90368c245 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/GeneratorController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/GeneratorController.java
@@ -23,41 +23,41 @@ public class GeneratorController {
 
 
     @Resource
-    private  GeneratorConfigMapper generatorConfigMapper;
+    private GeneratorConfigMapper generatorConfigMapper;
 
 
     @ApiOperation("查询数据库元数据")
     @GetMapping(value = "/tables")
     public Object getTables(@RequestParam(defaultValue = "") String name,
-                                    @RequestParam(defaultValue = "0")Integer page,
-                                    @RequestParam(defaultValue = "10")Integer size){
-        int[] startEnd = PageUtil.transToStartEnd(page+1, size);
-        return new CommonResult().success(generatorService.getTables(name,startEnd));
+                            @RequestParam(defaultValue = "0") Integer page,
+                            @RequestParam(defaultValue = "10") Integer size) {
+        int[] startEnd = PageUtil.transToStartEnd(page + 1, size);
+        return new CommonResult().success(generatorService.getTables(name, startEnd));
     }
 
     @ApiOperation("查询表内元数据")
     @GetMapping(value = "/columns")
-    public Object getTables(@RequestParam String tableName){
+    public Object getTables(@RequestParam String tableName) {
         return new CommonResult().success(generatorService.getColumns(tableName));
     }
 
     @ApiOperation("生成代码")
     @PostMapping
-    public Object generator(@RequestBody List<ColumnInfo> columnInfos, @RequestParam String tableName){
+    public Object generator(@RequestBody List<ColumnInfo> columnInfos, @RequestParam String tableName) {
 
-        generatorService.generator(columnInfos,generatorConfigMapper.selectById(1),tableName);
+        generatorService.generator(columnInfos, generatorConfigMapper.selectById(1), tableName);
         return new CommonResult().success();
     }
 
     @ApiOperation("查询")
     @GetMapping(value = "/get")
-    public Object get(){
+    public Object get() {
         return new CommonResult().success(generatorConfigMapper.selectById(1));
     }
 
     @ApiOperation("修改")
     @PostMapping(value = "/update")
-    public Object emailConfig(@Validated @RequestBody GenConfig genConfig){
+    public Object emailConfig(@Validated @RequestBody GenConfig genConfig) {
         genConfig.setId(1L);
         return new CommonResult().success(generatorConfigMapper.updateById(genConfig));
     }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/HomeController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/HomeController.java
index 74b6a3085fab166a7e4836ab9a30842904195c4f..2074575eeef19b0241d3ac23ee128af257103f0e 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/HomeController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/HomeController.java
@@ -49,6 +49,14 @@ import java.util.*;
 @RequestMapping("/home")
 public class HomeController extends BaseController {
 
+    @Resource
+    CmsSubjectCategoryMapper categoryMapper;
+    @Resource
+    CmsSubjectMapper subjectMapper;
+    @Resource
+    SysSchoolMapper schoolMapper;
+    @Resource
+    SysAreaMapper sysAreaMapper;
     @Resource
     private IOmsOrderService orderService;
     @Resource
@@ -56,20 +64,19 @@ public class HomeController extends BaseController {
     @Resource
     private IUmsMemberService memberService;
 
-
     @ApiOperation("按时间统计订单 会员和商品")
     @SysLog(MODULE = "home", REMARK = "首页订单日统计")
     @RequestMapping(value = "/dayStatic", method = RequestMethod.GET)
-    public Object dayStatic(@RequestParam String date,@RequestParam Integer type) throws Exception {
-        return new CommonResult().success(orderService.dayStatic(date,type));
+    public Object dayStatic(@RequestParam String date, @RequestParam Integer type) throws Exception {
+        return new CommonResult().success(orderService.dayStatic(date, type));
     }
 
     @ApiOperation("首页订单日统计")
     @SysLog(MODULE = "home", REMARK = "首页订单日统计")
     @RequestMapping(value = "/orderDayStatic", method = RequestMethod.GET)
     public Object orderDayStatic(@RequestParam String date) throws Exception {
-        if (date.startsWith("--")){
-            date=DateUtils.currentDay();
+        if (date.startsWith("--")) {
+            date = DateUtils.currentDay();
         }
         return new CommonResult().success(orderService.orderDayStatic(date));
     }
@@ -78,8 +85,8 @@ public class HomeController extends BaseController {
     @SysLog(MODULE = "home", REMARK = "首页订单月统计")
     @RequestMapping(value = "/orderMonthStatic", method = RequestMethod.GET)
     public Object orderMonthStatic(@RequestParam String date) throws Exception {
-        if (date.startsWith("--")){
-            date=DateUtils.currentDay();
+        if (date.startsWith("--")) {
+            date = DateUtils.currentDay();
         }
         return new CommonResult().success(orderService.orderMonthStatic(date));
     }
@@ -121,27 +128,27 @@ public class HomeController extends BaseController {
 
         for (OmsOrder order : orderList) {
             if (DateUtils.format(order.getCreateTime()).equals(DateUtils.format(new Date()))
-                    && (order.getStatus() <9 )) {
+                    && (order.getStatus() < 9)) {
                 nowOrderCount++;
                 nowOrderPay = nowOrderPay.add(order.getPayAmount());
             }
             if (DateUtils.format(order.getCreateTime()).equals(DateUtils.addDay(new Date(), -1))
-                    && (order.getStatus() <9 )) {
+                    && (order.getStatus() < 9)) {
                 yesOrderCount++;
                 yesOrderPay = yesOrderPay.add(order.getPayAmount());
             }
             if (DateUtils.calculateDaysNew(order.getCreateTime(), new Date()) >= 7
-                    && (order.getStatus() <9 )) {
+                    && (order.getStatus() < 9)) {
                 qiOrderCount++;
                 qiOrderPay = qiOrderPay.add(order.getPayAmount());
             }
             if (order.getCreateTime().getTime() >= DateUtils.geFirstDayDateByMonth().getTime()
-                    && (order.getStatus() <9 )) {
+                    && (order.getStatus() < 9)) {
                 monthOrderCount++;
                 monthOrderPay = monthOrderPay.add(order.getPayAmount());
             }
             if (order.getCreateTime().getTime() >= DateUtils.getFirstDayOfWeek().getTime()
-                    && (order.getStatus() <9 )) {
+                    && (order.getStatus() < 9)) {
                 weekOrderCount++;
                 weekOrderPay = weekOrderPay.add(order.getPayAmount());
             }
@@ -196,7 +203,7 @@ public class HomeController extends BaseController {
     public Object goodsStatic() throws Exception {
         StopWatch stopWatch = new StopWatch("首页商品统计");
         stopWatch.start("首页商品列表2");
-        List<PmsProduct> goodsList = productService.list(new QueryWrapper<>(new PmsProduct()).select("publish_status","create_time"));
+        List<PmsProduct> goodsList = productService.list(new QueryWrapper<>(new PmsProduct()).select("publish_status", "create_time"));
 
         stopWatch.stop();
         stopWatch.start("首页商品");
@@ -255,9 +262,9 @@ public class HomeController extends BaseController {
             if (DateUtils.format(member.getCreateTime()).equals(DateUtils.format(new Date()))) {
                 nowCount++;
             }
-            if (member.getGender()==null || member.getGender()==1){
+            if (member.getGender() == null || member.getGender() == 1) {
                 mallCount++;
-            }else {
+            } else {
                 femallount++;
             }
         }
@@ -271,11 +278,11 @@ public class HomeController extends BaseController {
         return new CommonResult().success(map);
     }
 
-
     /**
      * 导出：http://localhost:8080/home/export/users
-     导入：http://localhost:8080/demo/import/users (用postman或者curl测试吧)
-     http://localhost:8080/home/import/goods
+     * 导入：http://localhost:8080/demo/import/users (用postman或者curl测试吧)
+     * http://localhost:8080/home/import/goods
+     *
      * @param response
      */
     @RequestMapping(value = "/export/users", method = RequestMethod.GET)
@@ -283,36 +290,30 @@ public class HomeController extends BaseController {
         List<ExportUser> userList = getUserList();
         EasyPoiUtils.exportExcel(getUserList(), "用户列表", "用户报表", ExportUser.class, "用户明细报表.xls", response);
     }
+
     @RequestMapping("/import/users")
     @ResponseBody
     public List<ExportUser> importUsers(@RequestParam MultipartFile file) {
         List<ExportUser> d = EasyPoiUtils.importExcel(file, ExportUser.class);
         return EasyPoiUtils.importExcel(file, ExportUser.class);
     }
+
     @RequestMapping("/import/goods")
     @ResponseBody
     public void importgoods(@RequestParam MultipartFile file) {
         List<ExportGoods> list = EasyPoiUtils.importExcel(file, ExportGoods.class);
-        for (ExportGoods gg : list){
+        for (ExportGoods gg : list) {
             createG(gg);
         }
     }
 
-    @Resource
-    CmsSubjectCategoryMapper categoryMapper;
-    @Resource
-    CmsSubjectMapper subjectMapper;
-    @Resource
-    SysSchoolMapper schoolMapper;
-    @Resource
-    SysAreaMapper sysAreaMapper;
     @RequestMapping("/import/subject")
     @ResponseBody
     public void importSubject(@RequestParam MultipartFile file) {
         List<SysArea> areas = sysAreaMapper.selectList(new QueryWrapper<>());
         List<SysSchool> schools = schoolMapper.selectList(new QueryWrapper<>());
         List<ExportSubject> list = EasyPoiUtils.importExcel(file, ExportSubject.class);
-        for (ExportSubject subject1 : list){
+        for (ExportSubject subject1 : list) {
             try {
                 CmsSubject subject = new CmsSubject();
                 subject.setTitle(subject1.getTitle());
@@ -321,50 +322,52 @@ public class HomeController extends BaseController {
                 subject.setAlbumPics(subject1.getPic());
 
 
-                Random r = new Random();  Integer a = r.nextInt(100);
+                Random r = new Random();
+                Integer a = r.nextInt(100);
                 Integer c = r.nextInt(3);
                 Integer d = r.nextInt(5);
                 subject.setCollectCount(r.nextInt(100));
                 subject.setReadCount(r.nextInt(100));
                 subject.setForwardCount(r.nextInt(100));
 
-                    subject.setCategoryName("游戏专题");
-                    subject.setCategoryId(2L);
+                subject.setCategoryName("游戏专题");
+                subject.setCategoryId(2L);
 
 
                 subject.setType(c);
                 Integer b = r.nextInt(100);
-                SysSchool school =  schools.get(a);
-                if (school!=null){
+                SysSchool school = schools.get(a);
+                if (school != null) {
                     subject.setSchoolId(school.getId());
                     subject.setSchoolName(school.getName());
-                }else{
-                    SysSchool school1 =   schools.get(b);
-                    if (school1!=null){
+                } else {
+                    SysSchool school1 = schools.get(b);
+                    if (school1 != null) {
                         subject.setSchoolId(school1.getId());
                         subject.setSchoolName(school1.getName());
                     }
                 }
 
-                SysArea area =  areas.get(b);
-                if (area!=null){
+                SysArea area = areas.get(b);
+                if (area != null) {
                     subject.setAreaId(area.getId());
                     subject.setAreaName(area.getName());
-                }else{
-                    SysArea area1 =    areas.get(a);
-                    if (area1!=null){
+                } else {
+                    SysArea area1 = areas.get(a);
+                    if (area1 != null) {
                         subject.setAreaId(area1.getId());
                         subject.setAreaName(area1.getName());
                     }
                 }
                 subjectMapper.insert(subject);
-            }catch (Exception e){
+            } catch (Exception e) {
                 System.out.println(e.getMessage());
             }
 
         }
     }
-    void createG(ExportGoods gg){
+
+    void createG(ExportGoods gg) {
         PmsProduct g = new PmsProduct();
         g.setName(gg.getUsername());
         g.setSubTitle(gg.getUsername());
@@ -376,10 +379,10 @@ public class HomeController extends BaseController {
 
         g.setPic(gg.getImg());
         g.setAlbumPics(gg.getImg());
-        if (ValidatorUtils.notEmpty(gg.getPrice())){
+        if (ValidatorUtils.notEmpty(gg.getPrice())) {
             g.setPrice(new BigDecimal(gg.getPrice().substring(1)));
         }
-        if (ValidatorUtils.notEmpty(gg.getOriginprice())){
+        if (ValidatorUtils.notEmpty(gg.getOriginprice())) {
             g.setOriginalPrice(new BigDecimal(gg.getOriginprice().substring(1)));
         }
 
@@ -392,7 +395,7 @@ public class HomeController extends BaseController {
         g.setPublishStatus(1);
         g.setPromotionType(0);
         g.setVerifyStatus(1);
-        g.setProductSn("X"+System.currentTimeMillis());
+        g.setProductSn("X" + System.currentTimeMillis());
         g.setQsType(1);
         g.setNewStatus(1);
         g.setCreateTime(new Date());
@@ -404,6 +407,7 @@ public class HomeController extends BaseController {
         g.setProductAttributeCategoryId(11L);
         productService.save(g);
     }
+
     private List<ExportUser> getUserList() {
         List<ExportUser> userList = new ArrayList<>();
         userList.add(new ExportUser("tom", new Date()));
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/OssController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/OssController.java
index b9fd5135e70772eecfb61c2b91a5e81dc145f201..e8b58dbbd97e1e5c1d30843b1ec2b87e83bc9421 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/OssController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/OssController.java
@@ -35,8 +35,23 @@ import java.util.Random;
 @Api(tags = "OssController", description = "Oss管理")
 @RequestMapping("/aliyun/oss")
 public class OssController {
+    @Autowired
+    OssAliyunUtil aliyunOSSUtil;
     @Autowired
     private OssServiceImpl ossService;
+    @Resource
+    private PmsAlbumPicMapper albumPicMapper;
+
+    private static ByteArrayInputStream getRandomDataStream(int length) {
+        return new ByteArrayInputStream(getRandomBuffer(length));
+    }
+
+    private static byte[] getRandomBuffer(int length) {
+        final Random randGenerator = new Random();
+        final byte[] buff = new byte[length];
+        randGenerator.nextBytes(buff);
+        return buff;
+    }
 
     @ApiOperation(value = "oss上传签名生成")
     @RequestMapping(value = "/policy", method = RequestMethod.GET)
@@ -54,13 +69,6 @@ public class OssController {
         return new CommonResult().success(ossCallbackResult);
     }
 
-
-    @Autowired
-    OssAliyunUtil aliyunOSSUtil;
-    @Resource
-    private PmsAlbumPicMapper albumPicMapper;
-
-
     @SysLog(MODULE = "图片上传管理", REMARK = "上传")
     @ApiOperation("上传")
     @RequestMapping(value = "upload", method = RequestMethod.POST)
@@ -68,7 +76,7 @@ public class OssController {
         List<BlobUpload> list = new ArrayList<>();
 
         String name = aliyunOSSUtil.upload(multipartFile);
-        insertPic(groupId, multipartFile, name,"image");
+        insertPic(groupId, multipartFile, name, "image");
         BlobUpload blobUploadEntity = new BlobUpload();
         blobUploadEntity.setFileName(multipartFile.getOriginalFilename());
         blobUploadEntity.setFileUrl(name);
@@ -87,7 +95,7 @@ public class OssController {
         if (multipartFile != null && multipartFile.length > 0) {
             for (int i = 0; i < multipartFile.length; i++) {
                 String name = aliyunOSSUtil.upload(multipartFile[i]);
-                insertPic(groupId, multipartFile[i], name,"image");
+                insertPic(groupId, multipartFile[i], name, "image");
                 BlobUpload blobUploadEntity = new BlobUpload();
                 blobUploadEntity.setFileName(multipartFile[i].getOriginalFilename());
                 blobUploadEntity.setFileUrl(name);
@@ -120,13 +128,13 @@ public class OssController {
             }
             String name = aliyunOSSUtil.upload(multipartFile);
 
-            return new CommonResult().success(insertPic(groupId, multipartFile, name,fileType));
+            return new CommonResult().success(insertPic(groupId, multipartFile, name, fileType));
 
         }
         return new CommonResult().success(list);
     }
 
-    private PmsAlbumPic insertPic(Long groupId, @RequestPart("file") MultipartFile multipartFile, String name,String type) {
+    private PmsAlbumPic insertPic(Long groupId, @RequestPart("file") MultipartFile multipartFile, String name, String type) {
         PmsAlbumPic attachment = new PmsAlbumPic();
         if (ValidatorUtils.notEmpty(UserUtils.getCurrentMember())) {
             attachment.setUserId(UserUtils.getCurrentMember().getId());
@@ -134,14 +142,13 @@ public class OssController {
         attachment.setAlbumId(groupId);
         attachment.setCreateTime(new Date());
         attachment.setName(multipartFile.getOriginalFilename());
-        attachment.setStoreId(Long.parseLong("1"));
+        //  attachment.setStoreId(Long.parseLong("1"));
         attachment.setType(type);
         attachment.setPic(name);
         albumPicMapper.insert(attachment);
         return attachment;
     }
 
-
     @IgnoreAuth
     @PostMapping("/upload1")
     @ApiOperation("上传文件")
@@ -162,17 +169,6 @@ public class OssController {
         return new CommonResult().success(stringBuffer);
     }
 
-    private static ByteArrayInputStream getRandomDataStream(int length) {
-        return new ByteArrayInputStream(getRandomBuffer(length));
-    }
-
-    private static byte[] getRandomBuffer(int length) {
-        final Random randGenerator = new Random();
-        final byte[] buff = new byte[length];
-        randGenerator.nextBytes(buff);
-        return buff;
-    }
-
     private String getFileExtension(String fileName) {
         int position = fileName.indexOf('.');
         if (position > 0) {
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysEmailConfigController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysEmailConfigController.java
index 1b296752e39b4756289c800c9c0ab2f70d4bfce3..ae94ea43bf3dd41982eeca6d99a1e4bb93c16cc1 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysEmailConfigController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysEmailConfigController.java
@@ -14,7 +14,7 @@ import javax.annotation.Resource;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author zscat
@@ -29,14 +29,14 @@ public class SysEmailConfigController {
 
 
     @GetMapping(value = "/{id}")
-    public Object get(){
+    public Object get() {
         return new CommonResult().success(emailService.getOne(new QueryWrapper<>()));
     }
 
 
     @PostMapping(value = "/update")
     @ApiOperation("配置邮件")
-    public Object emailConfig(@Validated @RequestBody SysEmailConfig emailConfig){
+    public Object emailConfig(@Validated @RequestBody SysEmailConfig emailConfig) {
         emailService.updateById(emailConfig);
         return new CommonResult().success();
     }
@@ -45,7 +45,7 @@ public class SysEmailConfigController {
     @PostMapping(value = "/send")
     @ApiOperation("发送邮件")
     public Object send(@Validated @RequestBody EmailVo emailVo) throws Exception {
-        emailService.send(emailVo,emailService.getOne(new QueryWrapper<>()));
+        emailService.send(emailVo, emailService.getOne(new QueryWrapper<>()));
         return new CommonResult().success();
     }
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysPermissionController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysPermissionController.java
index c478b1ad9ba55cae852726df13d7295f26169bd5..9131c8abf1625bd1222082f69da0a7abc6025ff1 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysPermissionController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysPermissionController.java
@@ -47,8 +47,10 @@ public class SysPermissionController extends BaseController {
                                 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
     ) {
         try {
-            Object data = ISysPermissionService.list(new QueryWrapper<>(entity));
-            return new CommonResult().success(data);
+            if (ValidatorUtils.notEmpty(entity.getName())){
+                return new CommonResult().success(ISysPermissionService.list(new QueryWrapper<SysPermission>(new SysPermission()).like("name",entity.getName()).orderByAsc("sort")));
+            }
+            return new CommonResult().success(ISysPermissionService.list(new QueryWrapper<>(entity).orderByAsc("sort")));
         } catch (Exception e) {
             log.error("根据条件查询所有后台用户权限表列表：%s", e.getMessage(), e);
         }
@@ -166,7 +168,7 @@ public class SysPermissionController extends BaseController {
     @ResponseBody
     public Object findPermissions() {
         Long userId = getCurrentUser().getId();
-        if (getCurrentUser().getSupplyId()!=null && getCurrentUser().getSupplyId() == 1L) {
+        if (getCurrentUser().getSupplyId() != null && getCurrentUser().getSupplyId() == 1L) {
             return new CommonResult().success(ISysPermissionService.getAllPermission());
         }
         return new CommonResult().success(ISysPermissionService.getPermissionsByUserId(userId));
@@ -182,6 +184,4 @@ public class SysPermissionController extends BaseController {
     }
 
 
-
-
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysQiniuConfigController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysQiniuConfigController.java
index 185b2ce585e943b4cc85a0f0276b6960659d8324..041d5c2f1d271491e91353c5d414fa14aac8df3f 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysQiniuConfigController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysQiniuConfigController.java
@@ -24,7 +24,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author zscat
@@ -40,16 +40,16 @@ public class SysQiniuConfigController {
     private ISysQiniuContentService qiniuContentService;
 
     @GetMapping(value = "/config")
-    public Object get(){
+    public Object get() {
         return new CommonResult().success(qiNiuService.getOne(new QueryWrapper<>()));
     }
 
 
     @ApiOperation("配置七牛云存储")
     @PutMapping(value = "/config")
-    public Object emailConfig(@Validated @RequestBody SysQiniuConfig qiniuConfig){
+    public Object emailConfig(@Validated @RequestBody SysQiniuConfig qiniuConfig) {
         qiNiuService.updateById(qiniuConfig);
-       // qiNiuService.update(qiniuConfig.getType());
+        // qiNiuService.update(qiniuConfig.getType());
         return new ResponseEntity(HttpStatus.OK);
     }
 
@@ -65,7 +65,7 @@ public class SysQiniuConfigController {
     @GetMapping
     public Object getRoles(SysQiniuConfig entity,
                            @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                           @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize){
+                           @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         try {
             return new CommonResult().success(qiNiuService.page(new Page<SysQiniuConfig>(pageNum, pageSize), new QueryWrapper<>(entity)));
         } catch (Exception e) {
@@ -77,19 +77,19 @@ public class SysQiniuConfigController {
 
     @ApiOperation("上传文件")
     @PostMapping
-    public Object upload(@RequestParam MultipartFile file){
-        SysQiniuContent qiniuContent = qiNiuService.upload(file,qiNiuService.getOne(new QueryWrapper<>()));
-        Map<String,Object> map = new HashMap<>(3);
-        map.put("id",qiniuContent.getId());
-        map.put("errno",0);
-        map.put("data",new String[]{qiniuContent.getUrl()});
-        return new ResponseEntity<>(map,HttpStatus.OK);
+    public Object upload(@RequestParam MultipartFile file) {
+        SysQiniuContent qiniuContent = qiNiuService.upload(file, qiNiuService.getOne(new QueryWrapper<>()));
+        Map<String, Object> map = new HashMap<>(3);
+        map.put("id", qiniuContent.getId());
+        map.put("errno", 0);
+        map.put("data", new String[]{qiniuContent.getUrl()});
+        return new ResponseEntity<>(map, HttpStatus.OK);
     }
 
 
     @ApiOperation("同步七牛云数据")
     @PostMapping(value = "/synchronize")
-    public Object synchronize(){
+    public Object synchronize() {
         qiNiuService.synchronize(qiNiuService.getOne(new QueryWrapper<>()));
         return new ResponseEntity(HttpStatus.OK);
     }
@@ -97,17 +97,17 @@ public class SysQiniuConfigController {
 
     @ApiOperation("下载文件")
     @GetMapping(value = "/download/{id}")
-    public Object download(@PathVariable Long id){
-        Map<String,Object> map = new HashMap<>(1);
-        map.put("url", qiNiuService.download(qiNiuService.findByContentId(id),qiNiuService.getOne(new QueryWrapper<>())));
-        return new ResponseEntity<>(map,HttpStatus.OK);
+    public Object download(@PathVariable Long id) {
+        Map<String, Object> map = new HashMap<>(1);
+        map.put("url", qiNiuService.download(qiNiuService.findByContentId(id), qiNiuService.getOne(new QueryWrapper<>())));
+        return new ResponseEntity<>(map, HttpStatus.OK);
     }
 
 
     @ApiOperation("删除文件")
     @DeleteMapping(value = "/{id}")
-    public Object delete(@PathVariable Long id){
-        qiNiuService.delete(qiNiuService.findByContentId(id),qiNiuService.getOne(new QueryWrapper<>()));
+    public Object delete(@PathVariable Long id) {
+        qiNiuService.delete(qiNiuService.findByContentId(id), qiNiuService.getOne(new QueryWrapper<>()));
         return new ResponseEntity(HttpStatus.OK);
     }
 
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysQiniuContentController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysQiniuContentController.java
index df5becbd5ccd957b2900547308e380e00227faaa..51ab5d556ef943dba17bf7f2daff9c0cbde61cad 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysQiniuContentController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysQiniuContentController.java
@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysRoleController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysRoleController.java
index 36d31d9f6fbaa742c46389bf6c8c30979580f652..d8f09e25ebf348389509a26f27c1b4f54bf53c6c 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysRoleController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysRoleController.java
@@ -153,6 +153,7 @@ public class SysRoleController extends ApiController {
         List<SysRolePermission> rolePermission = sysRoleService.getRolePermission(roleId);
         return new CommonResult().success(rolePermission);
     }
+
     @ApiOperation("修改展示状态")
     @RequestMapping(value = "/update/updateShowStatus")
     @ResponseBody
@@ -164,7 +165,7 @@ public class SysRoleController extends ApiController {
         role.setStatus(showStatus);
         sysRoleService.updates(role);
 
-            return new CommonResult().success();
+        return new CommonResult().success();
 
     }
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysStoreController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysStoreController.java
index 13c52d81c82d03ecdc485cb755fb054ac333b587..f91ea0c550bc6c867047c23767852de08280dd4f 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysStoreController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysStoreController.java
@@ -3,6 +3,7 @@ package com.zscat.mallplus.sys.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zscat.mallplus.ApiContext;
 import com.zscat.mallplus.annotation.SysLog;
 import com.zscat.mallplus.bill.entity.BakCategory;
 import com.zscat.mallplus.bill.mapper.BakCategoryMapper;
@@ -16,7 +17,6 @@ import com.zscat.mallplus.sys.service.ISysStoreService;
 import com.zscat.mallplus.sys.service.impl.RedisUtil;
 import com.zscat.mallplus.utils.CommonResult;
 import com.zscat.mallplus.utils.ValidatorUtils;
-import com.zscat.mallplus.ApiContext;
 import com.zscat.mallplus.vo.Rediskey;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -55,13 +55,15 @@ public class SysStoreController {
     private PmsProductAttributeCategoryMapper productAttributeCategoryMapper;
     @Autowired
     private ApiContext apiContext;
+    @Resource
+    private BakCategoryMapper bakCategoryMapper;
 
     @SysLog(MODULE = "sys", REMARK = "根据条件查询所有列表")
     @ApiOperation("根据条件查询所有列表")
     @GetMapping(value = "/setStoreId/{id}")
     public Object setStoreId(@ApiParam("id") @PathVariable Integer id) {
         try {
-         //   apiContext.setCurrentProviderId(id);
+            //   apiContext.setCurrentProviderId(id);
             return new CommonResult().success();
         } catch (Exception e) {
             log.error("根据条件查询所有列表：%s", e.getMessage(), e);
@@ -69,7 +71,6 @@ public class SysStoreController {
         }
     }
 
-
     @SysLog(MODULE = "sys", REMARK = "根据条件查询所有列表")
     @ApiOperation("根据条件查询所有列表")
     @GetMapping(value = "/list")
@@ -163,18 +164,15 @@ public class SysStoreController {
         }
     }
 
-    @Resource
-    private BakCategoryMapper bakCategoryMapper;
-
     @SysLog(MODULE = "sys", REMARK = "根据条件查询所有列表")
     @ApiOperation("根据条件查询所有列表")
     @GetMapping(value = "/listBakCate")
     public Object listCate(BakCategory entity,
-                                    @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                    @RequestParam(value = "pageSize", defaultValue = "30") Integer pageSize
+                           @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                           @RequestParam(value = "pageSize", defaultValue = "30") Integer pageSize
     ) {
         try {
-            return new CommonResult().success(bakCategoryMapper.selectList(new QueryWrapper<BakCategory>().eq("pid",0)));
+            return new CommonResult().success(bakCategoryMapper.selectList(new QueryWrapper<BakCategory>().eq("pid", 0)));
         } catch (Exception e) {
             log.error("根据条件查询所有列表：%s", e.getMessage(), e);
         }
@@ -186,36 +184,36 @@ public class SysStoreController {
     @ResponseBody
     public Object storeDetail() {
         SysStore store = ISysStoreService.getById(1);
-        List<PmsProductAttributeCategory> list = productAttributeCategoryMapper.selectList(new QueryWrapper<PmsProductAttributeCategory>().eq("store_id",store.getId()));
+        List<PmsProductAttributeCategory> list = productAttributeCategoryMapper.selectList(new QueryWrapper<PmsProductAttributeCategory>().eq("store_id", store.getId()));
         for (PmsProductAttributeCategory gt : list) {
             PmsProduct productQueryParam = new PmsProduct();
             productQueryParam.setProductAttributeCategoryId(gt.getId());
             productQueryParam.setPublishStatus(1);
             productQueryParam.setVerifyStatus(1);
-            IPage<PmsProduct> goodsList = pmsProductService.page(new Page<PmsProduct>(0, 8),new QueryWrapper<>(productQueryParam).select(ConstansValue.sampleGoodsList));
-            if (goodsList!=null&& goodsList.getRecords()!=null && goodsList.getRecords().size()>0){
+            IPage<PmsProduct> goodsList = pmsProductService.page(new Page<PmsProduct>(0, 8), new QueryWrapper<>(productQueryParam).select(ConstansValue.sampleGoodsList));
+            if (goodsList != null && goodsList.getRecords() != null && goodsList.getRecords().size() > 0) {
                 gt.setGoodsList(goodsList.getRecords());
-            }else{
+            } else {
                 gt.setGoodsList(new ArrayList<>());
             }
         }
         store.setList(list);
-        store.setGoodsCount(pmsProductService.count(new QueryWrapper<PmsProduct>().eq("store_id",store.getId())));
+        store.setGoodsCount(pmsProductService.count(new QueryWrapper<PmsProduct>().eq("store_id", store.getId())));
         //记录浏览量到redis,然后定时更新到数据库
-        String key= Rediskey.STORE_VIEWCOUNT_CODE+store.getId();
+        String key = Rediskey.STORE_VIEWCOUNT_CODE + store.getId();
         //找到redis中该篇文章的点赞数，如果不存在则向redis中添加一条
-        Map<Object,Object> viewCountItem=redisUtil.hGetAll(Rediskey.STORE_VIEWCOUNT_KEY);
-        Integer viewCount=0;
-        if(!viewCountItem.isEmpty()){
-            if(viewCountItem.containsKey(key)){
-                viewCount=Integer.parseInt(viewCountItem.get(key).toString())+1;
-                redisUtil.hPut(Rediskey.STORE_VIEWCOUNT_KEY,key,viewCount+"");
-            }else {
-                viewCount=1;
-                redisUtil.hPut(Rediskey.STORE_VIEWCOUNT_KEY,key,1+"");
+        Map<Object, Object> viewCountItem = redisUtil.hGetAll(Rediskey.STORE_VIEWCOUNT_KEY);
+        Integer viewCount = 0;
+        if (!viewCountItem.isEmpty()) {
+            if (viewCountItem.containsKey(key)) {
+                viewCount = Integer.parseInt(viewCountItem.get(key).toString()) + 1;
+                redisUtil.hPut(Rediskey.STORE_VIEWCOUNT_KEY, key, viewCount + "");
+            } else {
+                viewCount = 1;
+                redisUtil.hPut(Rediskey.STORE_VIEWCOUNT_KEY, key, 1 + "");
             }
-        }else{
-            redisUtil.hPut(Rediskey.STORE_VIEWCOUNT_KEY,key,1+"");
+        } else {
+            redisUtil.hPut(Rediskey.STORE_VIEWCOUNT_KEY, key, 1 + "");
         }
         Map<String, Object> map = new HashMap<>();
         store.setHit(viewCount);
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysTestController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysTestController.java
index a527bc61bd79064b4c0f190127179287c12bd4f1..f117aa4ec8f7f08b1d121bad7fbc43e7f0fbfdc3 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysTestController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysTestController.java
@@ -21,32 +21,32 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
-* @author mallplus
-* @date 2019-12-02
-*  测试
-*/
+ * @author mallplus
+ * @date 2019-12-02
+ * 测试
+ */
 @Slf4j
 @RestController
 @RequestMapping("/sys/sysTest")
 public class SysTestController {
 
-@Resource
-private ISysTestService ISysTestService;
-
-@SysLog(MODULE = "sys", REMARK = "根据条件查询所有测试列表")
-@ApiOperation("根据条件查询所有测试列表")
-@GetMapping(value = "/list")
-@PreAuthorize("hasAuthority('sys:sysTest:read')")
-public Object getSysTestByPage(SysTest entity,
-@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
-) {
-try {
-return new CommonResult().success(ISysTestService.page(new Page<SysTest>(pageNum, pageSize), new QueryWrapper<>(entity)));
-    } catch (Exception e) {
-    log.error("根据条件查询所有测试列表：%s", e.getMessage(), e);
-    }
-    return new CommonResult().failed();
+    @Resource
+    private ISysTestService ISysTestService;
+
+    @SysLog(MODULE = "sys", REMARK = "根据条件查询所有测试列表")
+    @ApiOperation("根据条件查询所有测试列表")
+    @GetMapping(value = "/list")
+    @PreAuthorize("hasAuthority('sys:sysTest:read')")
+    public Object getSysTestByPage(SysTest entity,
+                                   @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
+    ) {
+        try {
+            return new CommonResult().success(ISysTestService.page(new Page<SysTest>(pageNum, pageSize), new QueryWrapper<>(entity)));
+        } catch (Exception e) {
+            log.error("根据条件查询所有测试列表：%s", e.getMessage(), e);
+        }
+        return new CommonResult().failed();
     }
 
     @SysLog(MODULE = "sys", REMARK = "保存测试")
@@ -54,16 +54,16 @@ return new CommonResult().success(ISysTestService.page(new Page<SysTest>(pageNum
     @PostMapping(value = "/create")
     @PreAuthorize("hasAuthority('sys:sysTest:create')")
     public Object saveSysTest(@RequestBody SysTest entity) {
-    try {
+        try {
 
-    if (ISysTestService.save(entity)) {
-    return new CommonResult().success();
-    }
-    } catch (Exception e) {
-    log.error("保存测试：%s", e.getMessage(), e);
-    return new CommonResult().failed(e.getMessage());
-    }
-    return new CommonResult().failed();
+            if (ISysTestService.save(entity)) {
+                return new CommonResult().success();
+            }
+        } catch (Exception e) {
+            log.error("保存测试：%s", e.getMessage(), e);
+            return new CommonResult().failed(e.getMessage());
+        }
+        return new CommonResult().failed();
     }
 
     @SysLog(MODULE = "sys", REMARK = "更新测试")
@@ -71,15 +71,15 @@ return new CommonResult().success(ISysTestService.page(new Page<SysTest>(pageNum
     @PostMapping(value = "/update/{id}")
     @PreAuthorize("hasAuthority('sys:sysTest:update')")
     public Object updateSysTest(@RequestBody SysTest entity) {
-    try {
-    if (ISysTestService.updateById(entity)) {
-    return new CommonResult().success();
-    }
-    } catch (Exception e) {
-    log.error("更新测试：%s", e.getMessage(), e);
-    return new CommonResult().failed(e.getMessage());
-    }
-    return new CommonResult().failed();
+        try {
+            if (ISysTestService.updateById(entity)) {
+                return new CommonResult().success();
+            }
+        } catch (Exception e) {
+            log.error("更新测试：%s", e.getMessage(), e);
+            return new CommonResult().failed(e.getMessage());
+        }
+        return new CommonResult().failed();
     }
 
     @SysLog(MODULE = "sys", REMARK = "删除测试")
@@ -87,18 +87,18 @@ return new CommonResult().success(ISysTestService.page(new Page<SysTest>(pageNum
     @GetMapping(value = "/delete/{id}")
     @PreAuthorize("hasAuthority('sys:sysTest:delete')")
     public Object deleteSysTest(@ApiParam("测试id") @PathVariable Long id) {
-    try {
-    if (ValidatorUtils.empty(id)) {
-    return new CommonResult().paramFailed("测试id");
-    }
-    if (ISysTestService.removeById(id)) {
-    return new CommonResult().success();
-    }
-    } catch (Exception e) {
-    log.error("删除测试：%s", e.getMessage(), e);
-    return new CommonResult().failed();
-    }
-    return new CommonResult().failed();
+        try {
+            if (ValidatorUtils.empty(id)) {
+                return new CommonResult().paramFailed("测试id");
+            }
+            if (ISysTestService.removeById(id)) {
+                return new CommonResult().success();
+            }
+        } catch (Exception e) {
+            log.error("删除测试：%s", e.getMessage(), e);
+            return new CommonResult().failed();
+        }
+        return new CommonResult().failed();
     }
 
     @SysLog(MODULE = "sys", REMARK = "给测试分配测试")
@@ -106,16 +106,16 @@ return new CommonResult().success(ISysTestService.page(new Page<SysTest>(pageNum
     @GetMapping(value = "/{id}")
     @PreAuthorize("hasAuthority('sys:sysTest:read')")
     public Object getSysTestById(@ApiParam("测试id") @PathVariable Long id) {
-    try {
-    if (ValidatorUtils.empty(id)) {
-    return new CommonResult().paramFailed("测试id");
-    }
-    SysTest coupon = ISysTestService.getById(id);
-    return new CommonResult().success(coupon);
-    } catch (Exception e) {
-    log.error("查询测试明细：%s", e.getMessage(), e);
-    return new CommonResult().failed();
-    }
+        try {
+            if (ValidatorUtils.empty(id)) {
+                return new CommonResult().paramFailed("测试id");
+            }
+            SysTest coupon = ISysTestService.getById(id);
+            return new CommonResult().success(coupon);
+        } catch (Exception e) {
+            log.error("查询测试明细：%s", e.getMessage(), e);
+            return new CommonResult().failed();
+        }
 
     }
 
@@ -126,30 +126,29 @@ return new CommonResult().success(ISysTestService.page(new Page<SysTest>(pageNum
     public Object deleteBatch(@RequestParam("ids") List<Long> ids) {
         boolean count = ISysTestService.removeByIds(ids);
         if (count) {
-        return new CommonResult().success(count);
+            return new CommonResult().success(count);
         } else {
-        return new CommonResult().failed();
+            return new CommonResult().failed();
         }
-        }
-
+    }
 
 
-        @SysLog(MODULE = "sys", REMARK = "导出社区数据")
-        @GetMapping("/exportExcel")
-        public void export(HttpServletResponse response, SysTest entity) {
+    @SysLog(MODULE = "sys", REMARK = "导出社区数据")
+    @GetMapping("/exportExcel")
+    public void export(HttpServletResponse response, SysTest entity) {
         // 模拟从数据库获取需要导出的数据
         List<SysTest> personList = ISysTestService.list(new QueryWrapper<>(entity));
-            // 导出操作
-            EasyPoiUtils.exportExcel(personList, "导出社区数据", "社区数据", SysTest.class, "导出社区数据.xls", response);
+        // 导出操作
+        EasyPoiUtils.exportExcel(personList, "导出社区数据", "社区数据", SysTest.class, "导出社区数据.xls", response);
 
-            }
+    }
 
-            @SysLog(MODULE = "sys", REMARK = "导入社区数据")
-            @PostMapping("/importExcel")
-            public void importUsers(@RequestParam MultipartFile file) {
-            List<SysTest> personList = EasyPoiUtils.importExcel(file, SysTest.class);
-                ISysTestService.saveBatch(personList);
-                }
-                }
+    @SysLog(MODULE = "sys", REMARK = "导入社区数据")
+    @PostMapping("/importExcel")
+    public void importUsers(@RequestParam MultipartFile file) {
+        List<SysTest> personList = EasyPoiUtils.importExcel(file, SysTest.class);
+        ISysTestService.saveBatch(personList);
+    }
+}
 
 
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysUserController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysUserController.java
index e70fa3d6d7b219ccf5cb83f10ae5ec3325da0ecd..9e9fdea50ab8482750501fe7052626204825f770 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysUserController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/SysUserController.java
@@ -18,7 +18,6 @@ import com.zscat.mallplus.sys.service.ISysRoleService;
 import com.zscat.mallplus.sys.service.ISysUserService;
 import com.zscat.mallplus.ums.service.RedisService;
 import com.zscat.mallplus.util.JsonUtil;
-import com.zscat.mallplus.util.UserUtils;
 import com.zscat.mallplus.utils.CommonResult;
 import com.zscat.mallplus.utils.ValidatorUtils;
 import com.zscat.mallplus.vo.Rediskey;
@@ -66,6 +65,10 @@ public class SysUserController extends ApiController {
     private SysPermissionMapper permissionMapper;
     @Resource
     private RedisService redisService;
+    @Resource
+    private UserCommunityRelateMapper userCommunityRelateMapper;
+    @Resource
+    private BuildingCommunityMapper buildingCommunityMapper;
 
     @SysLog(MODULE = "sys", REMARK = "根据条件查询所有用户列表")
     @ApiOperation("根据条件查询所有用户列表")
@@ -87,9 +90,9 @@ public class SysUserController extends ApiController {
     @PostMapping(value = "/register")
     public Object saveUser(@RequestBody SysUser entity) {
         try {
-            if (ValidatorUtils.empty(entity.getStoreId())){
+           /* if (ValidatorUtils.empty(entity.getStoreId())){
                 entity.setStoreId(UserUtils.getCurrentMember().getStoreId());
-            }
+            }*/
             if (sysUserService.saves(entity)) {
                 return new CommonResult().success();
             }
@@ -123,8 +126,8 @@ public class SysUserController extends ApiController {
             if (ValidatorUtils.empty(id)) {
                 return new CommonResult().paramFailed("用户id");
             }
-            SysUser user= sysUserService.getById(id);
-            if (user.getSupplyId()!=null && user.getSupplyId()==1){
+            SysUser user = sysUserService.getById(id);
+            if (user.getSupplyId() != null && user.getSupplyId() == 1) {
                 return new CommonResult().paramFailed("管理员账号不能删除");
             }
             if (sysUserService.removeById(id)) {
@@ -176,15 +179,20 @@ public class SysUserController extends ApiController {
     @RequestMapping(value = "/login", method = RequestMethod.POST)
     @ResponseBody
     public Object login(@RequestBody SysUser umsAdminLoginParam, BindingResult result) {
-        String token = sysUserService.login(umsAdminLoginParam.getUsername(), umsAdminLoginParam.getPassword());
-        if (token == null) {
-            return new CommonResult().paramFailed("用户名或密码错误");
+        try {
+            String token = sysUserService.login(umsAdminLoginParam.getUsername(), umsAdminLoginParam.getPassword());
+            if (token == null) {
+                return new CommonResult().paramFailed("用户名或密码错误");
+            }
+            Map<String, Object> tokenMap = new HashMap<>();
+            tokenMap.put("token", token);
+            tokenMap.put("tokenHead", tokenHead);
+            // tokenMap.put("userId", UserUtils.getCurrentMember().getId());
+            return new CommonResult().success(tokenMap);
+        } catch (Exception e) {
+            return new CommonResult().failed(e.getMessage());
         }
-        Map<String, Object> tokenMap = new HashMap<>();
-        tokenMap.put("token", token);
-        tokenMap.put("tokenHead", tokenHead);
-        tokenMap.put("userId", UserUtils.getCurrentMember().getId());
-        return new CommonResult().success(tokenMap);
+
     }
 
     @SysLog(MODULE = "sys", REMARK = "获取当前登录用户信息")
@@ -197,7 +205,7 @@ public class SysUserController extends ApiController {
         queryU.setUsername(username);
         SysUser umsAdmin = sysUserService.getOne(new QueryWrapper<>(queryU));
         Map<String, Object> data = new HashMap<>();
-        data.put("username", umsAdmin.getUsername());
+        data.put("username", username);
         data.put("roles", new String[]{"TEST"});
         data.put("icon", umsAdmin.getIcon());
         return new CommonResult().success(data);
@@ -211,7 +219,6 @@ public class SysUserController extends ApiController {
         return new CommonResult().success(null);
     }
 
-
     @SysLog(MODULE = "sys", REMARK = "给用户分配角色")
     @ApiOperation("给用户分配角色")
     @RequestMapping(value = "/role/update", method = RequestMethod.POST)
@@ -248,10 +255,10 @@ public class SysUserController extends ApiController {
     public Object userRoleCheck(@RequestParam("adminId") Long adminId) {
         List<SysRole> roleList = sysUserService.getRoleListByUserId(adminId);
         List<SysRole> allroleList = roleService.list(new QueryWrapper<>());
-        if (roleList!=null && roleList.size()>0){
+        if (roleList != null && roleList.size() > 0) {
             for (SysRole a : allroleList) {
                 for (SysRole u : roleList) {
-                    if (u!=null && u.getId()!=null){
+                    if (u != null && u.getId() != null) {
                         if (a.getId().equals(u.getId())) {
                             a.setChecked(true);
                         }
@@ -285,7 +292,6 @@ public class SysUserController extends ApiController {
         return new CommonResult().success(permissionList);
     }
 
-
     @ApiOperation("修改展示状态")
     @RequestMapping(value = "/update/updateShowStatus")
     @ResponseBody
@@ -301,47 +307,43 @@ public class SysUserController extends ApiController {
 
     }
 
-
     @ApiOperation("修改密码")
     @RequestMapping(value = "/updatePassword")
     @ResponseBody
     @SysLog(MODULE = "sys", REMARK = "修改密码")
     public Object updatePassword(@RequestParam("password") String password,
-                                   @RequestParam("renewPassword") String renewPassword,
-                                   @RequestParam("newPassword") String newPassword) {
-        if (ValidatorUtils.empty(password)){
+                                 @RequestParam("renewPassword") String renewPassword,
+                                 @RequestParam("newPassword") String newPassword) {
+        if (ValidatorUtils.empty(password)) {
             return new CommonResult().failed("参数为空");
         }
-        if (ValidatorUtils.empty(renewPassword)){
+        if (ValidatorUtils.empty(renewPassword)) {
             return new CommonResult().failed("参数为空");
         }
-        if (ValidatorUtils.empty(newPassword)){
+        if (ValidatorUtils.empty(newPassword)) {
             return new CommonResult().failed("参数为空");
         }
-        if (!renewPassword.equals(newPassword)){
+        if (!renewPassword.equals(newPassword)) {
             return new CommonResult().failed("新密码不一致!");
         }
         try {
-            sysUserService.updatePassword(password,newPassword);
-        }catch (Exception e){
+            sysUserService.updatePassword(password, newPassword);
+        } catch (Exception e) {
             return new CommonResult().failed(e.getMessage());
         }
         return new CommonResult().success();
 
     }
 
-    @Resource
-    private UserCommunityRelateMapper userCommunityRelateMapper;
-    @Resource
-    private BuildingCommunityMapper buildingCommunityMapper;
     @SysLog(MODULE = "sys", REMARK = "获取用户的小区")
     @ApiOperation("获取相应角色权限")
     @RequestMapping(value = "/community/{userId}", method = RequestMethod.GET)
     @ResponseBody
     public Object communityList(@PathVariable Long userId) {
-        List<UserCommunityRelate> permissionList = userCommunityRelateMapper.selectList(new QueryWrapper<UserCommunityRelate>().eq("user_id",userId));
+        List<UserCommunityRelate> permissionList = userCommunityRelateMapper.selectList(new QueryWrapper<UserCommunityRelate>().eq("user_id", userId));
         return new CommonResult().success(permissionList);
     }
+
     @SysLog(MODULE = "sys", REMARK = "获取用户的小区")
     @ApiOperation("获取相应角色权限")
     @RequestMapping(value = "/userCommunityRelate", method = RequestMethod.POST)
@@ -355,11 +357,11 @@ public class SysUserController extends ApiController {
     @RequestMapping(value = "/communityUser/{userId}", method = RequestMethod.GET)
     @ResponseBody
     public Object communityUser(@PathVariable Long userId) {
-        List<UserCommunityRelate> permissionList = userCommunityRelateMapper.selectList(new QueryWrapper<UserCommunityRelate>().eq("user_id",userId));
+        List<UserCommunityRelate> permissionList = userCommunityRelateMapper.selectList(new QueryWrapper<UserCommunityRelate>().eq("user_id", userId));
         List<UserCommunityRelate> newList = new ArrayList<>();
-        for (UserCommunityRelate relate: permissionList){
+        for (UserCommunityRelate relate : permissionList) {
             BuildingCommunity community = buildingCommunityMapper.selectById(relate.getCommunityId());
-            if (community!=null){
+            if (community != null) {
                 relate.setName(community.getName());
                 newList.add(relate);
             }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/TestController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/TestController.java
index 78fafc61571ea67e40537743dc091855c5ea3cd1..cf8ecc7f7c46c2768a993b9d44b9253de2a5778d 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/TestController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/controller/TestController.java
@@ -14,6 +14,4 @@ public class TestController {
     GeneratorService generatorService;
 
 
-
-
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/IAdminSysJobLogService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/IAdminSysJobLogService.java
index 114add57d856b25eb6ac4a491c6066657570e7e8..1d7a1e20ee486937fe679ba79aa67ef3e6e5ef46 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/IAdminSysJobLogService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/IAdminSysJobLogService.java
@@ -1,7 +1,7 @@
 package com.zscat.mallplus.sys.service;
 
-import com.zscat.mallplus.sys.entity.AdminSysJobLog;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.sys.entity.AdminSysJobLog;
 
 /**
  * <p>
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/IAdminSysJobService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/IAdminSysJobService.java
index 6c2f7db104c0d80fd7452f9c02045a8eebbf4a28..ee152663e0e4a08253604ef490858599e6f5c9d9 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/IAdminSysJobService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/IAdminSysJobService.java
@@ -25,6 +25,7 @@ public interface IAdminSysJobService extends IService<AdminSysJob> {
      * @param jobLog 调度日志信息
      */
     public void addJobLog(AdminSysJob jobLog);
+
     /**
      * 暂停任务
      *
@@ -39,7 +40,7 @@ public interface IAdminSysJobService extends IService<AdminSysJob> {
      * @param job 调度信息
      * @return 结果
      */
-    public int resumeJob(AdminSysJob job) ;
+    public int resumeJob(AdminSysJob job);
 
     /**
      * 删除任务后，所对应的trigger也将被删除
@@ -47,8 +48,7 @@ public interface IAdminSysJobService extends IService<AdminSysJob> {
      * @param job 调度信息
      * @return 结果
      */
-    public int deleteJob(AdminSysJob job) ;
-
+    public int deleteJob(AdminSysJob job);
 
 
     /**
@@ -57,7 +57,7 @@ public interface IAdminSysJobService extends IService<AdminSysJob> {
      * @param job 调度信息
      * @return 结果
      */
-    public int changeStatus(AdminSysJob job) ;
+    public int changeStatus(AdminSysJob job);
 
     /**
      * 立即运行任务
@@ -65,7 +65,7 @@ public interface IAdminSysJobService extends IService<AdminSysJob> {
      * @param job 调度信息
      * @return 结果
      */
-    public void run(AdminSysJob job) ;
+    public void run(AdminSysJob job);
 
     /**
      * 新增任务
@@ -81,7 +81,7 @@ public interface IAdminSysJobService extends IService<AdminSysJob> {
      * @param job 调度信息
      * @return 结果
      */
-    public int updateJob(AdminSysJob job) ;
+    public int updateJob(AdminSysJob job);
 
     /**
      * 校验cron表达式是否有效
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysAdminLogService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysAdminLogService.java
index d7c2456798ab97f695e11f9716fc9636f0ce5c22..0d73be1d49cb782de2d7f8cb47c06a6adae30f58 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysAdminLogService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysAdminLogService.java
@@ -17,5 +17,5 @@ import java.util.List;
  * @since 2019-04-14
  */
 public interface ISysAdminLogService extends IService<SysAdminLog> {
-     List<LogStatisc> selectPageExt(LogParam entity);
+    List<LogStatisc> selectPageExt(LogParam entity);
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysAlipayConfigService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysAlipayConfigService.java
index df14875f6f23ed864708dd9d85165b6189ba4cf9..7fb900d6054896b3be7cf09486552592c5622427 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysAlipayConfigService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysAlipayConfigService.java
@@ -6,7 +6,7 @@ import com.zscat.mallplus.sys.vo.TradeVo;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
@@ -17,8 +17,9 @@ public interface ISysAlipayConfigService extends IService<SysAlipayConfig> {
 
     /**
      * 处理来自PC的交易请求
+     *
      * @param alipay 支付宝配置
-     * @param trade 交易详情
+     * @param trade  交易详情
      * @return String
      * @throws Exception 异常
      */
@@ -26,8 +27,9 @@ public interface ISysAlipayConfigService extends IService<SysAlipayConfig> {
 
     /**
      * 处理来自手机网页的交易请求
+     *
      * @param alipay 支付宝配置
-     * @param trade 交易详情
+     * @param trade  交易详情
      * @return String
      * @throws Exception 异常
      */
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysEmailConfigService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysEmailConfigService.java
index 2f1a12d3c39a4bb1bf1dc47b7e8cadc8d3ec78b0..5290d00df51eade51e6926fba96d3d7b0ef56aae 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysEmailConfigService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysEmailConfigService.java
@@ -7,7 +7,7 @@ import org.springframework.scheduling.annotation.Async;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
@@ -17,7 +17,8 @@ public interface ISysEmailConfigService extends IService<SysEmailConfig> {
 
     /**
      * 发送邮件
-     * @param emailVo 邮件发送的内容
+     *
+     * @param emailVo     邮件发送的内容
      * @param emailConfig 邮件配置
      * @throws Exception /
      */
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysQiniuConfigService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysQiniuConfigService.java
index d1f93ec84867ec3ac754dd0bb1850ce49fa8b662..6c39f1628ad7c96b72a2d6af6176d794442149f1 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysQiniuConfigService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysQiniuConfigService.java
@@ -11,7 +11,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
@@ -20,9 +20,11 @@ import java.util.List;
 public interface ISysQiniuConfigService extends IService<SysQiniuConfig> {
 
     int update(SysQiniuConfig qiniuConfig);
+
     /**
      * 上传文件
-     * @param file 文件
+     *
+     * @param file        文件
      * @param qiniuConfig 配置
      * @return QiniuContent
      */
@@ -30,6 +32,7 @@ public interface ISysQiniuConfigService extends IService<SysQiniuConfig> {
 
     /**
      * 查询文件
+     *
      * @param id 文件ID
      * @return QiniuContent
      */
@@ -37,36 +40,40 @@ public interface ISysQiniuConfigService extends IService<SysQiniuConfig> {
 
     /**
      * 下载文件
+     *
      * @param content 文件信息
-     * @param config 配置
+     * @param config  配置
      * @return String
      */
     String download(SysQiniuContent content, SysQiniuConfig config);
 
     /**
      * 删除文件
+     *
      * @param content 文件
-     * @param config 配置
+     * @param config  配置
      */
     void delete(SysQiniuContent content, SysQiniuConfig config);
 
     /**
      * 同步数据
+     *
      * @param config 配置
      */
     void synchronize(SysQiniuConfig config);
 
     /**
      * 删除文件
-     * @param ids 文件ID数组
+     *
+     * @param ids    文件ID数组
      * @param config 配置
      */
     void deleteAll(Long[] ids, SysQiniuConfig config);
 
 
-
     /**
      * 导出数据
+     *
      * @param queryAll /
      * @param response /
      */
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysQiniuContentService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysQiniuContentService.java
index 98ae1fc59c05efbf5d7d1da2313a702f19ba0990..1feb43d66fb8d37be5e85439ccb32ec543147690 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysQiniuContentService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysQiniuContentService.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.sys.service;
 
-import com.zscat.mallplus.sys.entity.SysQiniuContent;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.sys.entity.SysQiniuContent;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysTestService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysTestService.java
index 4842edeace3618baa10043d097c2f512006487ef..8684cbf93d4271f0e96160902fd8fef9a467925a 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysTestService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysTestService.java
@@ -1,14 +1,13 @@
 package com.zscat.mallplus.sys.service;
 
-import com.zscat.mallplus.sys.entity.SysTest;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zscat.mallplus.sys.entity.SysTest;
 
 /**
-* @author mallplus
-* @date 2019-12-02
-*/
+ * @author mallplus
+ * @date 2019-12-02
+ */
 
-public interface ISysTestService extends IService<SysTest>
-{
+public interface ISysTestService extends IService<SysTest> {
 
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysUserService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysUserService.java
index 509a95f25fb3e4dd31e1d2aa32a932db48afcde5..f8e88d15418bba6588c493fb5e4a398aec35b783 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysUserService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysUserService.java
@@ -41,6 +41,7 @@ public interface ISysUserService extends IService<SysUser> {
     void removePermissRedis(Long id);
 
     List<SysPermission> listPerms();
+
     Object reg(SysUser entity);
 
 //    SmsCode generateCode(String phone);
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysWebLogService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysWebLogService.java
index e94a8f0b313c11a517342730dc8c412790c9c0e8..b106d85e12af0a02282eff620502d2ab950ec02b 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysWebLogService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/ISysWebLogService.java
@@ -17,5 +17,5 @@ import java.util.List;
  */
 public interface ISysWebLogService extends IService<SysWebLog> {
 
-     List<LogStatisc> selectPageExt(LogParam entity);
+    List<LogStatisc> selectPageExt(LogParam entity);
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/AdminSysJobLogServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/AdminSysJobLogServiceImpl.java
index 0fbc9efa9a542f72bdc63c1a67feabfc44d8f88f..bd3c3a0c3a9d59fb9022894475226f5276302656 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/AdminSysJobLogServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/AdminSysJobLogServiceImpl.java
@@ -1,9 +1,9 @@
 package com.zscat.mallplus.sys.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.sys.entity.AdminSysJobLog;
 import com.zscat.mallplus.sys.mapper.AdminSysJobLogMapper;
 import com.zscat.mallplus.sys.service.IAdminSysJobLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/AdminSysJobServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/AdminSysJobServiceImpl.java
index f703e26c9bf8ed08b44483abd79d2b959402d507..f2bc2d9ff45b972eaf29334d48494a0d81ca1c21 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/AdminSysJobServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/AdminSysJobServiceImpl.java
@@ -31,9 +31,10 @@ import java.util.List;
 public class AdminSysJobServiceImpl extends ServiceImpl<AdminSysJobMapper, AdminSysJob> implements IAdminSysJobService {
 
     @Resource
-    private Scheduler scheduler;
+    AdminSysJobMapper jobMapper;
     @Resource
-    AdminSysJobMapper  jobMapper;
+    private Scheduler scheduler;
+
     @Override
     public boolean delete(Long id) {
         return false;
@@ -42,8 +43,7 @@ public class AdminSysJobServiceImpl extends ServiceImpl<AdminSysJobMapper, Admin
     @Override
     public boolean deleteByIds(List<Long> ids) {
 
-        for (Long jobId : ids)
-        {
+        for (Long jobId : ids) {
             AdminSysJob job = jobMapper.selectById(jobId);
             deleteJob(job);
         }
@@ -62,13 +62,11 @@ public class AdminSysJobServiceImpl extends ServiceImpl<AdminSysJobMapper, Admin
      */
     @Override
     @Transactional
-    public int deleteJob(AdminSysJob job)
-    {
+    public int deleteJob(AdminSysJob job) {
         Long jobId = job.getJobId();
         String jobGroup = job.getJobGroup();
         int rows = jobMapper.deleteById(jobId);
-        if (rows > 0)
-        {
+        if (rows > 0) {
             try {
                 scheduler.deleteJob(ScheduleUtils.getJobKey(jobId, jobGroup));
             } catch (SchedulerException e) {
@@ -77,19 +75,19 @@ public class AdminSysJobServiceImpl extends ServiceImpl<AdminSysJobMapper, Admin
         }
         return rows;
     }
+
     /**
      * 项目启动时，初始化定时器
      * 主要是防止手动修改数据库导致未同步到定时任务处理（注：不能手动修改数据库ID和任务组名，否则会导致脏数据）
      */
     @PostConstruct
-    public void init() throws SchedulerException
-    {
+    public void init() throws SchedulerException {
         List<AdminSysJob> jobList = jobMapper.selectList(new QueryWrapper<>());
-        for (AdminSysJob job : jobList)
-        {
+        for (AdminSysJob job : jobList) {
             updateSchedulerJob(job, job.getJobGroup());
         }
     }
+
     /**
      * 暂停任务
      *
@@ -97,14 +95,12 @@ public class AdminSysJobServiceImpl extends ServiceImpl<AdminSysJobMapper, Admin
      */
     @Override
     @Transactional
-    public int pauseJob(AdminSysJob job)
-    {
+    public int pauseJob(AdminSysJob job) {
         Long jobId = job.getJobId();
         String jobGroup = job.getJobGroup();
         job.setStatus(ScheduleConstants.Status.PAUSE.getValue());
         int rows = jobMapper.updateById(job);
-        if (rows > 0)
-        {
+        if (rows > 0) {
             try {
                 scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup));
             } catch (SchedulerException e) {
@@ -121,14 +117,12 @@ public class AdminSysJobServiceImpl extends ServiceImpl<AdminSysJobMapper, Admin
      */
     @Override
     @Transactional
-    public int resumeJob(AdminSysJob job)
-    {
+    public int resumeJob(AdminSysJob job) {
         Long jobId = job.getJobId();
         String jobGroup = job.getJobGroup();
         job.setStatus(ScheduleConstants.Status.NORMAL.getValue());
         int rows = jobMapper.updateById(job);
-        if (rows > 0)
-        {
+        if (rows > 0) {
             try {
                 scheduler.resumeJob(ScheduleUtils.getJobKey(jobId, jobGroup));
             } catch (SchedulerException e) {
@@ -137,6 +131,7 @@ public class AdminSysJobServiceImpl extends ServiceImpl<AdminSysJobMapper, Admin
         }
         return rows;
     }
+
     /**
      * 任务调度状态修改
      *
@@ -144,16 +139,12 @@ public class AdminSysJobServiceImpl extends ServiceImpl<AdminSysJobMapper, Admin
      */
     @Override
     @Transactional
-    public int changeStatus(AdminSysJob job)
-    {
+    public int changeStatus(AdminSysJob job) {
         int rows = 0;
         Integer status = job.getStatus();
-        if (ScheduleConstants.Status.NORMAL.getValue().equals(status))
-        {
+        if (ScheduleConstants.Status.NORMAL.getValue().equals(status)) {
             rows = resumeJob(job);
-        }
-        else if (ScheduleConstants.Status.PAUSE.getValue().equals(status))
-        {
+        } else if (ScheduleConstants.Status.PAUSE.getValue().equals(status)) {
             rows = pauseJob(job);
         }
         return rows;
@@ -166,8 +157,7 @@ public class AdminSysJobServiceImpl extends ServiceImpl<AdminSysJobMapper, Admin
      */
     @Override
     @Transactional
-    public void run(AdminSysJob job)
-    {
+    public void run(AdminSysJob job) {
         Long jobId = job.getJobId();
         String jobGroup = job.getJobGroup();
         AdminSysJob properties = jobMapper.selectById(job.getJobId());
@@ -188,12 +178,10 @@ public class AdminSysJobServiceImpl extends ServiceImpl<AdminSysJobMapper, Admin
      */
     @Override
     @Transactional
-    public int insertJob(AdminSysJob job)
-    {
+    public int insertJob(AdminSysJob job) {
         job.setStatus(ScheduleConstants.Status.PAUSE.getValue());
         int rows = jobMapper.insert(job);
-        if (rows > 0)
-        {
+        if (rows > 0) {
             ScheduleUtils.createScheduleJob(scheduler, job);
         }
         return rows;
@@ -206,12 +194,10 @@ public class AdminSysJobServiceImpl extends ServiceImpl<AdminSysJobMapper, Admin
      */
     @Override
     @Transactional
-    public int updateJob(AdminSysJob job)
-    {
+    public int updateJob(AdminSysJob job) {
         AdminSysJob properties = jobMapper.selectById(job.getJobId());
         int rows = jobMapper.updateById(job);
-        if (rows > 0)
-        {
+        if (rows > 0) {
             updateSchedulerJob(job, properties.getJobGroup());
         }
         return rows;
@@ -220,22 +206,20 @@ public class AdminSysJobServiceImpl extends ServiceImpl<AdminSysJobMapper, Admin
     /**
      * 更新任务
      *
-     * @param job 调度信息
+     * @param job      调度信息
      * @param jobGroup 任务组名
      */
-    public void updateSchedulerJob(AdminSysJob job, String jobGroup)
-    {
+    public void updateSchedulerJob(AdminSysJob job, String jobGroup) {
         try {
             Long jobId = job.getJobId();
             // 判断是否存在
             JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup);
-            if (scheduler.checkExists(jobKey))
-            {
+            if (scheduler.checkExists(jobKey)) {
                 // 防止创建时存在数据问题 先移除，然后在执行创建操作
                 scheduler.deleteJob(jobKey);
             }
             ScheduleUtils.createScheduleJob(scheduler, job);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
 
@@ -248,8 +232,7 @@ public class AdminSysJobServiceImpl extends ServiceImpl<AdminSysJobMapper, Admin
      * @return 结果
      */
     @Override
-    public boolean checkCronExpressionIsValid(String cronExpression)
-    {
+    public boolean checkCronExpressionIsValid(String cronExpression) {
         return CronUtils.isValid(cronExpression);
     }
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/GeneratorServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/GeneratorServiceImpl.java
index a75e536ab25ed5a60d3fb05d4d4924b32086cbab..987184156227f354afe6229cca57b258f134fe8e 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/GeneratorServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/GeneratorServiceImpl.java
@@ -24,19 +24,18 @@ public class GeneratorServiceImpl implements GeneratorService {
     GeneratorMapper generatorMapper;
 
 
-
     @Override
     @SuppressWarnings("all")
     public Object getTables(String name, int[] startEnd) {
 
-        List<Map<String, Object>> list = generatorMapper.list(name,startEnd[0],startEnd[1]);
+        List<Map<String, Object>> list = generatorMapper.list(name, startEnd[0], startEnd[1]);
         List<TableInfo> tableInfos = new ArrayList<>();
         for (Map<String, Object> obj : list) {
 
-            tableInfos.add(new TableInfo(obj.get("tableName"),obj.get("createTime"),obj.get("engine"),obj.get("coding"), ObjectUtil.isNotEmpty(obj.get("table_comment"))? obj.get("table_comment").toString() : "-"));
+            tableInfos.add(new TableInfo(obj.get("tableName"), obj.get("createTime"), obj.get("engine"), obj.get("coding"), ObjectUtil.isNotEmpty(obj.get("table_comment")) ? obj.get("table_comment").toString() : "-"));
         }
         Object totalElements = generatorMapper.count(null);
-        return PageUtil.toPage(tableInfos,totalElements);
+        return PageUtil.toPage(tableInfos, totalElements);
     }
 
     @Override
@@ -47,16 +46,16 @@ public class GeneratorServiceImpl implements GeneratorService {
         List<ColumnInfo> columnInfos = new ArrayList<>();
         for (Map<String, String> obj : result) {
 
-            columnInfos.add(new ColumnInfo(obj.get("column_name"),obj.get("is_nullable"),obj.get("data_type"),obj.get("column_comment"),obj.get("columnkey"),obj.get("extra"),null,"true"));
+            columnInfos.add(new ColumnInfo(obj.get("column_name"), obj.get("is_nullable"), obj.get("data_type"), obj.get("column_comment"), obj.get("columnkey"), obj.get("extra"), null, "true"));
         }
-        return PageUtil.toPage(columnInfos,columnInfos.size());
+        return PageUtil.toPage(columnInfos, columnInfos.size());
     }
 
     @Override
     public void generator(List<ColumnInfo> columnInfos, GenConfig genConfig, String tableName) {
 
         try {
-            GenUtil.generatorCode(columnInfos,genConfig,tableName);
+            GenUtil.generatorCode(columnInfos, genConfig, tableName);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/RedisUtil.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/RedisUtil.java
index 62783afcfadfd904cd52eafaf8659c373ad98e1c..acdf2724996a589cd6810656c7bb7179fc642e24 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/RedisUtil.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/RedisUtil.java
@@ -16,1343 +16,1314 @@ import java.util.concurrent.TimeUnit;
  * Redis工具类
  *
  * @author WangFan
- * @date 2018-02-24 下午03:09:50
  * @version 1.1 (GitHub文档: https://github.com/whvcse/RedisUtil )
+ * @date 2018-02-24 下午03:09:50
  */
 @Service
 public class RedisUtil {
-	@Autowired
-	private StringRedisTemplate redisTemplate;
-
-
-	/** -------------------key相关操作--------------------- */
-
-	/**
-	 * 删除key
-	 *
-	 * @param key
-	 */
-	public void delete(String key) {
-		redisTemplate.delete(key);
-	}
-
-	/**
-	 * 批量删除key
-	 *
-	 * @param keys
-	 */
-	public void delete(Collection<String> keys) {
-		redisTemplate.delete(keys);
-	}
-
-	/**
-	 * 序列化key
-	 *
-	 * @param key
-	 * @return
-	 */
-	public byte[] dump(String key) {
-		return redisTemplate.dump(key);
-	}
-
-	/**
-	 * 是否存在key
-	 *
-	 * @param key
-	 * @return
-	 */
-	public Boolean hasKey(String key) {
-		return redisTemplate.hasKey(key);
-	}
-
-	/**
-	 * 设置过期时间
-	 *
-	 * @param key
-	 * @param timeout
-	 * @param unit
-	 * @return
-	 */
-	public Boolean expire(String key, long timeout, TimeUnit unit) {
-		return redisTemplate.expire(key, timeout, unit);
-	}
-
-	/**
-	 * 设置过期时间
-	 *
-	 * @param key
-	 * @param date
-	 * @return
-	 */
-	public Boolean expireAt(String key, Date date) {
-		return redisTemplate.expireAt(key, date);
-	}
-
-	/**
-	 * 查找匹配的key
-	 *
-	 * @param pattern
-	 * @return
-	 */
-	public Set<String> keys(String pattern) {
-		return redisTemplate.keys(pattern);
-	}
-
-	/**
-	 * 将当前数据库的 key 移动到给定的数据库 db 当中
-	 *
-	 * @param key
-	 * @param dbIndex
-	 * @return
-	 */
-	public Boolean move(String key, int dbIndex) {
-		return redisTemplate.move(key, dbIndex);
-	}
-
-	/**
-	 * 移除 key 的过期时间，key 将持久保持
-	 *
-	 * @param key
-	 * @return
-	 */
-	public Boolean persist(String key) {
-		return redisTemplate.persist(key);
-	}
-
-	/**
-	 * 返回 key 的剩余的过期时间
-	 *
-	 * @param key
-	 * @param unit
-	 * @return
-	 */
-	public Long getExpire(String key, TimeUnit unit) {
-		return redisTemplate.getExpire(key, unit);
-	}
-
-	/**
-	 * 返回 key 的剩余的过期时间
-	 *
-	 * @param key
-	 * @return
-	 */
-	public Long getExpire(String key) {
-		return redisTemplate.getExpire(key);
-	}
-
-	/**
-	 * 从当前数据库中随机返回一个 key
-	 *
-	 * @return
-	 */
-	public String randomKey() {
-		return redisTemplate.randomKey();
-	}
-
-	/**
-	 * 修改 key 的名称
-	 *
-	 * @param oldKey
-	 * @param newKey
-	 */
-	public void rename(String oldKey, String newKey) {
-		redisTemplate.rename(oldKey, newKey);
-	}
-
-	/**
-	 * 仅当 newkey 不存在时，将 oldKey 改名为 newkey
-	 *
-	 * @param oldKey
-	 * @param newKey
-	 * @return
-	 */
-	public Boolean renameIfAbsent(String oldKey, String newKey) {
-		return redisTemplate.renameIfAbsent(oldKey, newKey);
-	}
-
-	/**
-	 * 返回 key 所储存的值的类型
-	 *
-	 * @param key
-	 * @return
-	 */
-	public DataType type(String key) {
-		return redisTemplate.type(key);
-	}
-
-	/** -------------------string相关操作--------------------- */
-
-	/**
-	 * 设置指定 key 的值
-	 * @param key
-	 * @param value
-	 */
-	public void set(String key, String value) {
-		redisTemplate.opsForValue().set(key, value);
-	}
-
-	/**
-	 * 获取指定 key 的值
-	 * @param key
-	 * @return
-	 */
-	public String get(String key) {
-		return redisTemplate.opsForValue().get(key);
-	}
-
-	/**
-	 * 返回 key 中字符串值的子字符
-	 * @param key
-	 * @param start
-	 * @param end
-	 * @return
-	 */
-	public String getRange(String key, long start, long end) {
-		return redisTemplate.opsForValue().get(key, start, end);
-	}
-
-	/**
-	 * 将给定 key 的值设为 value ，并返回 key 的旧值(old value)
-	 *
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public String getAndSet(String key, String value) {
-		return redisTemplate.opsForValue().getAndSet(key, value);
-	}
-
-	/**
-	 * 对 key 所储存的字符串值，获取指定偏移量上的位(bit)
-	 *
-	 * @param key
-	 * @param offset
-	 * @return
-	 */
-	public Boolean getBit(String key, long offset) {
-		return redisTemplate.opsForValue().getBit(key, offset);
-	}
-
-	/**
-	 * 批量获取
-	 *
-	 * @param keys
-	 * @return
-	 */
-	public List<String> multiGet(Collection<String> keys) {
-		return redisTemplate.opsForValue().multiGet(keys);
-	}
-
-	/**
-	 * 设置ASCII码, 字符串'a'的ASCII码是97, 转为二进制是'01100001', 此方法是将二进制第offset位值变为value
-	 *
-	 * @param key
-	 * @param postion
-	 *            位置
-	 * @param value
-	 *            值,true为1, false为0
-	 * @return
-	 */
-	public boolean setBit(String key, long offset, boolean value) {
-		return redisTemplate.opsForValue().setBit(key, offset, value);
-	}
-
-	/**
-	 * 将值 value 关联到 key ，并将 key 的过期时间设为 timeout
-	 *
-	 * @param key
-	 * @param value
-	 * @param timeout
-	 *            过期时间
-	 * @param unit
-	 *            时间单位, 天:TimeUnit.DAYS 小时:TimeUnit.HOURS 分钟:TimeUnit.MINUTES
-	 *            秒:TimeUnit.SECONDS 毫秒:TimeUnit.MILLISECONDS
-	 */
-	public void setEx(String key, String value, long timeout, TimeUnit unit) {
-		redisTemplate.opsForValue().set(key, value, timeout, unit);
-	}
-
-	/**
-	 * 只有在 key 不存在时设置 key 的值
-	 *
-	 * @param key
-	 * @param value
-	 * @return 之前已经存在返回false,不存在返回true
-	 */
-	public boolean setIfAbsent(String key, String value) {
-		return redisTemplate.opsForValue().setIfAbsent(key, value);
-	}
-
-	/**
-	 * 用 value 参数覆写给定 key 所储存的字符串值，从偏移量 offset 开始
-	 *
-	 * @param key
-	 * @param value
-	 * @param offset
-	 *            从指定位置开始覆写
-	 */
-	public void setRange(String key, String value, long offset) {
-		redisTemplate.opsForValue().set(key, value, offset);
-	}
-
-	/**
-	 * 获取字符串的长度
-	 *
-	 * @param key
-	 * @return
-	 */
-	public Long size(String key) {
-		return redisTemplate.opsForValue().size(key);
-	}
-
-	/**
-	 * 批量添加
-	 *
-	 * @param maps
-	 */
-	public void multiSet(Map<String, String> maps) {
-		redisTemplate.opsForValue().multiSet(maps);
-	}
-
-	/**
-	 * 同时设置一个或多个 key-value 对，当且仅当所有给定 key 都不存在
-	 *
-	 * @param maps
-	 * @return 之前已经存在返回false,不存在返回true
-	 */
-	public boolean multiSetIfAbsent(Map<String, String> maps) {
-		return redisTemplate.opsForValue().multiSetIfAbsent(maps);
-	}
-
-	/**
-	 * 增加(自增长), 负数则为自减
-	 *
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Long incrBy(String key, long increment) {
-		return redisTemplate.opsForValue().increment(key, increment);
-	}
-
-	/**
-	 *
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Double incrByFloat(String key, double increment) {
-		return redisTemplate.opsForValue().increment(key, increment);
-	}
-
-	/**
-	 * 追加到末尾
-	 *
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Integer append(String key, String value) {
-		return redisTemplate.opsForValue().append(key, value);
-	}
-
-	/** -------------------hash相关操作------------------------- */
-
-	/**
-	 * 获取存储在哈希表中指定字段的值
-	 *
-	 * @param key
-	 * @param field
-	 * @return
-	 */
-	public Object hGet(String key, String field) {
-		return redisTemplate.opsForHash().get(key, field);
-	}
-
-	/**
-	 * 获取所有给定字段的值
-	 *
-	 * @param key
-	 * @return
-	 */
-	public Map<Object, Object> hGetAll(String key) {
-		return redisTemplate.opsForHash().entries(key);
-	}
-
-	/**
-	 * 获取所有给定字段的值
-	 *
-	 * @param key
-	 * @param fields
-	 * @return
-	 */
-	public List<Object> hMultiGet(String key, Collection<Object> fields) {
-		return redisTemplate.opsForHash().multiGet(key, fields);
-	}
-
-	public void hPut(String key, String hashKey, String  value) {
-		redisTemplate.opsForHash().put(key, hashKey, value);
-	}
-
-	public void hPutAll(String key, Map<String, String> maps) {
-		redisTemplate.opsForHash().putAll(key, maps);
-	}
-
-	/**
-	 * 仅当hashKey不存在时才设置
-	 *
-	 * @param key
-	 * @param hashKey
-	 * @param value
-	 * @return
-	 */
-	public Boolean hPutIfAbsent(String key, String hashKey, String value) {
-		return redisTemplate.opsForHash().putIfAbsent(key, hashKey, value);
-	}
-
-	/**
-	 * 删除一个或多个哈希表字段
-	 *
-	 * @param key
-	 * @param fields
-	 * @return
-	 */
-	public Long hDelete(String key, Object... fields) {
-		return redisTemplate.opsForHash().delete(key, fields);
-	}
-
-	/**
-	 * 查看哈希表 key 中，指定的字段是否存在
-	 *
-	 * @param key
-	 * @param field
-	 * @return
-	 */
-	public boolean hExists(String key, String field) {
-		return redisTemplate.opsForHash().hasKey(key, field);
-	}
-
-	/**
-	 * 为哈希表 key 中的指定字段的整数值加上增量 increment
-	 *
-	 * @param key
-	 * @param field
-	 * @param increment
-	 * @return
-	 */
-	public Long hIncrBy(String key, Object field, long increment) {
-		return redisTemplate.opsForHash().increment(key, field, increment);
-	}
-
-	/**
-	 * 为哈希表 key 中的指定字段的整数值加上增量 increment
-	 *
-	 * @param key
-	 * @param field
-	 * @param delta
-	 * @return
-	 */
-	public Double hIncrByFloat(String key, Object field, double delta) {
-		return redisTemplate.opsForHash().increment(key, field, delta);
-	}
-
-	/**
-	 * 获取所有哈希表中的字段
-	 *
-	 * @param key
-	 * @return
-	 */
-	public Set<Object> hKeys(String key) {
-		return redisTemplate.opsForHash().keys(key);
-	}
-
-	/**
-	 * 获取哈希表中字段的数量
-	 *
-	 * @param key
-	 * @return
-	 */
-	public Long hSize(String key) {
-		return redisTemplate.opsForHash().size(key);
-	}
-
-	/**
-	 * 获取哈希表中所有值
-	 *
-	 * @param key
-	 * @return
-	 */
-	public List<Object> hValues(String key) {
-		return redisTemplate.opsForHash().values(key);
-	}
-
-	/**
-	 * 迭代哈希表中的键值对
-	 *
-	 * @param key
-	 * @param options
-	 * @return
-	 */
-	public Cursor<Entry<Object, Object>> hScan(String key, ScanOptions options) {
-		return redisTemplate.opsForHash().scan(key, options);
-	}
-
-	/** ------------------------list相关操作---------------------------- */
-
-	/**
-	 * 通过索引获取列表中的元素
-	 *
-	 * @param key
-	 * @param index
-	 * @return
-	 */
-	public String lIndex(String key, long index) {
-		return redisTemplate.opsForList().index(key, index);
-	}
-
-	/**
-	 * 获取列表指定范围内的元素
-	 *
-	 * @param key
-	 * @param start
-	 *            开始位置, 0是开始位置
-	 * @param end
-	 *            结束位置, -1返回所有
-	 * @return
-	 */
-	public List<String> lRange(String key, long start, long end) {
-		return redisTemplate.opsForList().range(key, start, end);
-	}
-
-	/**
-	 * 存储在list头部
-	 *
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Long lLeftPush(String key, String value) {
-		return redisTemplate.opsForList().leftPush(key, value);
-	}
-
-	/**
-	 *
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Long lLeftPushAll(String key, String... value) {
-		return redisTemplate.opsForList().leftPushAll(key, value);
-	}
-
-	/**
-	 *
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Long lLeftPushAll(String key, Collection<String> value) {
-		return redisTemplate.opsForList().leftPushAll(key, value);
-	}
-
-	/**
-	 * 当list存在的时候才加入
-	 *
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Long lLeftPushIfPresent(String key, String value) {
-		return redisTemplate.opsForList().leftPushIfPresent(key, value);
-	}
-
-	/**
-	 * 如果pivot存在,再pivot前面添加
-	 *
-	 * @param key
-	 * @param pivot
-	 * @param value
-	 * @return
-	 */
-	public Long lLeftPush(String key, String pivot, String value) {
-		return redisTemplate.opsForList().leftPush(key, pivot, value);
-	}
-
-	/**
-	 *
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Long lRightPush(String key, String value) {
-		return redisTemplate.opsForList().rightPush(key, value);
-	}
-
-	/**
-	 *
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Long lRightPushAll(String key, String... value) {
-		return redisTemplate.opsForList().rightPushAll(key, value);
-	}
-
-	/**
-	 *
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Long lRightPushAll(String key, Collection<String> value) {
-		return redisTemplate.opsForList().rightPushAll(key, value);
-	}
-
-	/**
-	 * 为已存在的列表添加值
-	 *
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Long lRightPushIfPresent(String key, String value) {
-		return redisTemplate.opsForList().rightPushIfPresent(key, value);
-	}
-
-	/**
-	 * 在pivot元素的右边添加值
-	 *
-	 * @param key
-	 * @param pivot
-	 * @param value
-	 * @return
-	 */
-	public Long lRightPush(String key, String pivot, String value) {
-		return redisTemplate.opsForList().rightPush(key, pivot, value);
-	}
-
-	/**
-	 * 通过索引设置列表元素的值
-	 *
-	 * @param key
-	 * @param index
-	 *            位置
-	 * @param value
-	 */
-	public void lSet(String key, long index, String value) {
-		redisTemplate.opsForList().set(key, index, value);
-	}
-
-	/**
-	 * 移出并获取列表的第一个元素
-	 *
-	 * @param key
-	 * @return 删除的元素
-	 */
-	public String lLeftPop(String key) {
-		return redisTemplate.opsForList().leftPop(key);
-	}
-
-	/**
-	 * 移出并获取列表的第一个元素， 如果列表没有元素会阻塞列表直到等待超时或发现可弹出元素为止
-	 *
-	 * @param key
-	 * @param timeout
-	 *            等待时间
-	 * @param unit
-	 *            时间单位
-	 * @return
-	 */
-	public String lBLeftPop(String key, long timeout, TimeUnit unit) {
-		return redisTemplate.opsForList().leftPop(key, timeout, unit);
-	}
-
-	/**
-	 * 移除并获取列表最后一个元素
-	 *
-	 * @param key
-	 * @return 删除的元素
-	 */
-	public String lRightPop(String key) {
-		return redisTemplate.opsForList().rightPop(key);
-	}
-
-	/**
-	 * 移出并获取列表的最后一个元素， 如果列表没有元素会阻塞列表直到等待超时或发现可弹出元素为止
-	 *
-	 * @param key
-	 * @param timeout
-	 *            等待时间
-	 * @param unit
-	 *            时间单位
-	 * @return
-	 */
-	public String lBRightPop(String key, long timeout, TimeUnit unit) {
-		return redisTemplate.opsForList().rightPop(key, timeout, unit);
-	}
-
-	/**
-	 * 移除列表的最后一个元素，并将该元素添加到另一个列表并返回
-	 *
-	 * @param sourceKey
-	 * @param destinationKey
-	 * @return
-	 */
-	public String lRightPopAndLeftPush(String sourceKey, String destinationKey) {
-		return redisTemplate.opsForList().rightPopAndLeftPush(sourceKey,
-				destinationKey);
-	}
-
-	/**
-	 * 从列表中弹出一个值，将弹出的元素插入到另外一个列表中并返回它； 如果列表没有元素会阻塞列表直到等待超时或发现可弹出元素为止
-	 *
-	 * @param sourceKey
-	 * @param destinationKey
-	 * @param timeout
-	 * @param unit
-	 * @return
-	 */
-	public String lBRightPopAndLeftPush(String sourceKey, String destinationKey,
-			long timeout, TimeUnit unit) {
-		return redisTemplate.opsForList().rightPopAndLeftPush(sourceKey,
-				destinationKey, timeout, unit);
-	}
-
-	/**
-	 * 删除集合中值等于value得元素
-	 *
-	 * @param key
-	 * @param index
-	 *            index=0, 删除所有值等于value的元素; index>0, 从头部开始删除第一个值等于value的元素;
-	 *            index<0, 从尾部开始删除第一个值等于value的元素;
-	 * @param value
-	 * @return
-	 */
-	public Long lRemove(String key, long index, String value) {
-		return redisTemplate.opsForList().remove(key, index, value);
-	}
-
-	/**
-	 * 裁剪list
-	 *
-	 * @param key
-	 * @param start
-	 * @param end
-	 */
-	public void lTrim(String key, long start, long end) {
-		redisTemplate.opsForList().trim(key, start, end);
-	}
-
-	/**
-	 * 获取列表长度
-	 *
-	 * @param key
-	 * @return
-	 */
-	public Long lLen(String key) {
-		return redisTemplate.opsForList().size(key);
-	}
-
-	/** --------------------set相关操作-------------------------- */
-
-	/**
-	 * set添加元素
-	 *
-	 * @param key
-	 * @param values
-	 * @return
-	 */
-	public Long sAdd(String key, String... values) {
-		return redisTemplate.opsForSet().add(key, values);
-	}
-
-	/**
-	 * set移除元素
-	 *
-	 * @param key
-	 * @param values
-	 * @return
-	 */
-	public Long sRemove(String key, Object... values) {
-		return redisTemplate.opsForSet().remove(key, values);
-	}
-
-	/**
-	 * 移除并返回集合的一个随机元素
-	 *
-	 * @param key
-	 * @return
-	 */
-	public String sPop(String key) {
-		return redisTemplate.opsForSet().pop(key);
-	}
-
-	/**
-	 * 将元素value从一个集合移到另一个集合
-	 *
-	 * @param key
-	 * @param value
-	 * @param destKey
-	 * @return
-	 */
-	public Boolean sMove(String key, String value, String destKey) {
-		return redisTemplate.opsForSet().move(key, value, destKey);
-	}
-
-	/**
-	 * 获取集合的大小
-	 *
-	 * @param key
-	 * @return
-	 */
-	public Long sSize(String key) {
-		return redisTemplate.opsForSet().size(key);
-	}
-
-	/**
-	 * 判断集合是否包含value
-	 *
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Boolean sIsMember(String key, Object value) {
-		return redisTemplate.opsForSet().isMember(key, value);
-	}
-
-	/**
-	 * 获取两个集合的交集
-	 *
-	 * @param key
-	 * @param otherKey
-	 * @return
-	 */
-	public Set<String> sIntersect(String key, String otherKey) {
-		return redisTemplate.opsForSet().intersect(key, otherKey);
-	}
-
-	/**
-	 * 获取key集合与多个集合的交集
-	 *
-	 * @param key
-	 * @param otherKeys
-	 * @return
-	 */
-	public Set<String> sIntersect(String key, Collection<String> otherKeys) {
-		return redisTemplate.opsForSet().intersect(key, otherKeys);
-	}
-
-	/**
-	 * key集合与otherKey集合的交集存储到destKey集合中
-	 *
-	 * @param key
-	 * @param otherKey
-	 * @param destKey
-	 * @return
-	 */
-	public Long sIntersectAndStore(String key, String otherKey, String destKey) {
-		return redisTemplate.opsForSet().intersectAndStore(key, otherKey,
-				destKey);
-	}
-
-	/**
-	 * key集合与多个集合的交集存储到destKey集合中
-	 *
-	 * @param key
-	 * @param otherKeys
-	 * @param destKey
-	 * @return
-	 */
-	public Long sIntersectAndStore(String key, Collection<String> otherKeys,
-			String destKey) {
-		return redisTemplate.opsForSet().intersectAndStore(key, otherKeys,
-				destKey);
-	}
-
-	/**
-	 * 获取两个集合的并集
-	 *
-	 * @param key
-	 * @param otherKeys
-	 * @return
-	 */
-	public Set<String> sUnion(String key, String otherKeys) {
-		return redisTemplate.opsForSet().union(key, otherKeys);
-	}
-
-	/**
-	 * 获取key集合与多个集合的并集
-	 *
-	 * @param key
-	 * @param otherKeys
-	 * @return
-	 */
-	public Set<String> sUnion(String key, Collection<String> otherKeys) {
-		return redisTemplate.opsForSet().union(key, otherKeys);
-	}
-
-	/**
-	 * key集合与otherKey集合的并集存储到destKey中
-	 *
-	 * @param key
-	 * @param otherKey
-	 * @param destKey
-	 * @return
-	 */
-	public Long sUnionAndStore(String key, String otherKey, String destKey) {
-		return redisTemplate.opsForSet().unionAndStore(key, otherKey, destKey);
-	}
-
-	/**
-	 * key集合与多个集合的并集存储到destKey中
-	 *
-	 * @param key
-	 * @param otherKeys
-	 * @param destKey
-	 * @return
-	 */
-	public Long sUnionAndStore(String key, Collection<String> otherKeys,
-			String destKey) {
-		return redisTemplate.opsForSet().unionAndStore(key, otherKeys, destKey);
-	}
-
-	/**
-	 * 获取两个集合的差集
-	 *
-	 * @param key
-	 * @param otherKey
-	 * @return
-	 */
-	public Set<String> sDifference(String key, String otherKey) {
-		return redisTemplate.opsForSet().difference(key, otherKey);
-	}
-
-	/**
-	 * 获取key集合与多个集合的差集
-	 *
-	 * @param key
-	 * @param otherKeys
-	 * @return
-	 */
-	public Set<String> sDifference(String key, Collection<String> otherKeys) {
-		return redisTemplate.opsForSet().difference(key, otherKeys);
-	}
-
-	/**
-	 * key集合与otherKey集合的差集存储到destKey中
-	 *
-	 * @param key
-	 * @param otherKey
-	 * @param destKey
-	 * @return
-	 */
-	public Long sDifference(String key, String otherKey, String destKey) {
-		return redisTemplate.opsForSet().differenceAndStore(key, otherKey,
-				destKey);
-	}
-
-	/**
-	 * key集合与多个集合的差集存储到destKey中
-	 *
-	 * @param key
-	 * @param otherKeys
-	 * @param destKey
-	 * @return
-	 */
-	public Long sDifference(String key, Collection<String> otherKeys,
-			String destKey) {
-		return redisTemplate.opsForSet().differenceAndStore(key, otherKeys,
-				destKey);
-	}
-
-	/**
-	 * 获取集合所有元素
-	 *
-	 * @param key
-	 * @param otherKeys
-	 * @param destKey
-	 * @return
-	 */
-	public Set<String> setMembers(String key) {
-		return redisTemplate.opsForSet().members(key);
-	}
-
-	/**
-	 * 随机获取集合中的一个元素
-	 *
-	 * @param key
-	 * @return
-	 */
-	public String sRandomMember(String key) {
-		return redisTemplate.opsForSet().randomMember(key);
-	}
-
-	/**
-	 * 随机获取集合中count个元素
-	 *
-	 * @param key
-	 * @param count
-	 * @return
-	 */
-	public List<String> sRandomMembers(String key, long count) {
-		return redisTemplate.opsForSet().randomMembers(key, count);
-	}
-
-	/**
-	 * 随机获取集合中count个元素并且去除重复的
-	 *
-	 * @param key
-	 * @param count
-	 * @return
-	 */
-	public Set<String> sDistinctRandomMembers(String key, long count) {
-		return redisTemplate.opsForSet().distinctRandomMembers(key, count);
-	}
-
-	/**
-	 *
-	 * @param key
-	 * @param options
-	 * @return
-	 */
-	public Cursor<String> sScan(String key, ScanOptions options) {
-		return redisTemplate.opsForSet().scan(key, options);
-	}
-
-	/**------------------zSet相关操作--------------------------------*/
-
-	/**
-	 * 添加元素,有序集合是按照元素的score值由小到大排列
-	 *
-	 * @param key
-	 * @param value
-	 * @param score
-	 * @return
-	 */
-	public Boolean zAdd(String key, String value, double score) {
-		return redisTemplate.opsForZSet().add(key, value, score);
-	}
-
-	/**
-	 *
-	 * @param key
-	 * @param values
-	 * @return
-	 */
-	public Long zAdd(String key, Set<TypedTuple<String>> values) {
-		return redisTemplate.opsForZSet().add(key, values);
-	}
-
-	/**
-	 *
-	 * @param key
-	 * @param values
-	 * @return
-	 */
-	public Long zRemove(String key, Object... values) {
-		return redisTemplate.opsForZSet().remove(key, values);
-	}
-
-	/**
-	 * 增加元素的score值，并返回增加后的值
-	 *
-	 * @param key
-	 * @param value
-	 * @param delta
-	 * @return
-	 */
-	public Double zIncrementScore(String key, String value, double delta) {
-		return redisTemplate.opsForZSet().incrementScore(key, value, delta);
-	}
-
-	/**
-	 * 返回元素在集合的排名,有序集合是按照元素的score值由小到大排列
-	 *
-	 * @param key
-	 * @param value
-	 * @return 0表示第一位
-	 */
-	public Long zRank(String key, Object value) {
-		return redisTemplate.opsForZSet().rank(key, value);
-	}
-
-	/**
-	 * 返回元素在集合的排名,按元素的score值由大到小排列
-	 *
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Long zReverseRank(String key, Object value) {
-		return redisTemplate.opsForZSet().reverseRank(key, value);
-	}
-
-	/**
-	 * 获取集合的元素, 从小到大排序
-	 *
-	 * @param key
-	 * @param start
-	 *            开始位置
-	 * @param end
-	 *            结束位置, -1查询所有
-	 * @return
-	 */
-	public Set<String> zRange(String key, long start, long end) {
-		return redisTemplate.opsForZSet().range(key, start, end);
-	}
-
-	/**
-	 * 获取集合元素, 并且把score值也获取
-	 *
-	 * @param key
-	 * @param start
-	 * @param end
-	 * @return
-	 */
-	public Set<TypedTuple<String>> zRangeWithScores(String key, long start,
-			long end) {
-		return redisTemplate.opsForZSet().rangeWithScores(key, start, end);
-	}
-
-	/**
-	 * 根据Score值查询集合元素
-	 *
-	 * @param key
-	 * @param min
-	 *            最小值
-	 * @param max
-	 *            最大值
-	 * @return
-	 */
-	public Set<String> zRangeByScore(String key, double min, double max) {
-		return redisTemplate.opsForZSet().rangeByScore(key, min, max);
-	}
-
-	/**
-	 * 根据Score值查询集合元素, 从小到大排序
-	 *
-	 * @param key
-	 * @param min
-	 *            最小值
-	 * @param max
-	 *            最大值
-	 * @return
-	 */
-	public Set<TypedTuple<String>> zRangeByScoreWithScores(String key,
-			double min, double max) {
-		return redisTemplate.opsForZSet().rangeByScoreWithScores(key, min, max);
-	}
-
-	/**
-	 *
-	 * @param key
-	 * @param min
-	 * @param max
-	 * @param start
-	 * @param end
-	 * @return
-	 */
-	public Set<TypedTuple<String>> zRangeByScoreWithScores(String key,
-			double min, double max, long start, long end) {
-		return redisTemplate.opsForZSet().rangeByScoreWithScores(key, min, max,
-				start, end);
-	}
-
-	/**
-	 * 获取集合的元素, 从大到小排序
-	 *
-	 * @param key
-	 * @param start
-	 * @param end
-	 * @return
-	 */
-	public Set<String> zReverseRange(String key, long start, long end) {
-		return redisTemplate.opsForZSet().reverseRange(key, start, end);
-	}
-
-	/**
-	 * 获取集合的元素, 从大到小排序, 并返回score值
-	 *
-	 * @param key
-	 * @param start
-	 * @param end
-	 * @return
-	 */
-	public Set<TypedTuple<String>> zReverseRangeWithScores(String key,
-			long start, long end) {
-		return redisTemplate.opsForZSet().reverseRangeWithScores(key, start,
-				end);
-	}
-
-	/**
-	 * 根据Score值查询集合元素, 从大到小排序
-	 *
-	 * @param key
-	 * @param min
-	 * @param max
-	 * @return
-	 */
-	public Set<String> zReverseRangeByScore(String key, double min,
-			double max) {
-		return redisTemplate.opsForZSet().reverseRangeByScore(key, min, max);
-	}
-
-	/**
-	 * 根据Score值查询集合元素, 从大到小排序
-	 *
-	 * @param key
-	 * @param min
-	 * @param max
-	 * @return
-	 */
-	public Set<TypedTuple<String>> zReverseRangeByScoreWithScores(
-			String key, double min, double max) {
-		return redisTemplate.opsForZSet().reverseRangeByScoreWithScores(key,
-				min, max);
-	}
-
-	/**
-	 *
-	 * @param key
-	 * @param min
-	 * @param max
-	 * @param start
-	 * @param end
-	 * @return
-	 */
-	public Set<String> zReverseRangeByScore(String key, double min,
-			double max, long start, long end) {
-		return redisTemplate.opsForZSet().reverseRangeByScore(key, min, max,
-				start, end);
-	}
-
-	/**
-	 * 根据score值获取集合元素数量
-	 *
-	 * @param key
-	 * @param min
-	 * @param max
-	 * @return
-	 */
-	public Long zCount(String key, double min, double max) {
-		return redisTemplate.opsForZSet().count(key, min, max);
-	}
-
-	/**
-	 * 获取集合大小
-	 *
-	 * @param key
-	 * @return
-	 */
-	public Long zSize(String key) {
-		return redisTemplate.opsForZSet().size(key);
-	}
-
-	/**
-	 * 获取集合大小
-	 *
-	 * @param key
-	 * @return
-	 */
-	public Long zZCard(String key) {
-		return redisTemplate.opsForZSet().zCard(key);
-	}
-
-	/**
-	 * 获取集合中value元素的score值
-	 *
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Double zScore(String key, Object value) {
-		return redisTemplate.opsForZSet().score(key, value);
-	}
-
-	/**
-	 * 移除指定索引位置的成员
-	 *
-	 * @param key
-	 * @param start
-	 * @param end
-	 * @return
-	 */
-	public Long zRemoveRange(String key, long start, long end) {
-		return redisTemplate.opsForZSet().removeRange(key, start, end);
-	}
-
-	/**
-	 * 根据指定的score值的范围来移除成员
-	 *
-	 * @param key
-	 * @param min
-	 * @param max
-	 * @return
-	 */
-	public Long zRemoveRangeByScore(String key, double min, double max) {
-		return redisTemplate.opsForZSet().removeRangeByScore(key, min, max);
-	}
-
-	/**
-	 * 获取key和otherKey的并集并存储在destKey中
-	 *
-	 * @param key
-	 * @param otherKey
-	 * @param destKey
-	 * @return
-	 */
-	public Long zUnionAndStore(String key, String otherKey, String destKey) {
-		return redisTemplate.opsForZSet().unionAndStore(key, otherKey, destKey);
-	}
-
-	/**
-	 *
-	 * @param key
-	 * @param otherKeys
-	 * @param destKey
-	 * @return
-	 */
-	public Long zUnionAndStore(String key, Collection<String> otherKeys,
-			String destKey) {
-		return redisTemplate.opsForZSet()
-				.unionAndStore(key, otherKeys, destKey);
-	}
-
-	/**
-	 * 交集
-	 *
-	 * @param key
-	 * @param otherKey
-	 * @param destKey
-	 * @return
-	 */
-	public Long zIntersectAndStore(String key, String otherKey,
-			String destKey) {
-		return redisTemplate.opsForZSet().intersectAndStore(key, otherKey,
-				destKey);
-	}
-
-	/**
-	 * 交集
-	 *
-	 * @param key
-	 * @param otherKeys
-	 * @param destKey
-	 * @return
-	 */
-	public Long zIntersectAndStore(String key, Collection<String> otherKeys,
-			String destKey) {
-		return redisTemplate.opsForZSet().intersectAndStore(key, otherKeys,
-				destKey);
-	}
-
-	/**
-	 *
-	 * @param key
-	 * @param options
-	 * @return
-	 */
-	public Cursor<TypedTuple<String>> zScan(String key, ScanOptions options) {
-		return redisTemplate.opsForZSet().scan(key, options);
-	}
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+
+
+    /** -------------------key相关操作--------------------- */
+
+    /**
+     * 删除key
+     *
+     * @param key
+     */
+    public void delete(String key) {
+        redisTemplate.delete(key);
+    }
+
+    /**
+     * 批量删除key
+     *
+     * @param keys
+     */
+    public void delete(Collection<String> keys) {
+        redisTemplate.delete(keys);
+    }
+
+    /**
+     * 序列化key
+     *
+     * @param key
+     * @return
+     */
+    public byte[] dump(String key) {
+        return redisTemplate.dump(key);
+    }
+
+    /**
+     * 是否存在key
+     *
+     * @param key
+     * @return
+     */
+    public Boolean hasKey(String key) {
+        return redisTemplate.hasKey(key);
+    }
+
+    /**
+     * 设置过期时间
+     *
+     * @param key
+     * @param timeout
+     * @param unit
+     * @return
+     */
+    public Boolean expire(String key, long timeout, TimeUnit unit) {
+        return redisTemplate.expire(key, timeout, unit);
+    }
+
+    /**
+     * 设置过期时间
+     *
+     * @param key
+     * @param date
+     * @return
+     */
+    public Boolean expireAt(String key, Date date) {
+        return redisTemplate.expireAt(key, date);
+    }
+
+    /**
+     * 查找匹配的key
+     *
+     * @param pattern
+     * @return
+     */
+    public Set<String> keys(String pattern) {
+        return redisTemplate.keys(pattern);
+    }
+
+    /**
+     * 将当前数据库的 key 移动到给定的数据库 db 当中
+     *
+     * @param key
+     * @param dbIndex
+     * @return
+     */
+    public Boolean move(String key, int dbIndex) {
+        return redisTemplate.move(key, dbIndex);
+    }
+
+    /**
+     * 移除 key 的过期时间，key 将持久保持
+     *
+     * @param key
+     * @return
+     */
+    public Boolean persist(String key) {
+        return redisTemplate.persist(key);
+    }
+
+    /**
+     * 返回 key 的剩余的过期时间
+     *
+     * @param key
+     * @param unit
+     * @return
+     */
+    public Long getExpire(String key, TimeUnit unit) {
+        return redisTemplate.getExpire(key, unit);
+    }
+
+    /**
+     * 返回 key 的剩余的过期时间
+     *
+     * @param key
+     * @return
+     */
+    public Long getExpire(String key) {
+        return redisTemplate.getExpire(key);
+    }
+
+    /**
+     * 从当前数据库中随机返回一个 key
+     *
+     * @return
+     */
+    public String randomKey() {
+        return redisTemplate.randomKey();
+    }
+
+    /**
+     * 修改 key 的名称
+     *
+     * @param oldKey
+     * @param newKey
+     */
+    public void rename(String oldKey, String newKey) {
+        redisTemplate.rename(oldKey, newKey);
+    }
+
+    /**
+     * 仅当 newkey 不存在时，将 oldKey 改名为 newkey
+     *
+     * @param oldKey
+     * @param newKey
+     * @return
+     */
+    public Boolean renameIfAbsent(String oldKey, String newKey) {
+        return redisTemplate.renameIfAbsent(oldKey, newKey);
+    }
+
+    /**
+     * 返回 key 所储存的值的类型
+     *
+     * @param key
+     * @return
+     */
+    public DataType type(String key) {
+        return redisTemplate.type(key);
+    }
+
+    /** -------------------string相关操作--------------------- */
+
+    /**
+     * 设置指定 key 的值
+     *
+     * @param key
+     * @param value
+     */
+    public void set(String key, String value) {
+        redisTemplate.opsForValue().set(key, value);
+    }
+
+    /**
+     * 获取指定 key 的值
+     *
+     * @param key
+     * @return
+     */
+    public String get(String key) {
+        return redisTemplate.opsForValue().get(key);
+    }
+
+    /**
+     * 返回 key 中字符串值的子字符
+     *
+     * @param key
+     * @param start
+     * @param end
+     * @return
+     */
+    public String getRange(String key, long start, long end) {
+        return redisTemplate.opsForValue().get(key, start, end);
+    }
+
+    /**
+     * 将给定 key 的值设为 value ，并返回 key 的旧值(old value)
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public String getAndSet(String key, String value) {
+        return redisTemplate.opsForValue().getAndSet(key, value);
+    }
+
+    /**
+     * 对 key 所储存的字符串值，获取指定偏移量上的位(bit)
+     *
+     * @param key
+     * @param offset
+     * @return
+     */
+    public Boolean getBit(String key, long offset) {
+        return redisTemplate.opsForValue().getBit(key, offset);
+    }
+
+    /**
+     * 批量获取
+     *
+     * @param keys
+     * @return
+     */
+    public List<String> multiGet(Collection<String> keys) {
+        return redisTemplate.opsForValue().multiGet(keys);
+    }
+
+    /**
+     * 设置ASCII码, 字符串'a'的ASCII码是97, 转为二进制是'01100001', 此方法是将二进制第offset位值变为value
+     *
+     * @param key
+     * @param postion 位置
+     * @param value   值,true为1, false为0
+     * @return
+     */
+    public boolean setBit(String key, long offset, boolean value) {
+        return redisTemplate.opsForValue().setBit(key, offset, value);
+    }
+
+    /**
+     * 将值 value 关联到 key ，并将 key 的过期时间设为 timeout
+     *
+     * @param key
+     * @param value
+     * @param timeout 过期时间
+     * @param unit    时间单位, 天:TimeUnit.DAYS 小时:TimeUnit.HOURS 分钟:TimeUnit.MINUTES
+     *                秒:TimeUnit.SECONDS 毫秒:TimeUnit.MILLISECONDS
+     */
+    public void setEx(String key, String value, long timeout, TimeUnit unit) {
+        redisTemplate.opsForValue().set(key, value, timeout, unit);
+    }
+
+    /**
+     * 只有在 key 不存在时设置 key 的值
+     *
+     * @param key
+     * @param value
+     * @return 之前已经存在返回false, 不存在返回true
+     */
+    public boolean setIfAbsent(String key, String value) {
+        return redisTemplate.opsForValue().setIfAbsent(key, value);
+    }
+
+    /**
+     * 用 value 参数覆写给定 key 所储存的字符串值，从偏移量 offset 开始
+     *
+     * @param key
+     * @param value
+     * @param offset 从指定位置开始覆写
+     */
+    public void setRange(String key, String value, long offset) {
+        redisTemplate.opsForValue().set(key, value, offset);
+    }
+
+    /**
+     * 获取字符串的长度
+     *
+     * @param key
+     * @return
+     */
+    public Long size(String key) {
+        return redisTemplate.opsForValue().size(key);
+    }
+
+    /**
+     * 批量添加
+     *
+     * @param maps
+     */
+    public void multiSet(Map<String, String> maps) {
+        redisTemplate.opsForValue().multiSet(maps);
+    }
+
+    /**
+     * 同时设置一个或多个 key-value 对，当且仅当所有给定 key 都不存在
+     *
+     * @param maps
+     * @return 之前已经存在返回false, 不存在返回true
+     */
+    public boolean multiSetIfAbsent(Map<String, String> maps) {
+        return redisTemplate.opsForValue().multiSetIfAbsent(maps);
+    }
+
+    /**
+     * 增加(自增长), 负数则为自减
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long incrBy(String key, long increment) {
+        return redisTemplate.opsForValue().increment(key, increment);
+    }
+
+    /**
+     * @param key
+     * @param value
+     * @return
+     */
+    public Double incrByFloat(String key, double increment) {
+        return redisTemplate.opsForValue().increment(key, increment);
+    }
+
+    /**
+     * 追加到末尾
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Integer append(String key, String value) {
+        return redisTemplate.opsForValue().append(key, value);
+    }
+
+    /** -------------------hash相关操作------------------------- */
+
+    /**
+     * 获取存储在哈希表中指定字段的值
+     *
+     * @param key
+     * @param field
+     * @return
+     */
+    public Object hGet(String key, String field) {
+        return redisTemplate.opsForHash().get(key, field);
+    }
+
+    /**
+     * 获取所有给定字段的值
+     *
+     * @param key
+     * @return
+     */
+    public Map<Object, Object> hGetAll(String key) {
+        return redisTemplate.opsForHash().entries(key);
+    }
+
+    /**
+     * 获取所有给定字段的值
+     *
+     * @param key
+     * @param fields
+     * @return
+     */
+    public List<Object> hMultiGet(String key, Collection<Object> fields) {
+        return redisTemplate.opsForHash().multiGet(key, fields);
+    }
+
+    public void hPut(String key, String hashKey, String value) {
+        redisTemplate.opsForHash().put(key, hashKey, value);
+    }
+
+    public void hPutAll(String key, Map<String, String> maps) {
+        redisTemplate.opsForHash().putAll(key, maps);
+    }
+
+    /**
+     * 仅当hashKey不存在时才设置
+     *
+     * @param key
+     * @param hashKey
+     * @param value
+     * @return
+     */
+    public Boolean hPutIfAbsent(String key, String hashKey, String value) {
+        return redisTemplate.opsForHash().putIfAbsent(key, hashKey, value);
+    }
+
+    /**
+     * 删除一个或多个哈希表字段
+     *
+     * @param key
+     * @param fields
+     * @return
+     */
+    public Long hDelete(String key, Object... fields) {
+        return redisTemplate.opsForHash().delete(key, fields);
+    }
+
+    /**
+     * 查看哈希表 key 中，指定的字段是否存在
+     *
+     * @param key
+     * @param field
+     * @return
+     */
+    public boolean hExists(String key, String field) {
+        return redisTemplate.opsForHash().hasKey(key, field);
+    }
+
+    /**
+     * 为哈希表 key 中的指定字段的整数值加上增量 increment
+     *
+     * @param key
+     * @param field
+     * @param increment
+     * @return
+     */
+    public Long hIncrBy(String key, Object field, long increment) {
+        return redisTemplate.opsForHash().increment(key, field, increment);
+    }
+
+    /**
+     * 为哈希表 key 中的指定字段的整数值加上增量 increment
+     *
+     * @param key
+     * @param field
+     * @param delta
+     * @return
+     */
+    public Double hIncrByFloat(String key, Object field, double delta) {
+        return redisTemplate.opsForHash().increment(key, field, delta);
+    }
+
+    /**
+     * 获取所有哈希表中的字段
+     *
+     * @param key
+     * @return
+     */
+    public Set<Object> hKeys(String key) {
+        return redisTemplate.opsForHash().keys(key);
+    }
+
+    /**
+     * 获取哈希表中字段的数量
+     *
+     * @param key
+     * @return
+     */
+    public Long hSize(String key) {
+        return redisTemplate.opsForHash().size(key);
+    }
+
+    /**
+     * 获取哈希表中所有值
+     *
+     * @param key
+     * @return
+     */
+    public List<Object> hValues(String key) {
+        return redisTemplate.opsForHash().values(key);
+    }
+
+    /**
+     * 迭代哈希表中的键值对
+     *
+     * @param key
+     * @param options
+     * @return
+     */
+    public Cursor<Entry<Object, Object>> hScan(String key, ScanOptions options) {
+        return redisTemplate.opsForHash().scan(key, options);
+    }
+
+    /** ------------------------list相关操作---------------------------- */
+
+    /**
+     * 通过索引获取列表中的元素
+     *
+     * @param key
+     * @param index
+     * @return
+     */
+    public String lIndex(String key, long index) {
+        return redisTemplate.opsForList().index(key, index);
+    }
+
+    /**
+     * 获取列表指定范围内的元素
+     *
+     * @param key
+     * @param start 开始位置, 0是开始位置
+     * @param end   结束位置, -1返回所有
+     * @return
+     */
+    public List<String> lRange(String key, long start, long end) {
+        return redisTemplate.opsForList().range(key, start, end);
+    }
+
+    /**
+     * 存储在list头部
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lLeftPush(String key, String value) {
+        return redisTemplate.opsForList().leftPush(key, value);
+    }
+
+    /**
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lLeftPushAll(String key, String... value) {
+        return redisTemplate.opsForList().leftPushAll(key, value);
+    }
+
+    /**
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lLeftPushAll(String key, Collection<String> value) {
+        return redisTemplate.opsForList().leftPushAll(key, value);
+    }
+
+    /**
+     * 当list存在的时候才加入
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lLeftPushIfPresent(String key, String value) {
+        return redisTemplate.opsForList().leftPushIfPresent(key, value);
+    }
+
+    /**
+     * 如果pivot存在,再pivot前面添加
+     *
+     * @param key
+     * @param pivot
+     * @param value
+     * @return
+     */
+    public Long lLeftPush(String key, String pivot, String value) {
+        return redisTemplate.opsForList().leftPush(key, pivot, value);
+    }
+
+    /**
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lRightPush(String key, String value) {
+        return redisTemplate.opsForList().rightPush(key, value);
+    }
+
+    /**
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lRightPushAll(String key, String... value) {
+        return redisTemplate.opsForList().rightPushAll(key, value);
+    }
+
+    /**
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lRightPushAll(String key, Collection<String> value) {
+        return redisTemplate.opsForList().rightPushAll(key, value);
+    }
+
+    /**
+     * 为已存在的列表添加值
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lRightPushIfPresent(String key, String value) {
+        return redisTemplate.opsForList().rightPushIfPresent(key, value);
+    }
+
+    /**
+     * 在pivot元素的右边添加值
+     *
+     * @param key
+     * @param pivot
+     * @param value
+     * @return
+     */
+    public Long lRightPush(String key, String pivot, String value) {
+        return redisTemplate.opsForList().rightPush(key, pivot, value);
+    }
+
+    /**
+     * 通过索引设置列表元素的值
+     *
+     * @param key
+     * @param index 位置
+     * @param value
+     */
+    public void lSet(String key, long index, String value) {
+        redisTemplate.opsForList().set(key, index, value);
+    }
+
+    /**
+     * 移出并获取列表的第一个元素
+     *
+     * @param key
+     * @return 删除的元素
+     */
+    public String lLeftPop(String key) {
+        return redisTemplate.opsForList().leftPop(key);
+    }
+
+    /**
+     * 移出并获取列表的第一个元素， 如果列表没有元素会阻塞列表直到等待超时或发现可弹出元素为止
+     *
+     * @param key
+     * @param timeout 等待时间
+     * @param unit    时间单位
+     * @return
+     */
+    public String lBLeftPop(String key, long timeout, TimeUnit unit) {
+        return redisTemplate.opsForList().leftPop(key, timeout, unit);
+    }
+
+    /**
+     * 移除并获取列表最后一个元素
+     *
+     * @param key
+     * @return 删除的元素
+     */
+    public String lRightPop(String key) {
+        return redisTemplate.opsForList().rightPop(key);
+    }
+
+    /**
+     * 移出并获取列表的最后一个元素， 如果列表没有元素会阻塞列表直到等待超时或发现可弹出元素为止
+     *
+     * @param key
+     * @param timeout 等待时间
+     * @param unit    时间单位
+     * @return
+     */
+    public String lBRightPop(String key, long timeout, TimeUnit unit) {
+        return redisTemplate.opsForList().rightPop(key, timeout, unit);
+    }
+
+    /**
+     * 移除列表的最后一个元素，并将该元素添加到另一个列表并返回
+     *
+     * @param sourceKey
+     * @param destinationKey
+     * @return
+     */
+    public String lRightPopAndLeftPush(String sourceKey, String destinationKey) {
+        return redisTemplate.opsForList().rightPopAndLeftPush(sourceKey,
+                destinationKey);
+    }
+
+    /**
+     * 从列表中弹出一个值，将弹出的元素插入到另外一个列表中并返回它； 如果列表没有元素会阻塞列表直到等待超时或发现可弹出元素为止
+     *
+     * @param sourceKey
+     * @param destinationKey
+     * @param timeout
+     * @param unit
+     * @return
+     */
+    public String lBRightPopAndLeftPush(String sourceKey, String destinationKey,
+                                        long timeout, TimeUnit unit) {
+        return redisTemplate.opsForList().rightPopAndLeftPush(sourceKey,
+                destinationKey, timeout, unit);
+    }
+
+    /**
+     * 删除集合中值等于value得元素
+     *
+     * @param key
+     * @param index index=0, 删除所有值等于value的元素; index>0, 从头部开始删除第一个值等于value的元素;
+     *              index<0, 从尾部开始删除第一个值等于value的元素;
+     * @param value
+     * @return
+     */
+    public Long lRemove(String key, long index, String value) {
+        return redisTemplate.opsForList().remove(key, index, value);
+    }
+
+    /**
+     * 裁剪list
+     *
+     * @param key
+     * @param start
+     * @param end
+     */
+    public void lTrim(String key, long start, long end) {
+        redisTemplate.opsForList().trim(key, start, end);
+    }
+
+    /**
+     * 获取列表长度
+     *
+     * @param key
+     * @return
+     */
+    public Long lLen(String key) {
+        return redisTemplate.opsForList().size(key);
+    }
+
+    /** --------------------set相关操作-------------------------- */
+
+    /**
+     * set添加元素
+     *
+     * @param key
+     * @param values
+     * @return
+     */
+    public Long sAdd(String key, String... values) {
+        return redisTemplate.opsForSet().add(key, values);
+    }
+
+    /**
+     * set移除元素
+     *
+     * @param key
+     * @param values
+     * @return
+     */
+    public Long sRemove(String key, Object... values) {
+        return redisTemplate.opsForSet().remove(key, values);
+    }
+
+    /**
+     * 移除并返回集合的一个随机元素
+     *
+     * @param key
+     * @return
+     */
+    public String sPop(String key) {
+        return redisTemplate.opsForSet().pop(key);
+    }
+
+    /**
+     * 将元素value从一个集合移到另一个集合
+     *
+     * @param key
+     * @param value
+     * @param destKey
+     * @return
+     */
+    public Boolean sMove(String key, String value, String destKey) {
+        return redisTemplate.opsForSet().move(key, value, destKey);
+    }
+
+    /**
+     * 获取集合的大小
+     *
+     * @param key
+     * @return
+     */
+    public Long sSize(String key) {
+        return redisTemplate.opsForSet().size(key);
+    }
+
+    /**
+     * 判断集合是否包含value
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Boolean sIsMember(String key, Object value) {
+        return redisTemplate.opsForSet().isMember(key, value);
+    }
+
+    /**
+     * 获取两个集合的交集
+     *
+     * @param key
+     * @param otherKey
+     * @return
+     */
+    public Set<String> sIntersect(String key, String otherKey) {
+        return redisTemplate.opsForSet().intersect(key, otherKey);
+    }
+
+    /**
+     * 获取key集合与多个集合的交集
+     *
+     * @param key
+     * @param otherKeys
+     * @return
+     */
+    public Set<String> sIntersect(String key, Collection<String> otherKeys) {
+        return redisTemplate.opsForSet().intersect(key, otherKeys);
+    }
+
+    /**
+     * key集合与otherKey集合的交集存储到destKey集合中
+     *
+     * @param key
+     * @param otherKey
+     * @param destKey
+     * @return
+     */
+    public Long sIntersectAndStore(String key, String otherKey, String destKey) {
+        return redisTemplate.opsForSet().intersectAndStore(key, otherKey,
+                destKey);
+    }
+
+    /**
+     * key集合与多个集合的交集存储到destKey集合中
+     *
+     * @param key
+     * @param otherKeys
+     * @param destKey
+     * @return
+     */
+    public Long sIntersectAndStore(String key, Collection<String> otherKeys,
+                                   String destKey) {
+        return redisTemplate.opsForSet().intersectAndStore(key, otherKeys,
+                destKey);
+    }
+
+    /**
+     * 获取两个集合的并集
+     *
+     * @param key
+     * @param otherKeys
+     * @return
+     */
+    public Set<String> sUnion(String key, String otherKeys) {
+        return redisTemplate.opsForSet().union(key, otherKeys);
+    }
+
+    /**
+     * 获取key集合与多个集合的并集
+     *
+     * @param key
+     * @param otherKeys
+     * @return
+     */
+    public Set<String> sUnion(String key, Collection<String> otherKeys) {
+        return redisTemplate.opsForSet().union(key, otherKeys);
+    }
+
+    /**
+     * key集合与otherKey集合的并集存储到destKey中
+     *
+     * @param key
+     * @param otherKey
+     * @param destKey
+     * @return
+     */
+    public Long sUnionAndStore(String key, String otherKey, String destKey) {
+        return redisTemplate.opsForSet().unionAndStore(key, otherKey, destKey);
+    }
+
+    /**
+     * key集合与多个集合的并集存储到destKey中
+     *
+     * @param key
+     * @param otherKeys
+     * @param destKey
+     * @return
+     */
+    public Long sUnionAndStore(String key, Collection<String> otherKeys,
+                               String destKey) {
+        return redisTemplate.opsForSet().unionAndStore(key, otherKeys, destKey);
+    }
+
+    /**
+     * 获取两个集合的差集
+     *
+     * @param key
+     * @param otherKey
+     * @return
+     */
+    public Set<String> sDifference(String key, String otherKey) {
+        return redisTemplate.opsForSet().difference(key, otherKey);
+    }
+
+    /**
+     * 获取key集合与多个集合的差集
+     *
+     * @param key
+     * @param otherKeys
+     * @return
+     */
+    public Set<String> sDifference(String key, Collection<String> otherKeys) {
+        return redisTemplate.opsForSet().difference(key, otherKeys);
+    }
+
+    /**
+     * key集合与otherKey集合的差集存储到destKey中
+     *
+     * @param key
+     * @param otherKey
+     * @param destKey
+     * @return
+     */
+    public Long sDifference(String key, String otherKey, String destKey) {
+        return redisTemplate.opsForSet().differenceAndStore(key, otherKey,
+                destKey);
+    }
+
+    /**
+     * key集合与多个集合的差集存储到destKey中
+     *
+     * @param key
+     * @param otherKeys
+     * @param destKey
+     * @return
+     */
+    public Long sDifference(String key, Collection<String> otherKeys,
+                            String destKey) {
+        return redisTemplate.opsForSet().differenceAndStore(key, otherKeys,
+                destKey);
+    }
+
+    /**
+     * 获取集合所有元素
+     *
+     * @param key
+     * @param otherKeys
+     * @param destKey
+     * @return
+     */
+    public Set<String> setMembers(String key) {
+        return redisTemplate.opsForSet().members(key);
+    }
+
+    /**
+     * 随机获取集合中的一个元素
+     *
+     * @param key
+     * @return
+     */
+    public String sRandomMember(String key) {
+        return redisTemplate.opsForSet().randomMember(key);
+    }
+
+    /**
+     * 随机获取集合中count个元素
+     *
+     * @param key
+     * @param count
+     * @return
+     */
+    public List<String> sRandomMembers(String key, long count) {
+        return redisTemplate.opsForSet().randomMembers(key, count);
+    }
+
+    /**
+     * 随机获取集合中count个元素并且去除重复的
+     *
+     * @param key
+     * @param count
+     * @return
+     */
+    public Set<String> sDistinctRandomMembers(String key, long count) {
+        return redisTemplate.opsForSet().distinctRandomMembers(key, count);
+    }
+
+    /**
+     * @param key
+     * @param options
+     * @return
+     */
+    public Cursor<String> sScan(String key, ScanOptions options) {
+        return redisTemplate.opsForSet().scan(key, options);
+    }
+
+    /**------------------zSet相关操作--------------------------------*/
+
+    /**
+     * 添加元素,有序集合是按照元素的score值由小到大排列
+     *
+     * @param key
+     * @param value
+     * @param score
+     * @return
+     */
+    public Boolean zAdd(String key, String value, double score) {
+        return redisTemplate.opsForZSet().add(key, value, score);
+    }
+
+    /**
+     * @param key
+     * @param values
+     * @return
+     */
+    public Long zAdd(String key, Set<TypedTuple<String>> values) {
+        return redisTemplate.opsForZSet().add(key, values);
+    }
+
+    /**
+     * @param key
+     * @param values
+     * @return
+     */
+    public Long zRemove(String key, Object... values) {
+        return redisTemplate.opsForZSet().remove(key, values);
+    }
+
+    /**
+     * 增加元素的score值，并返回增加后的值
+     *
+     * @param key
+     * @param value
+     * @param delta
+     * @return
+     */
+    public Double zIncrementScore(String key, String value, double delta) {
+        return redisTemplate.opsForZSet().incrementScore(key, value, delta);
+    }
+
+    /**
+     * 返回元素在集合的排名,有序集合是按照元素的score值由小到大排列
+     *
+     * @param key
+     * @param value
+     * @return 0表示第一位
+     */
+    public Long zRank(String key, Object value) {
+        return redisTemplate.opsForZSet().rank(key, value);
+    }
+
+    /**
+     * 返回元素在集合的排名,按元素的score值由大到小排列
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long zReverseRank(String key, Object value) {
+        return redisTemplate.opsForZSet().reverseRank(key, value);
+    }
+
+    /**
+     * 获取集合的元素, 从小到大排序
+     *
+     * @param key
+     * @param start 开始位置
+     * @param end   结束位置, -1查询所有
+     * @return
+     */
+    public Set<String> zRange(String key, long start, long end) {
+        return redisTemplate.opsForZSet().range(key, start, end);
+    }
+
+    /**
+     * 获取集合元素, 并且把score值也获取
+     *
+     * @param key
+     * @param start
+     * @param end
+     * @return
+     */
+    public Set<TypedTuple<String>> zRangeWithScores(String key, long start,
+                                                    long end) {
+        return redisTemplate.opsForZSet().rangeWithScores(key, start, end);
+    }
+
+    /**
+     * 根据Score值查询集合元素
+     *
+     * @param key
+     * @param min 最小值
+     * @param max 最大值
+     * @return
+     */
+    public Set<String> zRangeByScore(String key, double min, double max) {
+        return redisTemplate.opsForZSet().rangeByScore(key, min, max);
+    }
+
+    /**
+     * 根据Score值查询集合元素, 从小到大排序
+     *
+     * @param key
+     * @param min 最小值
+     * @param max 最大值
+     * @return
+     */
+    public Set<TypedTuple<String>> zRangeByScoreWithScores(String key,
+                                                           double min, double max) {
+        return redisTemplate.opsForZSet().rangeByScoreWithScores(key, min, max);
+    }
+
+    /**
+     * @param key
+     * @param min
+     * @param max
+     * @param start
+     * @param end
+     * @return
+     */
+    public Set<TypedTuple<String>> zRangeByScoreWithScores(String key,
+                                                           double min, double max, long start, long end) {
+        return redisTemplate.opsForZSet().rangeByScoreWithScores(key, min, max,
+                start, end);
+    }
+
+    /**
+     * 获取集合的元素, 从大到小排序
+     *
+     * @param key
+     * @param start
+     * @param end
+     * @return
+     */
+    public Set<String> zReverseRange(String key, long start, long end) {
+        return redisTemplate.opsForZSet().reverseRange(key, start, end);
+    }
+
+    /**
+     * 获取集合的元素, 从大到小排序, 并返回score值
+     *
+     * @param key
+     * @param start
+     * @param end
+     * @return
+     */
+    public Set<TypedTuple<String>> zReverseRangeWithScores(String key,
+                                                           long start, long end) {
+        return redisTemplate.opsForZSet().reverseRangeWithScores(key, start,
+                end);
+    }
+
+    /**
+     * 根据Score值查询集合元素, 从大到小排序
+     *
+     * @param key
+     * @param min
+     * @param max
+     * @return
+     */
+    public Set<String> zReverseRangeByScore(String key, double min,
+                                            double max) {
+        return redisTemplate.opsForZSet().reverseRangeByScore(key, min, max);
+    }
+
+    /**
+     * 根据Score值查询集合元素, 从大到小排序
+     *
+     * @param key
+     * @param min
+     * @param max
+     * @return
+     */
+    public Set<TypedTuple<String>> zReverseRangeByScoreWithScores(
+            String key, double min, double max) {
+        return redisTemplate.opsForZSet().reverseRangeByScoreWithScores(key,
+                min, max);
+    }
+
+    /**
+     * @param key
+     * @param min
+     * @param max
+     * @param start
+     * @param end
+     * @return
+     */
+    public Set<String> zReverseRangeByScore(String key, double min,
+                                            double max, long start, long end) {
+        return redisTemplate.opsForZSet().reverseRangeByScore(key, min, max,
+                start, end);
+    }
+
+    /**
+     * 根据score值获取集合元素数量
+     *
+     * @param key
+     * @param min
+     * @param max
+     * @return
+     */
+    public Long zCount(String key, double min, double max) {
+        return redisTemplate.opsForZSet().count(key, min, max);
+    }
+
+    /**
+     * 获取集合大小
+     *
+     * @param key
+     * @return
+     */
+    public Long zSize(String key) {
+        return redisTemplate.opsForZSet().size(key);
+    }
+
+    /**
+     * 获取集合大小
+     *
+     * @param key
+     * @return
+     */
+    public Long zZCard(String key) {
+        return redisTemplate.opsForZSet().zCard(key);
+    }
+
+    /**
+     * 获取集合中value元素的score值
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Double zScore(String key, Object value) {
+        return redisTemplate.opsForZSet().score(key, value);
+    }
+
+    /**
+     * 移除指定索引位置的成员
+     *
+     * @param key
+     * @param start
+     * @param end
+     * @return
+     */
+    public Long zRemoveRange(String key, long start, long end) {
+        return redisTemplate.opsForZSet().removeRange(key, start, end);
+    }
+
+    /**
+     * 根据指定的score值的范围来移除成员
+     *
+     * @param key
+     * @param min
+     * @param max
+     * @return
+     */
+    public Long zRemoveRangeByScore(String key, double min, double max) {
+        return redisTemplate.opsForZSet().removeRangeByScore(key, min, max);
+    }
+
+    /**
+     * 获取key和otherKey的并集并存储在destKey中
+     *
+     * @param key
+     * @param otherKey
+     * @param destKey
+     * @return
+     */
+    public Long zUnionAndStore(String key, String otherKey, String destKey) {
+        return redisTemplate.opsForZSet().unionAndStore(key, otherKey, destKey);
+    }
+
+    /**
+     * @param key
+     * @param otherKeys
+     * @param destKey
+     * @return
+     */
+    public Long zUnionAndStore(String key, Collection<String> otherKeys,
+                               String destKey) {
+        return redisTemplate.opsForZSet()
+                .unionAndStore(key, otherKeys, destKey);
+    }
+
+    /**
+     * 交集
+     *
+     * @param key
+     * @param otherKey
+     * @param destKey
+     * @return
+     */
+    public Long zIntersectAndStore(String key, String otherKey,
+                                   String destKey) {
+        return redisTemplate.opsForZSet().intersectAndStore(key, otherKey,
+                destKey);
+    }
+
+    /**
+     * 交集
+     *
+     * @param key
+     * @param otherKeys
+     * @param destKey
+     * @return
+     */
+    public Long zIntersectAndStore(String key, Collection<String> otherKeys,
+                                   String destKey) {
+        return redisTemplate.opsForZSet().intersectAndStore(key, otherKeys,
+                destKey);
+    }
+
+    /**
+     * @param key
+     * @param options
+     * @return
+     */
+    public Cursor<TypedTuple<String>> zScan(String key, ScanOptions options) {
+        return redisTemplate.opsForZSet().scan(key, options);
+    }
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysAdminLogServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysAdminLogServiceImpl.java
index 4cf7f132ec8673c6ee4ab1c517a710b288bf6822..6fef4eb90a3cecb988be8ebdaba47f2e547620ab 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysAdminLogServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysAdminLogServiceImpl.java
@@ -24,6 +24,7 @@ public class SysAdminLogServiceImpl extends ServiceImpl<SysAdminLogMapper, SysAd
 
     @Resource
     private SysAdminLogMapper logMapper;
+
     @Override
     public List<LogStatisc> selectPageExt(LogParam entity) {
         return logMapper.getLogStatisc(entity);
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysAlipayConfigServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysAlipayConfigServiceImpl.java
index 7274fb62c306d133b004f6fd2c4648f312e0600a..bb4fa9a0bbd18a6d570ad5733f36f2ffb806c50e 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysAlipayConfigServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysAlipayConfigServiceImpl.java
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
@@ -26,7 +26,7 @@ public class SysAlipayConfigServiceImpl extends ServiceImpl<SysAlipayConfigMappe
     @Override
     public String toPayAsPC(SysAlipayConfig alipay, TradeVo trade) throws Exception {
 
-        if(alipay.getId() == null){
+        if (alipay.getId() == null) {
             throw new BusinessMallException("请先添加相应配置，再操作");
         }
         AlipayClient alipayClient = new DefaultAlipayClient(alipay.getGatewayUrl(), alipay.getAppId(), alipay.getPrivateKey(), alipay.getFormat(), alipay.getCharset(), alipay.getPublicKey(), alipay.getSignType());
@@ -41,14 +41,14 @@ public class SysAlipayConfigServiceImpl extends ServiceImpl<SysAlipayConfigMappe
         request.setNotifyUrl(alipay.getNotifyUrl());
         // 填充订单参数
         request.setBizContent("{" +
-                "    \"out_trade_no\":\""+trade.getOutTradeNo()+"\"," +
+                "    \"out_trade_no\":\"" + trade.getOutTradeNo() + "\"," +
                 "    \"product_code\":\"FAST_INSTANT_TRADE_PAY\"," +
-                "    \"total_amount\":"+trade.getTotalAmount()+"," +
-                "    \"subject\":\""+trade.getSubject()+"\"," +
-                "    \"body\":\""+trade.getBody()+"\"," +
+                "    \"total_amount\":" + trade.getTotalAmount() + "," +
+                "    \"subject\":\"" + trade.getSubject() + "\"," +
+                "    \"body\":\"" + trade.getBody() + "\"," +
                 "    \"extend_params\":{" +
-                "    \"sys_service_provider_id\":\""+alipay.getSysServiceProviderId()+"\"" +
-                "    }"+
+                "    \"sys_service_provider_id\":\"" + alipay.getSysServiceProviderId() + "\"" +
+                "    }" +
                 "  }");//填充业务参数
         // 调用SDK生成表单, 通过GET方式，口可以获取url
         return alipayClient.pageExecute(request, "GET").getBody();
@@ -57,13 +57,13 @@ public class SysAlipayConfigServiceImpl extends ServiceImpl<SysAlipayConfigMappe
 
     @Override
     public String toPayAsWeb(SysAlipayConfig alipay, TradeVo trade) throws Exception {
-        if(alipay.getId() == null){
+        if (alipay.getId() == null) {
             throw new BusinessMallException("请先添加相应配置，再操作");
         }
         AlipayClient alipayClient = new DefaultAlipayClient(alipay.getGatewayUrl(), alipay.getAppId(), alipay.getPrivateKey(), alipay.getFormat(), alipay.getCharset(), alipay.getPublicKey(), alipay.getSignType());
 
         double money = Double.parseDouble(trade.getTotalAmount());
-        if(money <= 0 || money >= 5000){
+        if (money <= 0 || money >= 5000) {
             throw new BusinessMallException("测试金额过大");
         }
         // 创建API对应的request(手机网页版)
@@ -71,14 +71,14 @@ public class SysAlipayConfigServiceImpl extends ServiceImpl<SysAlipayConfigMappe
         request.setReturnUrl(alipay.getReturnUrl());
         request.setNotifyUrl(alipay.getNotifyUrl());
         request.setBizContent("{" +
-                "    \"out_trade_no\":\""+trade.getOutTradeNo()+"\"," +
+                "    \"out_trade_no\":\"" + trade.getOutTradeNo() + "\"," +
                 "    \"product_code\":\"FAST_INSTANT_TRADE_PAY\"," +
-                "    \"total_amount\":"+trade.getTotalAmount()+"," +
-                "    \"subject\":\""+trade.getSubject()+"\"," +
-                "    \"body\":\""+trade.getBody()+"\"," +
+                "    \"total_amount\":" + trade.getTotalAmount() + "," +
+                "    \"subject\":\"" + trade.getSubject() + "\"," +
+                "    \"body\":\"" + trade.getBody() + "\"," +
                 "    \"extend_params\":{" +
-                "    \"sys_service_provider_id\":\""+alipay.getSysServiceProviderId()+"\"" +
-                "    }"+
+                "    \"sys_service_provider_id\":\"" + alipay.getSysServiceProviderId() + "\"" +
+                "    }" +
                 "  }");//填充业务参数
         return alipayClient.pageExecute(request, "GET").getBody();
     }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysDictServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysDictServiceImpl.java
index a3b09c870c6bd122881bd27b148814cd3c9bebbd..ed29a0717786b118fc7373038a840b57c4bdef6e 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysDictServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysDictServiceImpl.java
@@ -7,8 +7,6 @@ import com.zscat.mallplus.sys.service.ISysDictService;
 import org.springframework.stereotype.Service;
 
 
-
-
 /**
  * <p>
  * 系统配置信息表 服务实现类
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysEmailConfigServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysEmailConfigServiceImpl.java
index 3d6142b93a637ea3832ce7e1bf08bc0f181ff359..b92a879b63629d96c9a2249cfc9dc0aeeb404e43 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysEmailConfigServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysEmailConfigServiceImpl.java
@@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
@@ -25,8 +25,8 @@ public class SysEmailConfigServiceImpl extends ServiceImpl<SysEmailConfigMapper,
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void send(EmailVo emailVo, SysEmailConfig emailConfig){
-        if(emailConfig == null){
+    public void send(EmailVo emailVo, SysEmailConfig emailConfig) {
+        if (emailConfig == null) {
             throw new BusinessMallException("请先配置，再操作");
         }
         // 封装
@@ -40,7 +40,7 @@ public class SysEmailConfigServiceImpl extends ServiceImpl<SysEmailConfigMapper,
         } catch (Exception e) {
             throw new BusinessMallException(e.getMessage());
         }
-        account.setFrom(emailConfig.getUser()+"<"+emailConfig.getFromUser()+">");
+        account.setFrom(emailConfig.getUser() + "<" + emailConfig.getFromUser() + ">");
         // ssl方式发送
         account.setSslEnable(true);
         String content = emailVo.getContent();
@@ -55,7 +55,7 @@ public class SysEmailConfigServiceImpl extends ServiceImpl<SysEmailConfigMapper,
                     //关闭session
                     .setUseGlobalSession(false)
                     .send();
-        }catch (Exception e){
+        } catch (Exception e) {
             throw new BusinessMallException(e.getMessage());
         }
     }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysPermissionServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysPermissionServiceImpl.java
index 47c2209f47992eec2ef63a09aa4c612bfa1628c4..4857e40d1ba833372eb421ab753d16924a196d8e 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysPermissionServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysPermissionServiceImpl.java
@@ -12,6 +12,7 @@ import com.zscat.mallplus.sys.service.ISysUserService;
 import com.zscat.mallplus.ums.service.RedisService;
 import com.zscat.mallplus.util.BuildTree;
 import com.zscat.mallplus.util.JsonUtil;
+import com.zscat.mallplus.utils.ValidatorUtils;
 import com.zscat.mallplus.vo.Rediskey;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -48,7 +49,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
         List<SysPermission> menuDOs;
         if (!redisService.exists(String.format(Rediskey.allTreesList, "admin"))) {
             List<Long> types = Lists.newArrayList(1L, 0L);
-            menuDOs = permissionMapper.selectList(new QueryWrapper<SysPermission>().eq("status",1).in("type", types).orderByAsc("sort"));
+            menuDOs = permissionMapper.selectList(new QueryWrapper<SysPermission>().eq("status", 1).in("type", types).orderByAsc("sort"));
             redisService.set(String.format(Rediskey.allTreesList, "admin"), JsonUtil.objectToJson(menuDOs));
         } else {
             menuDOs = JsonUtil.jsonToList(redisService.get(String.format(Rediskey.allTreesList, "admin")), SysPermission.class);
@@ -57,7 +58,10 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
             for (SysPermission sysMenuDO : menuDOs) {
                 Tree<SysPermission> tree = new Tree<SysPermission>();
                 tree.setId(sysMenuDO.getId().toString());
-                tree.setParentId(sysMenuDO.getPid().toString());
+                if (ValidatorUtils.notEmpty(sysMenuDO.getPid())){
+                    tree.setParentId(sysMenuDO.getPid().toString());
+                }
+
                 tree.setTitle(sysMenuDO.getName());
                 Map<String, Object> attributes = new HashMap<>(16);
                 attributes.put("url", sysMenuDO.getUri());
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysQiniuConfigServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysQiniuConfigServiceImpl.java
index f84a88d91cdbf556a3ef97862e4e2aac250c7d5f..91acff9ee8f0abafc6fe01609dc9a6fd0e71715a 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysQiniuConfigServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysQiniuConfigServiceImpl.java
@@ -35,7 +35,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
@@ -52,7 +52,7 @@ public class SysQiniuConfigServiceImpl extends ServiceImpl<SysQiniuConfigMapper,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int update(SysQiniuConfig qiniuConfig) {
-        if (!(qiniuConfig.getHost().toLowerCase().startsWith("http://")||qiniuConfig.getHost().toLowerCase().startsWith("https://"))) {
+        if (!(qiniuConfig.getHost().toLowerCase().startsWith("http://") || qiniuConfig.getHost().toLowerCase().startsWith("https://"))) {
             throw new BusinessMallException("外链域名必须以http://或者https://开头");
         }
         qiniuConfig.setId(1L);
@@ -63,7 +63,7 @@ public class SysQiniuConfigServiceImpl extends ServiceImpl<SysQiniuConfigMapper,
     @Transactional(rollbackFor = Exception.class)
     public SysQiniuContent upload(MultipartFile file, SysQiniuConfig qiniuConfig) {
         FileUtil.checkSize(maxSize, file.getSize());
-        if(qiniuConfig.getId() == null){
+        if (qiniuConfig.getId() == null) {
             throw new BusinessMallException("请先添加相应配置，再操作");
         }
         // 构造一个带指定Zone对象的配置类
@@ -73,7 +73,7 @@ public class SysQiniuConfigServiceImpl extends ServiceImpl<SysQiniuConfigMapper,
         String upToken = auth.uploadToken(qiniuConfig.getBucket());
         try {
             String key = file.getOriginalFilename();
-            if(qiniuContentMapper.selectOne(new QueryWrapper<SysQiniuContent>().eq("name",key)) != null) {
+            if (qiniuContentMapper.selectOne(new QueryWrapper<SysQiniuContent>().eq("name", key)) != null) {
                 key = QiNiuUtil.getKey(key);
             }
             Response response = uploadManager.put(file.getBytes(), key, upToken);
@@ -86,9 +86,9 @@ public class SysQiniuConfigServiceImpl extends ServiceImpl<SysQiniuConfigMapper,
             qiniuContent.setBucket(qiniuConfig.getBucket());
             qiniuContent.setType(qiniuConfig.getType());
             qiniuContent.setName(FileUtil.getFileNameNoEx(putRet.key));
-            qiniuContent.setUrl(qiniuConfig.getHost()+"/"+putRet.key);
-            qiniuContent.setSize(FileUtil.getSize(Integer.parseInt(file.getSize()+"")));
-             qiniuContentMapper.insert(qiniuContent);
+            qiniuContent.setUrl(qiniuConfig.getHost() + "/" + putRet.key);
+            qiniuContent.setSize(FileUtil.getSize(Integer.parseInt(file.getSize() + "")));
+            qiniuContentMapper.insert(qiniuContent);
             return qiniuContent;
         } catch (Exception e) {
             throw new BusinessMallException(e.getMessage());
@@ -102,11 +102,11 @@ public class SysQiniuConfigServiceImpl extends ServiceImpl<SysQiniuConfigMapper,
     }
 
     @Override
-    public String download(SysQiniuContent content,SysQiniuConfig config){
+    public String download(SysQiniuContent content, SysQiniuConfig config) {
         String finalUrl;
         String TYPE = "公开";
-        if(TYPE.equals(content.getType())){
-            finalUrl  = content.getUrl();
+        if (TYPE.equals(content.getType())) {
+            finalUrl = content.getUrl();
         } else {
             Auth auth = Auth.create(config.getAccessKey(), config.getSecretKey());
             // 1小时，可以自定义链接过期时间
@@ -134,7 +134,7 @@ public class SysQiniuConfigServiceImpl extends ServiceImpl<SysQiniuConfigMapper,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void synchronize(SysQiniuConfig config) {
-        if(config.getId() == null){
+        if (config.getId() == null) {
             throw new BusinessMallException("请先添加相应配置，再操作");
         }
         //构造一个带指定Zone对象的配置类
@@ -154,14 +154,14 @@ public class SysQiniuConfigServiceImpl extends ServiceImpl<SysQiniuConfigMapper,
             SysQiniuContent qiniuContent;
             FileInfo[] items = fileListIterator.next();
             for (FileInfo item : items) {
-                if(qiniuContentMapper.selectOne(new QueryWrapper<SysQiniuContent>().eq("name",FileUtil.getFileNameNoEx(item.key))) == null){
+                if (qiniuContentMapper.selectOne(new QueryWrapper<SysQiniuContent>().eq("name", FileUtil.getFileNameNoEx(item.key))) == null) {
                     qiniuContent = new SysQiniuContent();
-                    qiniuContent.setSize(FileUtil.getSize(Integer.parseInt(item.fsize+"")));
+                    qiniuContent.setSize(FileUtil.getSize(Integer.parseInt(item.fsize + "")));
                     qiniuContent.setSuffix(FileUtil.getExtensionName(item.key));
                     qiniuContent.setName(FileUtil.getFileNameNoEx(item.key));
                     qiniuContent.setType(config.getType());
                     qiniuContent.setBucket(config.getBucket());
-                    qiniuContent.setUrl(config.getHost()+"/"+item.key);
+                    qiniuContent.setUrl(config.getHost() + "/" + item.key);
                     qiniuContentMapper.insert(qiniuContent);
                 }
             }
@@ -176,12 +176,11 @@ public class SysQiniuConfigServiceImpl extends ServiceImpl<SysQiniuConfigMapper,
     }
 
 
-
     @Override
     public void downloadList(List<SysQiniuContent> queryAll, HttpServletResponse response) throws IOException {
         List<Map<String, Object>> list = new ArrayList<>();
         for (SysQiniuContent content : queryAll) {
-            Map<String,Object> map = new LinkedHashMap<>();
+            Map<String, Object> map = new LinkedHashMap<>();
             map.put("文件名", content.getName());
             map.put("文件类型", content.getSuffix());
             map.put("空间名称", content.getBucket());
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysQiniuContentServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysQiniuContentServiceImpl.java
index c8d60e9f730652c4eee971e6410fc28e21df0088..9c4fe4dabcd9ca23abf8d9b9457a62b98f2942a7 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysQiniuContentServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysQiniuContentServiceImpl.java
@@ -1,14 +1,14 @@
 package com.zscat.mallplus.sys.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.sys.entity.SysQiniuContent;
 import com.zscat.mallplus.sys.mapper.SysQiniuContentMapper;
 import com.zscat.mallplus.sys.service.ISysQiniuContentService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysStoreServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysStoreServiceImpl.java
index 913cbc6ea6f918d2d9dcb4c242144c24535cc76c..6d0bd8b3c363bf562ed5eaab9441e897135ab18f 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysStoreServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysStoreServiceImpl.java
@@ -2,6 +2,7 @@ package com.zscat.mallplus.sys.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zscat.mallplus.ApiContext;
 import com.zscat.mallplus.bill.entity.BakBrand;
 import com.zscat.mallplus.bill.entity.BakCategory;
 import com.zscat.mallplus.bill.entity.BakGoods;
@@ -22,7 +23,6 @@ import com.zscat.mallplus.sys.mapper.SysStoreMapper;
 import com.zscat.mallplus.sys.mapper.SysUserMapper;
 import com.zscat.mallplus.sys.service.ISysStoreService;
 import com.zscat.mallplus.utils.ValidatorUtils;
-import com.zscat.mallplus.ApiContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -69,6 +69,7 @@ public class SysStoreServiceImpl extends ServiceImpl<SysStoreMapper, SysStore> i
     private PmsProductAttributeCategoryMapper pmsProductAttributeCategoryMapper;
     @Resource
     private PmsBrandMapper pmsBrandMapper;
+
     @Transactional
     @Override
     public boolean saveStore(SysStore entity) {
@@ -78,7 +79,7 @@ public class SysStoreServiceImpl extends ServiceImpl<SysStoreMapper, SysStore> i
         SysUser user = new SysUser();
         user.setUsername(entity.getName());
         SysUser umsAdminList = userMapper.selectByUserName(entity.getName());
-        if (umsAdminList!=null) {
+        if (umsAdminList != null) {
             return false;
         }
         user.setStatus(1);
@@ -89,70 +90,71 @@ public class SysStoreServiceImpl extends ServiceImpl<SysStoreMapper, SysStore> i
         user.setNickName(entity.getName());
         //user.setStoreId(entity.getId());
         user.setEmail(entity.getSupportPhone());
-     //   apiContext.setCurrentProviderId(entity.getId());
+           apiContext.setCurrentProviderId(entity.getId());
         //
-        if (entity.getType()!=null){
+        if (entity.getType() != null) {
             CompletableFuture.runAsync(() -> {
 
-            BakCategory category =  bakCategoryMapper.selectById(entity.getType());
-            PmsProductCategory pmsProductCategory = new PmsProductCategory();
-            pmsProductCategory.setIcon(category.getIconUrl());
-            pmsProductCategory.setName(category.getName());
-            pmsProductCategory.setKeywords(category.getKeywords());
-            pmsProductCategory.setParentId(category.getPid().longValue());
-            pmsProductCategory.setLevel(Integer.parseInt(category.getLevel().substring(1)));
-            pmsProductCategoryMapper.insert(pmsProductCategory);
-
-
-            PmsProductAttributeCategory pmsProductAttributeCategory = new PmsProductAttributeCategory();
-            pmsProductAttributeCategory.setPic(category.getIconUrl());
-            pmsProductAttributeCategory.setName(category.getName());
-
-            pmsProductAttributeCategoryMapper.insert(pmsProductAttributeCategory);
-
-            List<BakCategory> categoryList = bakCategoryMapper.selectList(new QueryWrapper<BakCategory>().eq("pid",entity.getType()));
-            for (BakCategory bakCategory :categoryList){
-
-                PmsProductCategory pmsProductCategory1 = new PmsProductCategory();
-                pmsProductCategory1.setIcon(bakCategory.getIconUrl());
-                pmsProductCategory1.setName(bakCategory.getName());
-                pmsProductCategory1.setKeywords(bakCategory.getKeywords());
-                pmsProductCategory1.setParentId(bakCategory.getPid().longValue());
-                pmsProductCategory1.setLevel(Integer.parseInt(bakCategory.getLevel().substring(1)));
-                pmsProductCategoryMapper.insert(pmsProductCategory1);
-            }
-            List<Integer> ids = categoryList.stream()
-                    .map(BakCategory::getId)
-                    .collect(Collectors.toList());
-            if (ids!=null){
-              List<BakGoods> goodsList =  bakGoodsMapper.selectList(new QueryWrapper<BakGoods>().in("category_id",ids));
-                for (BakGoods gg : goodsList){
-                    createG(gg,entity.getId());
+                BakCategory category = bakCategoryMapper.selectById(entity.getType());
+                PmsProductCategory pmsProductCategory = new PmsProductCategory();
+                pmsProductCategory.setIcon(category.getIconUrl());
+                pmsProductCategory.setName(category.getName());
+                pmsProductCategory.setKeywords(category.getKeywords());
+                pmsProductCategory.setParentId(category.getPid().longValue());
+                pmsProductCategory.setLevel(Integer.parseInt(category.getLevel().substring(1)));
+                pmsProductCategoryMapper.insert(pmsProductCategory);
+
+
+                PmsProductAttributeCategory pmsProductAttributeCategory = new PmsProductAttributeCategory();
+                pmsProductAttributeCategory.setPic(category.getIconUrl());
+                pmsProductAttributeCategory.setName(category.getName());
+
+                pmsProductAttributeCategoryMapper.insert(pmsProductAttributeCategory);
+
+                List<BakCategory> categoryList = bakCategoryMapper.selectList(new QueryWrapper<BakCategory>().eq("pid", entity.getType()));
+                for (BakCategory bakCategory : categoryList) {
+
+                    PmsProductCategory pmsProductCategory1 = new PmsProductCategory();
+                    pmsProductCategory1.setIcon(bakCategory.getIconUrl());
+                    pmsProductCategory1.setName(bakCategory.getName());
+                    pmsProductCategory1.setKeywords(bakCategory.getKeywords());
+                    pmsProductCategory1.setParentId(bakCategory.getPid().longValue());
+                    pmsProductCategory1.setLevel(Integer.parseInt(bakCategory.getLevel().substring(1)));
+                    pmsProductCategoryMapper.insert(pmsProductCategory1);
                 }
-                List<Integer> brands = goodsList.stream()
-                        .map(BakGoods::getBrandId)
+                List<Integer> ids = categoryList.stream()
+                        .map(BakCategory::getId)
                         .collect(Collectors.toList());
-                if (brands!=null){
-                    List<BakBrand> bakBrands =bakBrandMapper.selectBatchIds(brands);
-                    if (bakBrands!=null && bakBrands.size()>0){
-                        for (BakBrand bakBrand : bakBrands){
-                            PmsBrand brand = new PmsBrand();
-                            brand.setBigPic(bakBrand.getPicUrl());
-                            brand.setName(bakBrand.getName());
-                            brand.setShowStatus(1);
-                            brand.setFactoryStatus(1);
-                            brand.setLogo(bakBrand.getPicUrl());
-                            brand.setSort(bakBrand.getSortOrder());
-                            pmsBrandMapper.insert(brand);
+                if (ids != null) {
+                    List<BakGoods> goodsList = bakGoodsMapper.selectList(new QueryWrapper<BakGoods>().in("category_id", ids));
+                    for (BakGoods gg : goodsList) {
+                        createG(gg, entity.getId());
+                    }
+                    List<Integer> brands = goodsList.stream()
+                            .map(BakGoods::getBrandId)
+                            .collect(Collectors.toList());
+                    if (brands != null) {
+                        List<BakBrand> bakBrands = bakBrandMapper.selectBatchIds(brands);
+                        if (bakBrands != null && bakBrands.size() > 0) {
+                            for (BakBrand bakBrand : bakBrands) {
+                                PmsBrand brand = new PmsBrand();
+                                brand.setBigPic(bakBrand.getPicUrl());
+                                brand.setName(bakBrand.getName());
+                                brand.setShowStatus(1);
+                                brand.setFactoryStatus(1);
+                                brand.setLogo(bakBrand.getPicUrl());
+                                brand.setSort(bakBrand.getSortOrder());
+                                pmsBrandMapper.insert(brand);
+                            }
                         }
                     }
                 }
-            }
             });
         }
         return userMapper.insert(user) > 0;
     }
-    void createG(BakGoods gg,Integer storeId){
+
+    void createG(BakGoods gg, Long storeId) {
         PmsProduct g = new PmsProduct();
 
         g.setName(gg.getName());
@@ -166,10 +168,10 @@ public class SysStoreServiceImpl extends ServiceImpl<SysStoreMapper, SysStore> i
         g.setPic(gg.getPicUrl());
 
         g.setAlbumPics(gg.getPicUrl());
-        if (ValidatorUtils.notEmpty(gg.getCounterPrice())){
+        if (ValidatorUtils.notEmpty(gg.getCounterPrice())) {
             g.setPrice(gg.getCounterPrice());
         }
-        if (ValidatorUtils.notEmpty(gg.getRetailPrice())){
+        if (ValidatorUtils.notEmpty(gg.getRetailPrice())) {
             g.setOriginalPrice(gg.getRetailPrice());
         }
 
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysTestServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysTestServiceImpl.java
index aa862b8890ceaa4fe642e356584ffed33f762b98..a8a285bb4fade51db12ac8d497c9f2da4bb9b18f 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysTestServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysTestServiceImpl.java
@@ -9,15 +9,15 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 
 /**
-* @author mallplus
-* @date 2019-12-02
-*/
+ * @author mallplus
+ * @date 2019-12-02
+ */
 @Service
 public class SysTestServiceImpl extends ServiceImpl<SysTestMapper, SysTest> implements ISysTestService {
 
 
     @Resource
-    private  SysTestMapper sysTestMapper;
+    private SysTestMapper sysTestMapper;
 
 
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysUserServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysUserServiceImpl.java
index 33a340a5028a16ee427c7b0187059df006bd9e44..5fefbebf5e3918177dc9a88c573fea966000e070 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysUserServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysUserServiceImpl.java
@@ -2,6 +2,7 @@ package com.zscat.mallplus.sys.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zscat.mallplus.ApiContext;
 import com.zscat.mallplus.build.entity.UserCommunityRelate;
 import com.zscat.mallplus.build.mapper.UserCommunityRelateMapper;
 import com.zscat.mallplus.exception.BusinessMallException;
@@ -17,7 +18,6 @@ import com.zscat.mallplus.util.JwtTokenUtil;
 import com.zscat.mallplus.util.UserUtils;
 import com.zscat.mallplus.utils.CommonResult;
 import com.zscat.mallplus.utils.ValidatorUtils;
-import com.zscat.mallplus.ApiContext;
 import com.zscat.mallplus.vo.Rediskey;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -95,6 +95,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     private Integer dayCount;
     @Autowired
     private ApiContext apiContext;
+    @Resource
+    private UserCommunityRelateMapper userCommunityRelateMapper;
+
     @Override
     public String refreshToken(String oldToken) {
         String token = oldToken.substring(tokenHead.length());
@@ -108,7 +111,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public String login(String username, String password) {
         String token = null;
         //密码需要客户端加密后传递
-       try {
+        try {
             UserDetails userDetails = userDetailsService.loadUserByUsername(username);
             if (!passwordEncoder.matches(password, userDetails.getPassword())) {
                 throw new BadCredentialsException("密码不正确");
@@ -117,7 +120,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     userDetails, null, userDetails.getAuthorities());
             SecurityContextHolder.getContext().setAuthentication(authentication);
             token = jwtTokenUtil.generateToken(userDetails);
-
+            apiContext.setCurrentProviderId(UserUtils.getCurrentMember().getStoreId());
             this.removePermissRedis(UserUtils.getCurrentMember().getId());
         } catch (AuthenticationException e) {
             log.warn("登录异常:{}", e.getMessage());
@@ -206,7 +209,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         //查询是否有相同用户名的用户
 
         SysUser umsAdminList = adminMapper.selectByUserName(umsAdmin.getUsername());
-        if (umsAdminList!=null) {
+        if (umsAdminList != null) {
             return false;
         }
         //将密码进行加密操作
@@ -215,7 +218,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
         String md5Password = passwordEncoder.encode(umsAdmin.getPassword());
         umsAdmin.setPassword(md5Password);
-      //  umsAdmin.setStoreId(UserUtils.getCurrentMember().getStoreId());
+        //  umsAdmin.setStoreId(UserUtils.getCurrentMember().getStoreId());
         adminMapper.insert(umsAdmin);
         updateRole(umsAdmin.getId(), umsAdmin.getRoleIds());
 
@@ -286,7 +289,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         //查询是否有相同用户名的用户
 
         SysUser umsAdminList = adminMapper.selectByUserName(umsAdmin.getUsername());
-        if (umsAdminList!=null) {
+        if (umsAdminList != null) {
             return new CommonResult().failed("手机号已注册");
         }
         //将密码进行加密操作
@@ -302,15 +305,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         adminRoleRelationMapper.insert(roleRelation);
         return new CommonResult().failed("注册成功");
     }
-
-    //对输入的验证码进行校验
-    public boolean verifyAuthCode(String authCode, String telephone) {
-        if (StringUtils.isEmpty(authCode)) {
-            return false;
-        }
-        String realAuthCode = redisService.get(REDIS_KEY_PREFIX_AUTH_CODE + telephone);
-        return authCode.equals(realAuthCode);
-    }
 //    @Override
 //    public SmsCode generateCode(String phone) {
 //        //生成流水号
@@ -336,6 +330,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 //        return smsCode;
 //    }
 
+    //对输入的验证码进行校验
+    public boolean verifyAuthCode(String authCode, String telephone) {
+        if (StringUtils.isEmpty(authCode)) {
+            return false;
+        }
+        String realAuthCode = redisService.get(REDIS_KEY_PREFIX_AUTH_CODE + telephone);
+        return authCode.equals(realAuthCode);
+    }
+
     @Override
     public int updateShowStatus(List<Long> ids, Integer showStatus) {
         SysUser productCategory = new SysUser();
@@ -343,8 +346,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return adminMapper.update(productCategory, new QueryWrapper<SysUser>().in("id", ids));
 
     }
-    @Resource
-    private UserCommunityRelateMapper userCommunityRelateMapper;
 
     @Transactional
     @Override
@@ -352,28 +353,28 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         //先删除原有关系
         userCommunityRelateMapper.delete(new QueryWrapper<UserCommunityRelate>().eq("user_id", entity.getUserId()));
         //批量插入新关系
-      //  List<UserCommunityRelate> relationList = new ArrayList<>();
+        //  List<UserCommunityRelate> relationList = new ArrayList<>();
         if (!StringUtils.isEmpty(entity.getCommunityIds())) {
             String[] mids = entity.getCommunityIds().split(",");
             for (String permissionId : mids) {
                 UserCommunityRelate relation = new UserCommunityRelate();
                 relation.setUserId(entity.getUserId());
                 relation.setCommunityId(Long.valueOf(permissionId));
-              //  relationList.add(relation);
+                //  relationList.add(relation);
                 userCommunityRelateMapper.insert(relation);
             }
 
         }
-      return 1;
+        return 1;
     }
 
     @Override
     public void updatePassword(String password, String newPassword) {
         SysUser oldUser = UserUtils.getCurrentMember();
-        log.info("旧密码="+passwordEncoder.encode(password));
+        log.info("旧密码=" + passwordEncoder.encode(password));
         if (!passwordEncoder.matches(password, oldUser.getPassword())) {
-     //   if (!oldUser.getPassword().equals(passwordEncoder.encode(password))){
-            throw  new BusinessMallException("旧密码错误");
+            //   if (!oldUser.getPassword().equals(passwordEncoder.encode(password))){
+            throw new BusinessMallException("旧密码错误");
         }
         SysUser role = new SysUser();
         role.setId(oldUser.getId());
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysWebLogServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysWebLogServiceImpl.java
index 7b962e6b2ad8cd48b96290c53f510f598d8cbc3a..4a418c3a2e8975f173b6018ea287a463de5e8e3b 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysWebLogServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/service/impl/SysWebLogServiceImpl.java
@@ -24,6 +24,7 @@ public class SysWebLogServiceImpl extends ServiceImpl<SysWebLogMapper, SysWebLog
 
     @Resource
     private SysWebLogMapper logMapper;
+
     @Override
     public List<LogStatisc> selectPageExt(LogParam entity) {
         return logMapper.getLogStatisc(entity);
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/task/RyTask.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/task/RyTask.java
index ef346608c7f299d689ba39776f052246b2467dec..e2d5c5896b593d7719b6027c8b48d98e93ae0539 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/task/RyTask.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/task/RyTask.java
@@ -18,7 +18,6 @@ import java.util.Map;
 public class RyTask {
 
 
-
     public static void main(String[] args) {
         Map<String, Object> params = new HashMap<>();
         Calendar calendar = Calendar.getInstance();
@@ -34,7 +33,7 @@ public class RyTask {
     }
 
     public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) {
-       // System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
+        // System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
     }
 
     public void ryParams(String params) {
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/AbstractQuartzJob.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/AbstractQuartzJob.java
index 5a069ff4d2984730a7d7269e56abbc02321693ce..478d07e406ed0ca91dea097f641d0c823be65002 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/AbstractQuartzJob.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/AbstractQuartzJob.java
@@ -17,8 +17,7 @@ import java.util.Date;
  *
  * @author ruoyi
  */
-public abstract class AbstractQuartzJob implements org.quartz.Job
-{
+public abstract class AbstractQuartzJob implements org.quartz.Job {
     private static final Logger log = LoggerFactory.getLogger(AbstractQuartzJob.class);
 
     /**
@@ -27,21 +26,16 @@ public abstract class AbstractQuartzJob implements org.quartz.Job
     private static ThreadLocal<Date> threadLocal = new ThreadLocal<>();
 
     @Override
-    public void execute(JobExecutionContext context) throws JobExecutionException
-    {
+    public void execute(JobExecutionContext context) throws JobExecutionException {
         AdminSysJob job = new AdminSysJob();
         BeanUtils.copyBeanProp(job, context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES));
-        try
-        {
+        try {
             before(context, job);
-            if (job != null)
-            {
+            if (job != null) {
                 doExecute(context, job);
             }
             after(context, job, null);
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             log.error("任务执行异常  - ：", e);
             after(context, job, e);
         }
@@ -51,10 +45,9 @@ public abstract class AbstractQuartzJob implements org.quartz.Job
      * 执行前
      *
      * @param context 工作执行上下文对象
-     * @param job 系统计划任务
+     * @param job     系统计划任务
      */
-    protected void before(JobExecutionContext context, AdminSysJob job)
-    {
+    protected void before(JobExecutionContext context, AdminSysJob job) {
         threadLocal.set(new Date());
     }
 
@@ -62,10 +55,9 @@ public abstract class AbstractQuartzJob implements org.quartz.Job
      * 执行后
      *
      * @param context 工作执行上下文对象
-     * @param job 系统计划任务
+     * @param job     系统计划任务
      */
-    protected void after(JobExecutionContext context, AdminSysJob job, Exception e)
-    {
+    protected void after(JobExecutionContext context, AdminSysJob job, Exception e) {
         Date startTime = threadLocal.get();
         threadLocal.remove();
 
@@ -77,14 +69,11 @@ public abstract class AbstractQuartzJob implements org.quartz.Job
         jobLog.setEndTime(new Date());
         long runMs = jobLog.getEndTime().getTime() - jobLog.getStartTime().getTime();
         jobLog.setJobMessage(jobLog.getJobName() + " 总共耗时：" + runMs + "毫秒");
-        if (e != null)
-        {
+        if (e != null) {
             jobLog.setStatus(Constants.FAIL);
             String errorMsg = StringUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, 2000);
             jobLog.setExceptionInfo(errorMsg);
-        }
-        else
-        {
+        } else {
             jobLog.setStatus(Constants.SUCCESS);
         }
 
@@ -96,7 +85,7 @@ public abstract class AbstractQuartzJob implements org.quartz.Job
      * 执行方法，由子类重载
      *
      * @param context 工作执行上下文对象
-     * @param job 系统计划任务
+     * @param job     系统计划任务
      * @throws Exception 执行过程中的异常
      */
     protected abstract void doExecute(JobExecutionContext context, AdminSysJob job) throws Exception;
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/AliPayStatusEnum.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/AliPayStatusEnum.java
index 82b8ab5651453a34f220c28e86197ab60820ee58..76ec98413f0b6b831c55c2ad65370b02c753e19b 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/AliPayStatusEnum.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/AliPayStatusEnum.java
@@ -2,10 +2,11 @@ package com.zscat.mallplus.sys.util;
 
 /**
  * 支付状态
+ *
  * @author zhengjie
  * @date 2018/08/01 16:45:43
  */
-public enum  AliPayStatusEnum {
+public enum AliPayStatusEnum {
 
     FINISHED("交易成功", "TRADE_FINISHED"),
 
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/AlipayUtils.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/AlipayUtils.java
index 95c3918a651cd8b95caa915e4de53d8e1367450d..4e347422b95e12daac5e6d31ffbdeca480e6cbbf 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/AlipayUtils.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/AlipayUtils.java
@@ -13,6 +13,7 @@ import java.util.Map;
 
 /**
  * 支付宝工具类
+ *
  * @author zhengjie
  * @date 2018/09/30 14:04:35
  */
@@ -21,11 +22,12 @@ public class AlipayUtils {
 
     /**
      * 生成订单号
+     *
      * @return String
      */
     public String getOrderCode() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        int a = (int)(Math.random() * 9000.0D) + 1000;
+        int a = (int) (Math.random() * 9000.0D) + 1000;
         System.out.println(a);
         Date date = new Date();
         String str = sdf.format(date);
@@ -39,14 +41,15 @@ public class AlipayUtils {
 
     /**
      * 校验签名
+     *
      * @param request HttpServletRequest
-     * @param alipay 阿里云配置
+     * @param alipay  阿里云配置
      * @return boolean
      */
-    public boolean rsaCheck(HttpServletRequest request, SysAlipayConfig alipay){
+    public boolean rsaCheck(HttpServletRequest request, SysAlipayConfig alipay) {
 
         // 获取支付宝POST过来反馈信息
-        Map<String,String> params = new HashMap<>(1);
+        Map<String, String> params = new HashMap<>(1);
         Map requestParams = request.getParameterMap();
         for (Object o : requestParams.keySet()) {
             String name = (String) o;
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/BeanUtils.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/BeanUtils.java
index 40bcbe724bf698009b132a536c062739f0b62de2..772f91709c3c590918fefe4d600d926aa2a6d3fc 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/BeanUtils.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/BeanUtils.java
@@ -11,31 +11,32 @@ import java.util.regex.Pattern;
  *
  * @author ruoyi
  */
-public class BeanUtils extends org.springframework.beans.BeanUtils
-{
-    /** Bean方法名中属性名开始的下标 */
+public class BeanUtils extends org.springframework.beans.BeanUtils {
+    /**
+     * Bean方法名中属性名开始的下标
+     */
     private static final int BEAN_METHOD_PROP_INDEX = 3;
 
-    /** * 匹配getter方法的正则表达式 */
+    /**
+     * 匹配getter方法的正则表达式
+     */
     private static final Pattern GET_PATTERN = Pattern.compile("get(\\p{javaUpperCase}\\w*)");
 
-    /** * 匹配setter方法的正则表达式 */
+    /**
+     * 匹配setter方法的正则表达式
+     */
     private static final Pattern SET_PATTERN = Pattern.compile("set(\\p{javaUpperCase}\\w*)");
 
     /**
      * Bean属性复制工具方法。
      *
      * @param dest 目标对象
-     * @param src 源对象
+     * @param src  源对象
      */
-    public static void copyBeanProp(Object dest, Object src)
-    {
-        try
-        {
+    public static void copyBeanProp(Object dest, Object src) {
+        try {
             copyProperties(src, dest);
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -46,8 +47,7 @@ public class BeanUtils extends org.springframework.beans.BeanUtils
      * @param obj 对象
      * @return 对象的setter方法列表
      */
-    public static List<Method> getSetterMethods(Object obj)
-    {
+    public static List<Method> getSetterMethods(Object obj) {
         // setter方法列表
         List<Method> setterMethods = new ArrayList<Method>();
 
@@ -56,11 +56,9 @@ public class BeanUtils extends org.springframework.beans.BeanUtils
 
         // 查找setter方法
 
-        for (Method method : methods)
-        {
+        for (Method method : methods) {
             Matcher m = SET_PATTERN.matcher(method.getName());
-            if (m.matches() && (method.getParameterTypes().length == 1))
-            {
+            if (m.matches() && (method.getParameterTypes().length == 1)) {
                 setterMethods.add(method);
             }
         }
@@ -75,18 +73,15 @@ public class BeanUtils extends org.springframework.beans.BeanUtils
      * @return 对象的getter方法列表
      */
 
-    public static List<Method> getGetterMethods(Object obj)
-    {
+    public static List<Method> getGetterMethods(Object obj) {
         // getter方法列表
         List<Method> getterMethods = new ArrayList<Method>();
         // 获取所有方法
         Method[] methods = obj.getClass().getMethods();
         // 查找getter方法
-        for (Method method : methods)
-        {
+        for (Method method : methods) {
             Matcher m = GET_PATTERN.matcher(method.getName());
-            if (m.matches() && (method.getParameterTypes().length == 0))
-            {
+            if (m.matches() && (method.getParameterTypes().length == 0)) {
                 getterMethods.add(method);
             }
         }
@@ -103,8 +98,7 @@ public class BeanUtils extends org.springframework.beans.BeanUtils
      * @return 属性名一样返回true，否则返回false
      */
 
-    public static boolean isMethodPropEquals(String m1, String m2)
-    {
+    public static boolean isMethodPropEquals(String m1, String m2) {
         return m1.substring(BEAN_METHOD_PROP_INDEX).equals(m2.substring(BEAN_METHOD_PROP_INDEX));
     }
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/Constants.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/Constants.java
index b657fde2854b76dc6358505823b8eb27e42f412b..b04fc4d3df5a0b33b4f6e80411163b10934e2d58 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/Constants.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/Constants.java
@@ -5,8 +5,7 @@ package com.zscat.mallplus.sys.util;
  *
  * @author ruoyi
  */
-public class Constants
-{
+public class Constants {
     /**
      * UTF-8 字符集
      */
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/CronUtils.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/CronUtils.java
index cf834efee323923f47155510bf949b9df82a356d..f0694e7e71504c6e38e7e5a2cc1c5a0ca88036ac 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/CronUtils.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/CronUtils.java
@@ -9,18 +9,15 @@ import java.util.Date;
  * cron表达式工具类
  *
  * @author ruoyi
- *
  */
-public class CronUtils
-{
+public class CronUtils {
     /**
      * 返回一个布尔值代表一个给定的Cron表达式的有效性
      *
      * @param cronExpression Cron表达式
      * @return boolean 表达式是否有效
      */
-    public static boolean isValid(String cronExpression)
-    {
+    public static boolean isValid(String cronExpression) {
         return CronExpression.isValidExpression(cronExpression);
     }
 
@@ -30,15 +27,11 @@ public class CronUtils
      * @param cronExpression Cron表达式
      * @return String 无效时返回表达式错误描述,如果有效返回null
      */
-    public static String getInvalidMessage(String cronExpression)
-    {
-        try
-        {
+    public static String getInvalidMessage(String cronExpression) {
+        try {
             new CronExpression(cronExpression);
             return null;
-        }
-        catch (ParseException pe)
-        {
+        } catch (ParseException pe) {
             return pe.getMessage();
         }
     }
@@ -49,15 +42,11 @@ public class CronUtils
      * @param cronExpression Cron表达式
      * @return Date 下次Cron表达式执行时间
      */
-    public static Date getNextExecution(String cronExpression)
-    {
-        try
-        {
+    public static Date getNextExecution(String cronExpression) {
+        try {
             CronExpression cron = new CronExpression(cronExpression);
             return cron.getNextValidTimeAfter(new Date(System.currentTimeMillis()));
-        }
-        catch (ParseException e)
-        {
+        } catch (ParseException e) {
             throw new IllegalArgumentException(e.getMessage());
         }
     }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/ExceptionUtil.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/ExceptionUtil.java
index 92e75f74143c4c217ccd11e0f746550eea7b8e25..c990fb86e817e3d76dff1673e330f1fb20d1bbbe 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/ExceptionUtil.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/ExceptionUtil.java
@@ -12,30 +12,25 @@ import java.io.StringWriter;
  *
  * @author ruoyi
  */
-public class ExceptionUtil
-{
+public class ExceptionUtil {
     /**
      * 获取exception的详细错误信息。
      */
-    public static String getExceptionMessage(Throwable e)
-    {
+    public static String getExceptionMessage(Throwable e) {
         StringWriter sw = new StringWriter();
         e.printStackTrace(new PrintWriter(sw, true));
         String str = sw.toString();
         return str;
     }
 
-    public static String getRootErrorMseeage(Exception e)
-    {
+    public static String getRootErrorMseeage(Exception e) {
         Throwable root = ExceptionUtils.getRootCause(e);
         root = (root == null ? e : root);
-        if (root == null)
-        {
+        if (root == null) {
             return "";
         }
         String msg = root.getMessage();
-        if (msg == null)
-        {
+        if (msg == null) {
             return "null";
         }
         return StringUtils.defaultString(msg);
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/JobInvokeUtil.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/JobInvokeUtil.java
index 3766c1440c6eb7096aed3d15e8083f7dabae662e..d5442d8144f7df361b299580874a99eba1ce3446 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/JobInvokeUtil.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/JobInvokeUtil.java
@@ -14,27 +14,22 @@ import java.util.List;
  *
  * @author ruoyi
  */
-public class JobInvokeUtil
-{
+public class JobInvokeUtil {
     /**
      * 执行方法
      *
      * @param job 系统任务
      */
-    public static void invokeMethod(AdminSysJob job) throws Exception
-    {
+    public static void invokeMethod(AdminSysJob job) throws Exception {
         String invokeTarget = job.getInvokeTarget();
         String beanName = getBeanName(invokeTarget);
         String methodName = getMethodName(invokeTarget);
         List<Object[]> methodParams = getMethodParams(invokeTarget);
 
-        if (!isValidClassName(beanName))
-        {
+        if (!isValidClassName(beanName)) {
             Object bean = SpringUtils.getBean(beanName);
             invokeMethod(bean, methodName, methodParams);
-        }
-        else
-        {
+        } else {
             Object bean = Class.forName(beanName).newInstance();
             invokeMethod(bean, methodName, methodParams);
         }
@@ -43,21 +38,17 @@ public class JobInvokeUtil
     /**
      * 调用任务方法
      *
-     * @param bean 目标对象
-     * @param methodName 方法名称
+     * @param bean         目标对象
+     * @param methodName   方法名称
      * @param methodParams 方法参数
      */
     private static void invokeMethod(Object bean, String methodName, List<Object[]> methodParams)
             throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException,
-            InvocationTargetException
-    {
-        if (methodParams!=null && methodParams.size() > 0)
-        {
+            InvocationTargetException {
+        if (methodParams != null && methodParams.size() > 0) {
             Method method = bean.getClass().getDeclaredMethod(methodName, getMethodParamsType(methodParams));
             method.invoke(bean, getMethodParamsValue(methodParams));
-        }
-        else
-        {
+        } else {
             Method method = bean.getClass().getDeclaredMethod(methodName);
             method.invoke(bean);
         }
@@ -69,8 +60,7 @@ public class JobInvokeUtil
      * @param invokeTarget 名称
      * @return true是 false否
      */
-    public static boolean isValidClassName(String invokeTarget)
-    {
+    public static boolean isValidClassName(String invokeTarget) {
         return StringUtils.countMatches(invokeTarget, ".") > 1;
     }
 
@@ -80,8 +70,7 @@ public class JobInvokeUtil
      * @param invokeTarget 目标字符串
      * @return bean名称
      */
-    public static String getBeanName(String invokeTarget)
-    {
+    public static String getBeanName(String invokeTarget) {
         String beanName = StringUtils.substringBefore(invokeTarget, "(");
         return StringUtils.substringBeforeLast(beanName, ".");
     }
@@ -92,8 +81,7 @@ public class JobInvokeUtil
      * @param invokeTarget 目标字符串
      * @return method方法
      */
-    public static String getMethodName(String invokeTarget)
-    {
+    public static String getMethodName(String invokeTarget) {
         String methodName = StringUtils.substringBefore(invokeTarget, "(");
         return StringUtils.substringAfterLast(methodName, ".");
     }
@@ -104,42 +92,34 @@ public class JobInvokeUtil
      * @param invokeTarget 目标字符串
      * @return method方法相关参数列表
      */
-    public static List<Object[]> getMethodParams(String invokeTarget)
-    {
+    public static List<Object[]> getMethodParams(String invokeTarget) {
         String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")");
-        if (StringUtils.isEmpty(methodStr))
-        {
+        if (StringUtils.isEmpty(methodStr)) {
             return null;
         }
         String[] methodParams = methodStr.split(",");
         List<Object[]> classs = new LinkedList<>();
-        for (int i = 0; i < methodParams.length; i++)
-        {
+        for (int i = 0; i < methodParams.length; i++) {
             String str = StringUtils.trimToEmpty(methodParams[i]);
             // String字符串类型，包含'
-            if (StringUtils.contains(str, "'"))
-            {
-                classs.add(new Object[] { StringUtils.replace(str, "'", ""), String.class });
+            if (StringUtils.contains(str, "'")) {
+                classs.add(new Object[]{StringUtils.replace(str, "'", ""), String.class});
             }
             // boolean布尔类型，等于true或者false
-            else if (StringUtils.equals(str, "true") || StringUtils.equalsIgnoreCase(str, "false"))
-            {
-                classs.add(new Object[] { Boolean.valueOf(str), Boolean.class });
+            else if (StringUtils.equals(str, "true") || StringUtils.equalsIgnoreCase(str, "false")) {
+                classs.add(new Object[]{Boolean.valueOf(str), Boolean.class});
             }
             // long长整形，包含L
-            else if (StringUtils.containsIgnoreCase(str, "L"))
-            {
-                classs.add(new Object[] { Long.valueOf(StringUtils.replaceIgnoreCase(str, "L", "")), Long.class });
+            else if (StringUtils.containsIgnoreCase(str, "L")) {
+                classs.add(new Object[]{Long.valueOf(StringUtils.replaceIgnoreCase(str, "L", "")), Long.class});
             }
             // double浮点类型，包含D
-            else if (StringUtils.containsIgnoreCase(str, "D"))
-            {
-                classs.add(new Object[] { Double.valueOf(StringUtils.replaceIgnoreCase(str, "D", "")), Double.class });
+            else if (StringUtils.containsIgnoreCase(str, "D")) {
+                classs.add(new Object[]{Double.valueOf(StringUtils.replaceIgnoreCase(str, "D", "")), Double.class});
             }
             // 其他类型归类为整形
-            else
-            {
-                classs.add(new Object[] { Integer.valueOf(str), Integer.class });
+            else {
+                classs.add(new Object[]{Integer.valueOf(str), Integer.class});
             }
         }
         return classs;
@@ -151,12 +131,10 @@ public class JobInvokeUtil
      * @param methodParams 参数相关列表
      * @return 参数类型列表
      */
-    public static Class<?>[] getMethodParamsType(List<Object[]> methodParams)
-    {
+    public static Class<?>[] getMethodParamsType(List<Object[]> methodParams) {
         Class<?>[] classs = new Class<?>[methodParams.size()];
         int index = 0;
-        for (Object[] os : methodParams)
-        {
+        for (Object[] os : methodParams) {
             classs[index] = (Class<?>) os[1];
             index++;
         }
@@ -169,12 +147,10 @@ public class JobInvokeUtil
      * @param methodParams 参数相关列表
      * @return 参数值列表
      */
-    public static Object[] getMethodParamsValue(List<Object[]> methodParams)
-    {
+    public static Object[] getMethodParamsValue(List<Object[]> methodParams) {
         Object[] classs = new Object[methodParams.size()];
         int index = 0;
-        for (Object[] os : methodParams)
-        {
+        for (Object[] os : methodParams) {
             classs[index] = (Object) os[0];
             index++;
         }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/QuartzDisallowConcurrentExecution.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/QuartzDisallowConcurrentExecution.java
index 02ed9fc5a1e6bb9ac18a555c067f208aa6e8368f..d431d990d156cfdf900388f3a4dc3017cfd4c8c1 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/QuartzDisallowConcurrentExecution.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/QuartzDisallowConcurrentExecution.java
@@ -8,14 +8,11 @@ import org.quartz.JobExecutionContext;
  * 定时任务处理（禁止并发执行）
  *
  * @author ruoyi
- *
  */
 @DisallowConcurrentExecution
-public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob
-{
+public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob {
     @Override
-    protected void doExecute(JobExecutionContext context, AdminSysJob job) throws Exception
-    {
+    protected void doExecute(JobExecutionContext context, AdminSysJob job) throws Exception {
         JobInvokeUtil.invokeMethod(job);
     }
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/QuartzJobExecution.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/QuartzJobExecution.java
index c6ae07918d816973533bc84a3c0b30e84e36cafa..ef6770fd18fe70da9f8a4e455bb6622249ee0a90 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/QuartzJobExecution.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/QuartzJobExecution.java
@@ -7,13 +7,10 @@ import org.quartz.JobExecutionContext;
  * 定时任务处理（允许并发执行）
  *
  * @author ruoyi
- *
  */
-public class QuartzJobExecution extends AbstractQuartzJob
-{
+public class QuartzJobExecution extends AbstractQuartzJob {
     @Override
-    protected void doExecute(JobExecutionContext context, AdminSysJob job) throws Exception
-    {
+    protected void doExecute(JobExecutionContext context, AdminSysJob job) throws Exception {
         JobInvokeUtil.invokeMethod(job);
     }
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/ScheduleConstants.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/ScheduleConstants.java
index 1ed620b09d57055032632edc03c86f2be820d74b..182c5acc4f86a2e856aff3f39c21eadf6e0a19f7 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/ScheduleConstants.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/ScheduleConstants.java
@@ -5,27 +5,35 @@ package com.zscat.mallplus.sys.util;
  *
  * @author ruoyi
  */
-public interface ScheduleConstants
-{
+public interface ScheduleConstants {
     public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME";
 
-    /** 执行目标key */
+    /**
+     * 执行目标key
+     */
     public static final String TASK_PROPERTIES = "TASK_PROPERTIES";
 
-    /** 默认 */
+    /**
+     * 默认
+     */
     public static final String MISFIRE_DEFAULT = "0";
 
-    /** 立即触发执行 */
+    /**
+     * 立即触发执行
+     */
     public static final String MISFIRE_IGNORE_MISFIRES = "1";
 
-    /** 触发一次执行 */
+    /**
+     * 触发一次执行
+     */
     public static final String MISFIRE_FIRE_AND_PROCEED = "2";
 
-    /** 不触发立即执行 */
+    /**
+     * 不触发立即执行
+     */
     public static final String MISFIRE_DO_NOTHING = "3";
 
-    public enum Status
-    {
+    public enum Status {
         /**
          * 正常
          */
@@ -37,13 +45,11 @@ public interface ScheduleConstants
 
         private Integer value;
 
-        private Status(Integer value)
-        {
+        private Status(Integer value) {
             this.value = value;
         }
 
-        public Integer getValue()
-        {
+        public Integer getValue() {
             return value;
         }
     }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/ScheduleUtils.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/ScheduleUtils.java
index 5a96531e1efe6cbdbea88b9e451943233a69f019..def39abb653a06e887a19ddd557f1aca6004897c 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/ScheduleUtils.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/ScheduleUtils.java
@@ -8,18 +8,15 @@ import org.quartz.*;
  * 定时任务工具类
  *
  * @author ruoyi
- *
  */
-public class ScheduleUtils
-{
+public class ScheduleUtils {
     /**
      * 得到quartz任务类
      *
      * @param job 执行计划
      * @return 具体执行任务类
      */
-    private static Class<? extends org.quartz.Job> getQuartzJobClass(AdminSysJob job)
-    {
+    private static Class<? extends org.quartz.Job> getQuartzJobClass(AdminSysJob job) {
         boolean isConcurrent = "0".equals(job.getConcurrent());
         return isConcurrent ? QuartzJobExecution.class : QuartzDisallowConcurrentExecution.class;
     }
@@ -27,24 +24,21 @@ public class ScheduleUtils
     /**
      * 构建任务触发对象
      */
-    public static TriggerKey getTriggerKey(Long jobId, String jobGroup)
-    {
+    public static TriggerKey getTriggerKey(Long jobId, String jobGroup) {
         return TriggerKey.triggerKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup);
     }
 
     /**
      * 构建任务键对象
      */
-    public static JobKey getJobKey(Long jobId, String jobGroup)
-    {
+    public static JobKey getJobKey(Long jobId, String jobGroup) {
         return JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup);
     }
 
     /**
      * 创建定时任务
      */
-    public static void createScheduleJob(Scheduler scheduler, AdminSysJob job)
-    {
+    public static void createScheduleJob(Scheduler scheduler, AdminSysJob job) {
         Class<? extends org.quartz.Job> jobClass = getQuartzJobClass(job);
         // 构建job信息
         Long jobId = job.getJobId();
@@ -64,16 +58,14 @@ public class ScheduleUtils
 
         // 判断是否存在
         try {
-            if (scheduler.checkExists(getJobKey(jobId, jobGroup)))
-            {
+            if (scheduler.checkExists(getJobKey(jobId, jobGroup))) {
                 // 防止创建时存在数据问题 先移除，然后在执行创建操作
                 scheduler.deleteJob(getJobKey(jobId, jobGroup));
             }
             scheduler.scheduleJob(jobDetail, trigger);
 
             // 暂停任务
-            if (job.getStatus().equals(ScheduleConstants.Status.PAUSE.getValue()))
-            {
+            if (job.getStatus().equals(ScheduleConstants.Status.PAUSE.getValue())) {
                 scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup));
             }
         } catch (SchedulerException e) {
@@ -86,11 +78,8 @@ public class ScheduleUtils
     /**
      * 设置定时任务策略
      */
-    public static CronScheduleBuilder handleCronScheduleMisfirePolicy(AdminSysJob job, CronScheduleBuilder cb)
-
-    {
-        switch (job.getMisfirePolicy())
-        {
+    public static CronScheduleBuilder handleCronScheduleMisfirePolicy(AdminSysJob job, CronScheduleBuilder cb) {
+        switch (job.getMisfirePolicy()) {
             case ScheduleConstants.MISFIRE_DEFAULT:
                 return cb;
             case ScheduleConstants.MISFIRE_IGNORE_MISFIRES:
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/SpringUtils.java b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/SpringUtils.java
index 0610b14503d4abd290667f16a4a8425f58c88687..4fc4a04b4fbdc6c55269c751dc948baaf1f573f6 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/SpringUtils.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/sys/util/SpringUtils.java
@@ -13,28 +13,21 @@ import org.springframework.stereotype.Component;
  * @author ruoyi
  */
 @Component
-public final class SpringUtils implements BeanFactoryPostProcessor
-{
-    /** Spring应用上下文环境 */
+public final class SpringUtils implements BeanFactoryPostProcessor {
+    /**
+     * Spring应用上下文环境
+     */
     private static ConfigurableListableBeanFactory beanFactory;
 
-    @Override
-    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
-    {
-        SpringUtils.beanFactory = beanFactory;
-    }
-
     /**
      * 获取对象
      *
      * @param name
      * @return Object 一个以所给名字注册的bean的实例
      * @throws BeansException
-     *
      */
     @SuppressWarnings("unchecked")
-    public static <T> T getBean(String name) throws BeansException
-    {
+    public static <T> T getBean(String name) throws BeansException {
         return (T) beanFactory.getBean(name);
     }
 
@@ -44,10 +37,8 @@ public final class SpringUtils implements BeanFactoryPostProcessor
      * @param clz
      * @return
      * @throws BeansException
-     *
      */
-    public static <T> T getBean(Class<T> clz) throws BeansException
-    {
+    public static <T> T getBean(Class<T> clz) throws BeansException {
         T result = (T) beanFactory.getBean(clz);
         return result;
     }
@@ -58,8 +49,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor
      * @param name
      * @return boolean
      */
-    public static boolean containsBean(String name)
-    {
+    public static boolean containsBean(String name) {
         return beanFactory.containsBean(name);
     }
 
@@ -69,10 +59,8 @@ public final class SpringUtils implements BeanFactoryPostProcessor
      * @param name
      * @return boolean
      * @throws NoSuchBeanDefinitionException
-     *
      */
-    public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException
-    {
+    public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
         return beanFactory.isSingleton(name);
     }
 
@@ -80,10 +68,8 @@ public final class SpringUtils implements BeanFactoryPostProcessor
      * @param name
      * @return Class 注册对象的类型
      * @throws NoSuchBeanDefinitionException
-     *
      */
-    public static Class<?> getType(String name) throws NoSuchBeanDefinitionException
-    {
+    public static Class<?> getType(String name) throws NoSuchBeanDefinitionException {
         return beanFactory.getType(name);
     }
 
@@ -93,10 +79,8 @@ public final class SpringUtils implements BeanFactoryPostProcessor
      * @param name
      * @return
      * @throws NoSuchBeanDefinitionException
-     *
      */
-    public static String[] getAliases(String name) throws NoSuchBeanDefinitionException
-    {
+    public static String[] getAliases(String name) throws NoSuchBeanDefinitionException {
         return beanFactory.getAliases(name);
     }
 
@@ -107,8 +91,12 @@ public final class SpringUtils implements BeanFactoryPostProcessor
      * @return
      */
     @SuppressWarnings("unchecked")
-    public static <T> T getAopProxy(T invoker)
-    {
+    public static <T> T getAopProxy(T invoker) {
         return (T) AopContext.currentProxy();
     }
+
+    @Override
+    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
+        SpringUtils.beanFactory = beanFactory;
+    }
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/SysAppletSetController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/SysAppletSetController.java
index bd38bb011624b56daf8df573e422b7605dcd93bc..7ef5974592b7c8fa6932046a71f02beb0c953620 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/SysAppletSetController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/SysAppletSetController.java
@@ -70,7 +70,7 @@ public class SysAppletSetController {
     @PostMapping(value = "/update/{id}")
     public Object updateSysAppletSet(@RequestBody SysAppletSet entity) {
         try {
-            if (ISysAppletSetService.update(entity,new QueryWrapper<>())) {
+            if (ISysAppletSetService.update(entity, new QueryWrapper<>())) {
                 return new CommonResult().success();
             }
         } catch (Exception e) {
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsIntegrationChangeHistoryController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsIntegrationChangeHistoryController.java
index d624e4387fe79aaae95ffde2b5960885b2953dc9..d4ca69853dd17985314f4c48c53d03f9528ca018 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsIntegrationChangeHistoryController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsIntegrationChangeHistoryController.java
@@ -65,5 +65,4 @@ public class UmsIntegrationChangeHistoryController {
     }
 
 
-
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsIntegrationConsumeSettingController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsIntegrationConsumeSettingController.java
index f0d9a415f923081d4bcba727fcb04d0ebfe58916..1d4e73ca16e7f8fa7841c9e315390f11147956ca 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsIntegrationConsumeSettingController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsIntegrationConsumeSettingController.java
@@ -68,7 +68,7 @@ public class UmsIntegrationConsumeSettingController {
     @SysLog(MODULE = "ums", REMARK = "更新积分消费设置")
     @ApiOperation("更新积分消费设置")
     @PostMapping(value = "/update/{id}")
-  //  @PreAuthorize("hasAuthority('ums:UmsIntegrationConsumeSetting:update')")
+    //  @PreAuthorize("hasAuthority('ums:UmsIntegrationConsumeSetting:update')")
     public Object updateUmsIntegrationConsumeSetting(@RequestBody UmsIntegrationConsumeSetting entity) {
         try {
             if (IUmsIntegrationConsumeSettingService.updateById(entity)) {
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsMemberBlanceLogController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsMemberBlanceLogController.java
index efff9d169a99743ae2bb584921a7565f860aaa33..bd3125a5309e85d54281a146fd1b407ef9ade0c0 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsMemberBlanceLogController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsMemberBlanceLogController.java
@@ -65,5 +65,4 @@ public class UmsMemberBlanceLogController {
     }
 
 
-
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsMemberController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsMemberController.java
index e3e82744e638962eba97c6cae171a4b03f84b119..7456cf8b50720063078ca9404cc824121df86135 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsMemberController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsMemberController.java
@@ -111,7 +111,8 @@ public class UmsMemberController {
                                    @RequestParam("blance") BigDecimal blance) {
         try {
             UmsMember entity = new UmsMember();
-            entity.setId(id);entity.setBlance(blance);
+            entity.setId(id);
+            entity.setBlance(blance);
             UmsMember member = IUmsMemberService.getById(entity.getId());
             entity.setBlance(entity.getBlance().add(member.getBlance()));
             UmsMemberBlanceLog blog = new UmsMemberBlanceLog();
@@ -142,7 +143,8 @@ public class UmsMemberController {
         try {
 
             UmsMember entity = new UmsMember();
-            entity.setId(id);entity.setIntegration(integration);
+            entity.setId(id);
+            entity.setIntegration(integration);
             UmsMember member = IUmsMemberService.getById(entity.getId());
 
             entity.setIntegration(entity.getIntegration() + member.getIntegration());
@@ -151,7 +153,7 @@ public class UmsMemberController {
             history.setChangeCount(entity.getIntegration());
             history.setCreateTime(new Date());
             history.setChangeType(AllEnum.ChangeType.Add.code());
-            history.setOperateNote("后台积分充值:"+integration);
+            history.setOperateNote("后台积分充值:" + integration);
             history.setSourceType(AllEnum.ChangeSource.admin.code());
             history.setOperateMan(UserUtils.getCurrentMember().getId() + "");
             umsIntegrationChangeHistoryService.insert(history);
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UserBankcardsController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UserBankcardsController.java
index a3bf3d0277e84debbcc181f948e6c4ae9a7f2b77..0823b3546e4282cfb397dc98df86f4a5f7453615 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UserBankcardsController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UserBankcardsController.java
@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UserTocashController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UserTocashController.java
index dbc6280bfbdb6427509ae0b1ac6d36793a221eb9..903eec23ab8159ea81d1009c8c69cbcb7f8dd5cb 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UserTocashController.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UserTocashController.java
@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/ISysAppletSetService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/ISysAppletSetService.java
index 7d60ff2f535dcd592ea8f355ae93d9d08cd8b99a..f3d53e9113d03e5ddf51c79a6d061d93823ca866 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/ISysAppletSetService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/ISysAppletSetService.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.ums.entity.SysAppletSet;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/IUserBankcardsService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/IUserBankcardsService.java
index 19deb7695e552a3d837dfac0e8c030c14c91161f..bae27115fcb3f392dfbd325da18afc2c700b328c 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/IUserBankcardsService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/IUserBankcardsService.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.ums.entity.UserBankcards;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/IUserTocashService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/IUserTocashService.java
index b00e7e6734853f42e2ed2629542c201e9e9dbb4e..16ac3f3f11e30d4f8b08a8cd5625f0c2ed8d874c 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/IUserTocashService.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/IUserTocashService.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.ums.entity.UserTocash;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/impl/SysAppletSetServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/impl/SysAppletSetServiceImpl.java
index 6049db40ed69fc13577d43491fbc09f7b2e1ce55..1bfd23512cc8f629d9bdb262294749ea194fe0c3 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/impl/SysAppletSetServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/impl/SysAppletSetServiceImpl.java
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java
index b908223e2c26bc9d45ba394618e142ce371b500f..68c5188eff65d27abe8b87235e6a315c78e0ca43 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java
@@ -34,14 +34,14 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
 
     @Override
     public void updataMemberOrderInfo() {
-        List<OrderStstic> orders =  omsOrderMapper.listOrderGroupByMemberId();
+        List<OrderStstic> orders = omsOrderMapper.listOrderGroupByMemberId();
         List<UmsMemberLevel> levelList = memberLevelService.list(new QueryWrapper<UmsMemberLevel>().orderByDesc("price"));
-        for (OrderStstic o : orders){
+        for (OrderStstic o : orders) {
             UmsMember member = new UmsMember();
             member.setId(o.getMemberId());
             member.setBuyMoney(o.getTotalPayAmount());
-            for (UmsMemberLevel level: levelList){
-                if (member.getBuyMoney().compareTo(level.getPrice())>=0){
+            for (UmsMemberLevel level : levelList) {
+                if (member.getBuyMoney().compareTo(level.getPrice()) >= 0) {
                     member.setMemberLevelId(level.getId());
                     member.setMemberLevelName(level.getName());
                     break;
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/impl/UserBankcardsServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/impl/UserBankcardsServiceImpl.java
index a2fb0eff7f1630871d949583080600a747d42cab..aedb6a28e0e2c7dce7601a4a2445003c3a75105e 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/impl/UserBankcardsServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/impl/UserBankcardsServiceImpl.java
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/impl/UserTocashServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/impl/UserTocashServiceImpl.java
index 33fd3aac5e88bc42566d424123e9c56ab72e3045..bf9a973f85f8c4d28298573723d88e9cf6db2cb4 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/impl/UserTocashServiceImpl.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/service/impl/UserTocashServiceImpl.java
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/util/ColUtil.java b/mallplus-admin/src/main/java/com/zscat/mallplus/util/ColUtil.java
index 16552ef31c7a46e15022c3fea75c7385f8a42e75..b0a217fa708c58464c3b8332c6a9fdf710e65742 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/util/ColUtil.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/util/ColUtil.java
@@ -14,13 +14,14 @@ public class ColUtil {
 
     /**
      * 转换mysql数据类型为java数据类型
+     *
      * @param type 数据库字段类型
      * @return String
      */
-    static String cloToJava(String type){
+    static String cloToJava(String type) {
         Configuration config = getConfig();
         assert config != null;
-        return config.getString(type,"unknowType");
+        return config.getString(type, "unknowType");
     }
 
     /**
@@ -28,7 +29,7 @@ public class ColUtil {
      */
     public static PropertiesConfiguration getConfig() {
         try {
-            return new PropertiesConfiguration("generator.properties" );
+            return new PropertiesConfiguration("generator.properties");
         } catch (ConfigurationException e) {
             e.printStackTrace();
         }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/util/DateUtils.java b/mallplus-admin/src/main/java/com/zscat/mallplus/util/DateUtils.java
index b0f1e55b02c9112586491527a6b0645c40d110e7..2fc659db39adc93f8929ee5ba1de6e5bb85c09cc 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/util/DateUtils.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/util/DateUtils.java
@@ -41,6 +41,9 @@ public class DateUtils {
             {"\\d{4}((([0][1,3-9]|[1][0-2]|[1-9])([0-2]\\d|[3][0,1]|[1-9]))|((02|2)(([1-9])|[0-2]\\d)))([0,1]\\d|[2][0-3])([0-5]\\d|\\d)([0-5]\\d|\\d)\\d{1,3}",
                     DATE_TIME_PATTERN_YYYY_MM_DD_HH_MM_SS_SSS}
     };
+    private static SimpleDateFormat sdf = new SimpleDateFormat("yyyyMM");
+    private static Calendar calendar = Calendar.getInstance();
+
     public static Date toDate(String d) throws Exception {
         return FORMATER_DATE_YMD.parse(d);
     }
@@ -124,6 +127,7 @@ public class DateUtils {
         return FORMATER_DATE_YMD.format(cd.getTime());
 
     }
+
     /**
      * 转换为时间类型格式
      *
@@ -140,7 +144,6 @@ public class DateUtils {
         }
     }
 
-
     /**
      * 根据传入的日期格式字符串，获取日期的格式
      *
@@ -164,6 +167,7 @@ public class DateUtils {
         }
         return style;
     }
+
     /**
      * 返回当前时间的"yyyy-MM-dd"格式字符串
      */
@@ -286,15 +290,12 @@ public class DateUtils {
         return cal.getTime();
     }
 
-    private static SimpleDateFormat sdf=new SimpleDateFormat("yyyyMM");
-    private static Calendar calendar=Calendar.getInstance();
-
     /*
     输入日期字符串比如201703，返回当月第一天的Date
     */
-    public static Date getMinDateMonth(String month){
+    public static Date getMinDateMonth(String month) {
         try {
-            Date nowDate=sdf.parse(month);
+            Date nowDate = sdf.parse(month);
             calendar = Calendar.getInstance();
             calendar.setTime(nowDate);
             calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMinimum(Calendar.DAY_OF_MONTH));
@@ -308,9 +309,9 @@ public class DateUtils {
     /*
     输入日期字符串，返回当月最后一天的Date
     */
-    public static Date getMaxDateMonth(String month){
+    public static Date getMaxDateMonth(String month) {
         try {
-            Date nowDate=sdf.parse(month);
+            Date nowDate = sdf.parse(month);
             calendar = Calendar.getInstance();
             calendar.setTime(nowDate);
             calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
@@ -322,7 +323,7 @@ public class DateUtils {
     }
 
     public static void main(String[] args) throws Exception {
-        String month="201705";
+        String month = "201705";
         System.out.println(getMinDateMonth(month));
         System.out.println(getMaxDateMonth(month));
         System.out.println(DateUtils.geLastDayByMonth());
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/util/EasyPoiUtils.java b/mallplus-admin/src/main/java/com/zscat/mallplus/util/EasyPoiUtils.java
index 71c5f73d89e19be4c9413eb082075257e1c9bb5c..c14bf11e5ed78d8c9418785ec6ede9dd2fb37daa 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/util/EasyPoiUtils.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/util/EasyPoiUtils.java
@@ -18,7 +18,8 @@ import java.util.Map;
 
 public final class EasyPoiUtils {
 
-    private EasyPoiUtils() {}
+    private EasyPoiUtils() {
+    }
 
     private static void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) {
         try {
@@ -27,24 +28,24 @@ public final class EasyPoiUtils {
             response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
             workbook.write(response.getOutputStream());
         } catch (IOException e) {
-            throw new  RuntimeException(e);
+            throw new RuntimeException(e);
         }
     }
 
-    private static<T> void defaultExport(List<T> dataList, Class<?> clz, String fileName, HttpServletResponse response, ExportParams exportParams) {
+    private static <T> void defaultExport(List<T> dataList, Class<?> clz, String fileName, HttpServletResponse response, ExportParams exportParams) {
         Workbook workbook = ExcelExportUtil.exportExcel(exportParams, clz, dataList);
         if (workbook != null) {
             downLoadExcel(fileName, response, workbook);
         }
     }
 
-    public static<T> void exportExcel(List<T> dataList, String title, String sheetName, Class<?> clz, String fileName, boolean isCreateHeader, HttpServletResponse response) {
+    public static <T> void exportExcel(List<T> dataList, String title, String sheetName, Class<?> clz, String fileName, boolean isCreateHeader, HttpServletResponse response) {
         ExportParams exportParams = new ExportParams(title, sheetName);
         exportParams.setCreateHeadRows(isCreateHeader);
         defaultExport(dataList, clz, fileName, response, exportParams);
     }
 
-    public static<T> void exportExcel(List<T> dataList, String title, String sheetName, Class<?> clz, String fileName, HttpServletResponse response) {
+    public static <T> void exportExcel(List<T> dataList, String title, String sheetName, Class<?> clz, String fileName, HttpServletResponse response) {
         defaultExport(dataList, clz, fileName, response, new ExportParams(title, sheetName));
     }
 
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/util/FileTypeMap.java b/mallplus-admin/src/main/java/com/zscat/mallplus/util/FileTypeMap.java
index 84a9265d98e4396e47f07815a79cb430472b3235..5aa4f4f36255f0a98c48f09a8f4ff77a22b37a86 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/util/FileTypeMap.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/util/FileTypeMap.java
@@ -5,20 +5,22 @@ import java.util.Map;
 
 /**
  * 文件类型<p>允许上传的类型<p/>
+ *
  * @author Peter
  * @date 2018-4-11
  */
 public class FileTypeMap {
 
     public static final Map<String, String> map = new HashMap<String, String>(9);
+
     static {
-        map.put("jpeg","FFD8FF");
-        map.put("jpg","FFD8FFE0");
-        map.put("png","89504E47");
-        map.put("wav","57415645");
-        map.put("avi","41564920");
-        map.put("mp4","00000020667479706D70");
-        map.put("mp3","49443303000000002176");
+        map.put("jpeg", "FFD8FF");
+        map.put("jpg", "FFD8FFE0");
+        map.put("png", "89504E47");
+        map.put("wav", "57415645");
+        map.put("avi", "41564920");
+        map.put("mp4", "00000020667479706D70");
+        map.put("mp3", "49443303000000002176");
     }
 
 
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/util/FileUtil.java b/mallplus-admin/src/main/java/com/zscat/mallplus/util/FileUtil.java
index 8b8d4e54c5f7179d7fd6e01c7149635c06fe6f86..2157e67a96e6fa7154dc31e568b49a17ae126259 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/util/FileUtil.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/util/FileUtil.java
@@ -5,7 +5,6 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.poi.excel.BigExcelWriter;
 import cn.hutool.poi.excel.ExcelUtil;
-
 import com.zscat.mallplus.exception.BusinessMallException;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -22,6 +21,7 @@ import java.util.Map;
 
 /**
  * File工具类，扩展 hutool 工具包
+ *
  * @author mallplus
  * @date 2018-12-27
  */
@@ -48,11 +48,11 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
     /**
      * MultipartFile转File
      */
-    public static File toFile(MultipartFile multipartFile){
+    public static File toFile(MultipartFile multipartFile) {
         // 获取文件名
         String fileName = multipartFile.getOriginalFilename();
         // 获取文件后缀
-        String prefix="."+getExtensionName(fileName);
+        String prefix = "." + getExtensionName(fileName);
         File file = null;
         try {
             // 用uuid作为文件名，防止生成的临时文件重复
@@ -71,7 +71,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
     public static String getExtensionName(String filename) {
         if ((filename != null) && (filename.length() > 0)) {
             int dot = filename.lastIndexOf('.');
-            if ((dot >-1) && (dot < (filename.length() - 1))) {
+            if ((dot > -1) && (dot < (filename.length() - 1))) {
                 return filename.substring(dot + 1);
             }
         }
@@ -84,7 +84,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
     public static String getFileNameNoEx(String filename) {
         if ((filename != null) && (filename.length() > 0)) {
             int dot = filename.lastIndexOf('.');
-            if ((dot >-1) && (dot < (filename.length()))) {
+            if ((dot > -1) && (dot < (filename.length()))) {
                 return filename.substring(0, dot);
             }
         }
@@ -94,7 +94,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
     /**
      * 文件大小转换
      */
-    public static String getSize(long size){
+    public static String getSize(long size) {
         String resultSize;
         if (size / GB >= 1) {
             //如果当前Byte的值大于等于1GB
@@ -114,7 +114,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
     /**
      * inputStream 转 File
      */
-    static File inputStreamToFile(InputStream ins, String name) throws Exception{
+    static File inputStreamToFile(InputStream ins, String name) throws Exception {
         File file = new File(System.getProperty("java.io.tmpdir") + File.separator + name);
         if (file.exists()) {
             return file;
@@ -160,10 +160,10 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
     public static String fileToBase64(File file) throws Exception {
         FileInputStream inputFile = new FileInputStream(file);
         String base64;
-        byte[] buffer = new byte[(int)file.length()];
+        byte[] buffer = new byte[(int) file.length()];
         inputFile.read(buffer);
         inputFile.close();
-        base64=Base64.encode(buffer);
+        base64 = Base64.encode(buffer);
         return base64.replaceAll("[\\s*\t\n\r]", "");
     }
 
@@ -171,16 +171,16 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
      * 导出excel
      */
     public static void downloadExcel(List<Map<String, Object>> list, HttpServletResponse response) throws IOException {
-        String tempPath =System.getProperty("java.io.tmpdir") + IdUtil.fastSimpleUUID() + ".xlsx";
+        String tempPath = System.getProperty("java.io.tmpdir") + IdUtil.fastSimpleUUID() + ".xlsx";
         File file = new File(tempPath);
-        BigExcelWriter writer= ExcelUtil.getBigWriter(file);
+        BigExcelWriter writer = ExcelUtil.getBigWriter(file);
         // 一次性写出内容，使用默认样式，强制输出标题
         writer.write(list, true);
         //response为HttpServletResponse对象
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
         //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码
-        response.setHeader("Content-Disposition","attachment;filename=file.xlsx");
-        ServletOutputStream out=response.getOutputStream();
+        response.setHeader("Content-Disposition", "attachment;filename=file.xlsx");
+        ServletOutputStream out = response.getOutputStream();
         // 终止后删除临时文件
         file.deleteOnExit();
         writer.flush(out, true);
@@ -193,13 +193,13 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
         String music = "mp3 wav wma mpa ram ra aac aif m4a";
         String video = "avi mpg mpe mpeg asf wmv mov qt rm mp4 flv m4v webm ogv ogg";
         String image = "bmp dib pcp dif wmf gif jpg tif eps psd cdr iff tga pcd mpt png jpeg";
-        if(image.contains(type)){
+        if (image.contains(type)) {
             return "图片";
-        } else if(documents.contains(type)){
+        } else if (documents.contains(type)) {
             return "文档";
-        } else if(music.contains(type)){
+        } else if (music.contains(type)) {
             return "音乐";
-        } else if(video.contains(type)){
+        } else if (video.contains(type)) {
             return "视频";
         } else {
             return "其他";
@@ -212,7 +212,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
     }
 
     public static void checkSize(long maxSize, long size) {
-        if(size > (maxSize * 1024 * 1024)){
+        if (size > (maxSize * 1024 * 1024)) {
             throw new BusinessMallException("文件超出规定大小");
         }
     }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/util/FileUtils.java b/mallplus-admin/src/main/java/com/zscat/mallplus/util/FileUtils.java
index 7db35c12041ade996aa0785322beb2eb9b7f8def..e20a004359b1669c6d52f85ae203414425db0797 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/util/FileUtils.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/util/FileUtils.java
@@ -5,27 +5,30 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.io.InputStream;
 
-/** 文件工具类
+/**
+ * 文件工具类
+ *
  * @author Peter
  * @date 2018-4-11
  */
 public class FileUtils {
     /**
      * 判断文件类型是否合法<>通过魔数判断</>
+     *
      * @param file
      * @return
      */
     public static boolean checkFileMagicNum(final MultipartFile file) {
-        if(file == null){
+        if (file == null) {
             return false;
         }
         // 获取文件上传时带的后缀
         String fileName = file.getOriginalFilename();
-        String suffix = fileName.substring(fileName.lastIndexOf(".")+1);
+        String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
         // 由文件后缀得到的魔数，由于后缀可以伪造，所以该魔数不一定是文件的真实魔数
-        String magicNum =  FileTypeMap.map.get(suffix.toLowerCase());
+        String magicNum = FileTypeMap.map.get(suffix.toLowerCase());
         // 取不到魔数，说明该文件类型不能上传
-        if(magicNum == null){
+        if (magicNum == null) {
             return false;
         }
         // 取到魔数之后，判断与文件的是否相同
@@ -33,14 +36,14 @@ public class FileUtils {
         try {
             InputStream in = file.getInputStream();
             // 读取上传文件的前30个字节
-            in.read(b,0,30);
+            in.read(b, 0, 30);
             in.close();
         } catch (IOException e) {
             e.printStackTrace();
         }
         String realMagicNum = bytesToHex(b);
         // 判断文件开始的一段内容是否是匹配的魔数
-        if(realMagicNum.toUpperCase().startsWith(magicNum)){
+        if (realMagicNum.toUpperCase().startsWith(magicNum)) {
             return true;
         }
         return false;
@@ -48,10 +51,11 @@ public class FileUtils {
 
     /**
      * 将字节数组转换成16进制字符串
+     *
      * @param src
      * @return
      */
-    public static String bytesToHex(final byte[] src){
+    public static String bytesToHex(final byte[] src) {
         StringBuilder stringBuilder = new StringBuilder("");
         if (src == null || src.length <= 0) {
             return null;
@@ -67,12 +71,12 @@ public class FileUtils {
         return stringBuilder.toString();
     }
 
-    public static String getSuffix(final MultipartFile file){
-        if(file == null || file.getSize() == 0){
+    public static String getSuffix(final MultipartFile file) {
+        if (file == null || file.getSize() == 0) {
             return null;
         }
         String fileName = file.getOriginalFilename();
-        return fileName.substring(fileName.lastIndexOf(".")+1);
+        return fileName.substring(fileName.lastIndexOf(".") + 1);
     }
 
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/util/GenUtil.java b/mallplus-admin/src/main/java/com/zscat/mallplus/util/GenUtil.java
index 3fd401e34ec29ac1858cb749fca0d212c85d0f8c..9c3dc8ed038341478d13880cccc7213190735c6b 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/util/GenUtil.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/util/GenUtil.java
@@ -19,6 +19,7 @@ import java.util.Map;
 
 /**
  * 代码生成
+ *
  * @author mallplus
  * @date 2019-01-02
  */
@@ -35,6 +36,7 @@ public class GenUtil {
 
     /**
      * 获取后端代码模板名称
+     *
      * @return List
      */
     private static List<String> getAdminTemplateNames() {
@@ -52,6 +54,7 @@ public class GenUtil {
 
     /**
      * 获取前端代码模板名称
+     *
      * @return List
      */
     private static List<String> getFrontTemplateNames() {
@@ -66,96 +69,96 @@ public class GenUtil {
 
     /**
      * 生成代码
+     *
      * @param columnInfos 表元数据
-
      */
     public static void generatorCode(List<ColumnInfo> columnInfos, GenConfig genConfig, String tableName) throws IOException {
-        Map<String,Object> map = new HashMap<>();
-        map.put("package",genConfig.getPack());
-        map.put("moduleName",genConfig.getModuleName());
-        map.put("author",genConfig.getAuthor());
+        Map<String, Object> map = new HashMap<>();
+        map.put("package", genConfig.getPack());
+        map.put("moduleName", genConfig.getModuleName());
+        map.put("author", genConfig.getAuthor());
         map.put("date", LocalDate.now().toString());
-        map.put("tableName",tableName);
-        map.put("prefix",genConfig.getPrefix());
+        map.put("tableName", tableName);
+        map.put("prefix", genConfig.getPrefix());
 
         String className = StringUtils.toCapitalizeCamelCase(tableName);
         String changeClassName = StringUtils.toCamelCase(tableName);
 
         // 判断是否去除表前缀
         if (StringUtils.isNotEmpty(genConfig.getPrefix())) {
-            className = StringUtils.toCapitalizeCamelCase(StrUtil.removePrefix(tableName,genConfig.getPrefix()));
-            changeClassName = StringUtils.toCamelCase(StrUtil.removePrefix(tableName,genConfig.getPrefix()));
+            className = StringUtils.toCapitalizeCamelCase(StrUtil.removePrefix(tableName, genConfig.getPrefix()));
+            changeClassName = StringUtils.toCamelCase(StrUtil.removePrefix(tableName, genConfig.getPrefix()));
         }
         map.put("className", className);
         map.put("upperCaseClassName", className.toUpperCase());
         map.put("changeClassName", changeClassName);
-        map.put("hasTimestamp",false);
-        map.put("queryHasTimestamp",false);
-        map.put("queryHasBigDecimal",false);
-        map.put("hasBigDecimal",false);
-        map.put("hasQuery",false);
-        map.put("auto",false);
-
-        List<Map<String,Object>> columns = new ArrayList<>();
-        List<Map<String,Object>> queryColumns = new ArrayList<>();
+        map.put("hasTimestamp", false);
+        map.put("queryHasTimestamp", false);
+        map.put("queryHasBigDecimal", false);
+        map.put("hasBigDecimal", false);
+        map.put("hasQuery", false);
+        map.put("auto", false);
+
+        List<Map<String, Object>> columns = new ArrayList<>();
+        List<Map<String, Object>> queryColumns = new ArrayList<>();
         for (ColumnInfo column : columnInfos) {
-            Map<String,Object> listMap = new HashMap<>();
-            listMap.put("columnComment",column.getColumnComment());
-            listMap.put("columnKey",column.getColumnKey());
+            Map<String, Object> listMap = new HashMap<>();
+            listMap.put("columnComment", column.getColumnComment());
+            listMap.put("columnKey", column.getColumnKey());
 
             String colType = ColUtil.cloToJava(column.getColumnType().toString());
             String changeColumnName = StringUtils.toCamelCase(column.getColumnName().toString());
             String capitalColumnName = StringUtils.toCapitalizeCamelCase(column.getColumnName().toString());
-            if(PK.equals(column.getColumnKey())){
-                map.put("pkColumnType",colType);
-                map.put("pkChangeColName",changeColumnName);
-                map.put("pkCapitalColName",capitalColumnName);
+            if (PK.equals(column.getColumnKey())) {
+                map.put("pkColumnType", colType);
+                map.put("pkChangeColName", changeColumnName);
+                map.put("pkCapitalColName", capitalColumnName);
             }
-            if(TIMESTAMP.equals(colType)){
-                map.put("hasTimestamp",true);
+            if (TIMESTAMP.equals(colType)) {
+                map.put("hasTimestamp", true);
             }
-            if(BIGDECIMAL.equals(colType)){
-                map.put("hasBigDecimal",true);
+            if (BIGDECIMAL.equals(colType)) {
+                map.put("hasBigDecimal", true);
             }
-            if(EXTRA.equals(column.getExtra())){
-                map.put("auto",true);
+            if (EXTRA.equals(column.getExtra())) {
+                map.put("auto", true);
             }
-            listMap.put("columnType",colType);
-            listMap.put("columnName",column.getColumnName());
-            listMap.put("isNullable",column.getIsNullable());
-            listMap.put("columnShow",column.getColumnShow());
-            listMap.put("changeColumnName",changeColumnName);
-            listMap.put("capitalColumnName",capitalColumnName);
+            listMap.put("columnType", colType);
+            listMap.put("columnName", column.getColumnName());
+            listMap.put("isNullable", column.getIsNullable());
+            listMap.put("columnShow", column.getColumnShow());
+            listMap.put("changeColumnName", changeColumnName);
+            listMap.put("capitalColumnName", capitalColumnName);
 
             // 判断是否有查询，如有则把查询的字段set进columnQuery
-            if(!StringUtils.isBlank(column.getColumnQuery())){
-                listMap.put("columnQuery",column.getColumnQuery());
-                map.put("hasQuery",true);
-                if(TIMESTAMP.equals(colType)){
-                    map.put("queryHasTimestamp",true);
+            if (!StringUtils.isBlank(column.getColumnQuery())) {
+                listMap.put("columnQuery", column.getColumnQuery());
+                map.put("hasQuery", true);
+                if (TIMESTAMP.equals(colType)) {
+                    map.put("queryHasTimestamp", true);
                 }
-                if(BIGDECIMAL.equals(colType)){
-                    map.put("queryHasBigDecimal",true);
+                if (BIGDECIMAL.equals(colType)) {
+                    map.put("queryHasBigDecimal", true);
                 }
                 queryColumns.add(listMap);
             }
             columns.add(listMap);
         }
-        map.put("columns",columns);
-        map.put("queryColumns",queryColumns);
+        map.put("columns", columns);
+        map.put("queryColumns", queryColumns);
         TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH));
 
         // 生成后端代码
         List<String> templates = getAdminTemplateNames();
         for (String templateName : templates) {
-            Template template = engine.getTemplate("generator/admin/"+templateName+".ftl");
-            String filePath = getAdminFilePath(templateName,genConfig,className);
+            Template template = engine.getTemplate("generator/admin/" + templateName + ".ftl");
+            String filePath = getAdminFilePath(templateName, genConfig, className);
 
             assert filePath != null;
             File file = new File(filePath);
 
             // 如果非覆盖生成
-            if(!genConfig.getCover() && FileUtil.exist(file)){
+            if (!genConfig.getCover() && FileUtil.exist(file)) {
                 continue;
             }
             // 生成代码
@@ -165,14 +168,14 @@ public class GenUtil {
         // 生成前端代码
         templates = getFrontTemplateNames();
         for (String templateName : templates) {
-            Template template = engine.getTemplate("generator/front/"+templateName+".ftl");
-            String filePath = getFrontFilePath(templateName,genConfig,map.get("changeClassName").toString());
+            Template template = engine.getTemplate("generator/front/" + templateName + ".ftl");
+            String filePath = getFrontFilePath(templateName, genConfig, map.get("changeClassName").toString());
 
             assert filePath != null;
             File file = new File(filePath);
 
             // 如果非覆盖生成
-            if(!genConfig.getCover() && FileUtil.exist(file)){
+            if (!genConfig.getCover() && FileUtil.exist(file)) {
                 continue;
             }
             // 生成代码
@@ -187,33 +190,31 @@ public class GenUtil {
 
         String packagePath = genConfig.getPath();
         if ("Entity".equals(templateName)) {
-            return packagePath +  File.separator+ "entity" + File.separator + className + ".java";
+            return packagePath + File.separator + "entity" + File.separator + className + ".java";
         }
 
         if ("Controller".equals(templateName)) {
-            return packagePath +  File.separator+ "controller" + File.separator + className + "Controller.java";
+            return packagePath + File.separator + "controller" + File.separator + className + "Controller.java";
         }
 
         if ("Service".equals(templateName)) {
-            return packagePath +  File.separator+ "service" + File.separator +"I"+ className + "Service.java";
+            return packagePath + File.separator + "service" + File.separator + "I" + className + "Service.java";
         }
 
         if ("ServiceImpl".equals(templateName)) {
-            return packagePath +  File.separator+ "service" + File.separator + "impl" + File.separator + className + "ServiceImpl.java";
+            return packagePath + File.separator + "service" + File.separator + "impl" + File.separator + className + "ServiceImpl.java";
         }
 
         if ("menu.sql".equals(templateName)) {
-            return packagePath +  File.separator + className + ".sql";
+            return packagePath + File.separator + className + ".sql";
         }
 
 
-
         if ("Mapper".equals(templateName)) {
-            return packagePath +  File.separator + "mapper" + File.separator + className + "Mapper.java";
+            return packagePath + File.separator + "mapper" + File.separator + className + "Mapper.java";
         }
 
 
-
         return null;
     }
 
@@ -228,17 +229,17 @@ public class GenUtil {
         }
 
         if ("index".equals(templateName)) {
-            return path + File.separator +apiName+ File.separator + "index.vue";
+            return path + File.separator + apiName + File.separator + "index.vue";
         }
 
         if ("eForm".equals(templateName)) {
-            return path  + File.separator +apiName+ File.separator + "components" + File.separator +  "detail.vue";
+            return path + File.separator + apiName + File.separator + "components" + File.separator + "detail.vue";
         }
         if ("add".equals(templateName)) {
-            return path + File.separator +apiName + File.separator + File.separator + "add.vue";
+            return path + File.separator + apiName + File.separator + File.separator + "add.vue";
         }
         if ("update".equals(templateName)) {
-            return path + File.separator +apiName + File.separator + File.separator + "update.vue";
+            return path + File.separator + apiName + File.separator + File.separator + "update.vue";
         }
         return null;
     }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/util/GenUtils1.java b/mallplus-admin/src/main/java/com/zscat/mallplus/util/GenUtils1.java
index 79b82da6aec107e3c6dd1754f59822a675dec47f..3131c0c70feb1afdc8d678c173c3b5dea322f53e 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/util/GenUtils1.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/util/GenUtils1.java
@@ -21,6 +21,16 @@ import java.util.zip.ZipOutputStream;
 */
 /**
  * 代码生成器   工具类
+ * <p>
+ * 生成代码
+ * <p>
+ * 列名转换成Java属性名
+ * <p>
+ * 表名转换成Java类名
+ * <p>
+ * 获取配置信息
+ * <p>
+ * 获取文件名
  *//*
 
 public class GenUtils1 {
@@ -48,8 +58,8 @@ public class GenUtils1 {
 
     */
 /**
-     * 生成代码
-     *//*
+ * 生成代码
+ *//*
 
 
 
@@ -164,8 +174,8 @@ public class GenUtils1 {
 
     */
 /**
-     * 列名转换成Java属性名
-     *//*
+ * 列名转换成Java属性名
+ *//*
 
     public static String columnToJava(String columnName) {
         return WordUtils.capitalizeFully(columnName, new char[]{'_'}).replace("_", "");
@@ -173,8 +183,8 @@ public class GenUtils1 {
 
     */
 /**
-     * 表名转换成Java类名
-     *//*
+ * 表名转换成Java类名
+ *//*
 
     public static String tableToJava(String tableName, String tablePrefix, String autoRemovePre) {
         if (Constant.AUTO_REOMVE_PRE.equals(autoRemovePre)) {
@@ -189,8 +199,8 @@ public class GenUtils1 {
 
     */
 /**
-     * 获取配置信息
-     *//*
+ * 获取配置信息
+ *//*
 
     public static Configuration getConfig() {
         try {
@@ -202,8 +212,8 @@ public class GenUtils1 {
 
     */
 /**
-     * 获取文件名
-     *//*
+ * 获取文件名
+ *//*
 
     public static String getFileName(String module, String template, String classname, String className, String packageName, String Module) {
         String packagePath = "main" + File.separator + "java" + File.separator;
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/util/JsonUtil.java b/mallplus-admin/src/main/java/com/zscat/mallplus/util/JsonUtil.java
index 9a730c5d4cab90eeaed87abab7d4f7103abf1ce7..bc7bd3e5b2c6164638b9ea16be905ce33ce8bcce 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/util/JsonUtil.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/util/JsonUtil.java
@@ -278,7 +278,7 @@ public class JsonUtil {
      *
      * @param @param  jsondata
      * @param @return 设定文件
-     * @return Map<String                                                               ,                                                               Map                                                               <                                                               String                                                               ,                                                               Object>>    返回类型
+     * @return Map<String, Map < String, Object>>    返回类型
      * @throws
      * @Title: readJsonMap
      * @Description: TODO(这里用一句话描述这个方法的作用)
@@ -398,5 +398,4 @@ public class JsonUtil {
     }
 
 
-
 }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/util/PageUtil.java b/mallplus-admin/src/main/java/com/zscat/mallplus/util/PageUtil.java
index 5782167b4f35e05debeab14b24153a30b9895c05..ccd91588a685733787488df2d236fac2e1f23fa1 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/util/PageUtil.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/util/PageUtil.java
@@ -9,6 +9,7 @@ import java.util.Map;
 
 /**
  * 分页工具
+ *
  * @author Zheng Jie
  * @date 2018-12-10
  */
@@ -17,36 +18,36 @@ public class PageUtil extends cn.hutool.core.util.PageUtil {
     /**
      * List 分页
      */
-    public static List toPage(int page, int size , List list) {
+    public static List toPage(int page, int size, List list) {
         int fromIndex = page * size;
         int toIndex = page * size + size;
 
-        if(fromIndex > list.size()){
+        if (fromIndex > list.size()) {
             return new ArrayList();
-        } else if(toIndex >= list.size()) {
-            return list.subList(fromIndex,list.size());
+        } else if (toIndex >= list.size()) {
+            return list.subList(fromIndex, list.size());
         } else {
-            return list.subList(fromIndex,toIndex);
+            return list.subList(fromIndex, toIndex);
         }
     }
 
     /**
      * Page 数据处理，预防redis反序列化报错
      */
-    public static Map<String,Object> toPage(Page page) {
-        Map<String,Object> map = new LinkedHashMap<>(2);
-        map.put("content",page.getContent());
-        map.put("totalElements",page.getTotalElements());
+    public static Map<String, Object> toPage(Page page) {
+        Map<String, Object> map = new LinkedHashMap<>(2);
+        map.put("content", page.getContent());
+        map.put("totalElements", page.getTotalElements());
         return map;
     }
 
     /**
      * 自定义分页
      */
-    public static Map<String,Object> toPage(Object object, Object totalElements) {
-        Map<String,Object> map = new LinkedHashMap<>(2);
-        map.put("content",object);
-        map.put("totalElements",totalElements);
+    public static Map<String, Object> toPage(Object object, Object totalElements) {
+        Map<String, Object> map = new LinkedHashMap<>(2);
+        map.put("content", object);
+        map.put("totalElements", totalElements);
 
         return map;
     }
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/util/QiNiuUtil.java b/mallplus-admin/src/main/java/com/zscat/mallplus/util/QiNiuUtil.java
index bc54a0563ce0963b47222fa69448b9863a517118..4b9ee8a06fd715e69adc121b88a4c6d616542128 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/util/QiNiuUtil.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/util/QiNiuUtil.java
@@ -7,6 +7,7 @@ import java.util.Date;
 
 /**
  * 七牛云存储工具类
+ *
  * @author mallplus
  * @date 2018-12-31
  */
@@ -22,18 +23,19 @@ public class QiNiuUtil {
 
     /**
      * 得到机房的对应关系
+     *
      * @param zone 机房名称
      * @return Region
      */
-    public static Region getRegion(String zone){
+    public static Region getRegion(String zone) {
 
-        if(HUAD.equals(zone)){
+        if (HUAD.equals(zone)) {
             return Region.huadong();
-        } else if(HUAB.equals(zone)){
+        } else if (HUAB.equals(zone)) {
             return Region.huabei();
-        } else if(HUAN.equals(zone)){
+        } else if (HUAN.equals(zone)) {
             return Region.huanan();
-        } else if (BEIM.equals(zone)){
+        } else if (BEIM.equals(zone)) {
             return Region.beimei();
             // 否则就是东南亚
         } else {
@@ -43,10 +45,11 @@ public class QiNiuUtil {
 
     /**
      * 默认不指定key的情况下，以文件内容的hash值作为文件名
+     *
      * @param file 文件名
      * @return String
      */
-    public static String getKey(String file){
+    public static String getKey(String file) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
         Date date = new Date();
         return FileUtil.getFileNameNoEx(file) + "-" +
diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/util/StringUtils.java b/mallplus-admin/src/main/java/com/zscat/mallplus/util/StringUtils.java
index 3ed298ec2feb825e76325fc10aeda8606a8c6cb4..070ffa18e11e6c4998ba082b1518882ea06829af 100644
--- a/mallplus-admin/src/main/java/com/zscat/mallplus/util/StringUtils.java
+++ b/mallplus-admin/src/main/java/com/zscat/mallplus/util/StringUtils.java
@@ -115,7 +115,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         if (ip.contains(",")) {
             ip = ip.split(",")[0];
         }
-        if  ("127.0.0.1".equals(ip))  {
+        if ("127.0.0.1".equals(ip)) {
             // 获取本机真正的ip地址
             try {
                 ip = InetAddress.getLocalHost().getHostAddress();
@@ -127,17 +127,16 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
     }
 
 
-
     /**
      * 获得当天是周几
      */
-    public static String getWeekDay(){
+    public static String getWeekDay() {
         String[] weekDays = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
         Calendar cal = Calendar.getInstance();
         cal.setTime(new Date());
 
         int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
-        if (w < 0){
+        if (w < 0) {
             w = 0;
         }
         return weekDays[w];
diff --git a/mallplus-admin/src/main/resources/application-dev.properties b/mallplus-admin/src/main/resources/application-dev.properties
index 7b37709f082ab3cbc68a4e29c0ee53ef0589a5ec..73f245f88cfda3971cb3434b6c0a741ccde6cda3 100644
--- a/mallplus-admin/src/main/resources/application-dev.properties
+++ b/mallplus-admin/src/main/resources/application-dev.properties
@@ -1,4 +1,4 @@
-spring.datasource.url=jdbc:mysql://39.106.212.32:3306/mallplus?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
+spring.datasource.url=jdbc:mysql://localhost:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=UTC
 spring.datasource.username=root
 spring.datasource.password=root@123
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
diff --git a/mallplus-admin/src/main/resources/application-prod.properties b/mallplus-admin/src/main/resources/application-prod.properties
index 73287a410c34afa8b06515431d53633dcc232d51..779de324d28956b8dca905546b4bfbc77f14320b 100644
--- a/mallplus-admin/src/main/resources/application-prod.properties
+++ b/mallplus-admin/src/main/resources/application-prod.properties
@@ -1,4 +1,4 @@
-spring.datasource.url=jdbc:mysql://39.106.212.32:3306/mallplus1?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
+spring.datasource.url=jdbc:mysql://39.106.212.32:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=UTC
 spring.datasource.username=root
 spring.datasource.password=root@123
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
@@ -37,13 +37,13 @@ mybatis-plus.configuration.map-underscore-to-camel-case=true
 mybatis-plus.configuration.cache-enabled=false
 #===redis start===
 # Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
-spring.redis.database=1
+spring.redis.database=5
 # Redis\u670D\u52A1\u5668\u5730\u5740
 spring.redis.host=39.106.212.32
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
 spring.redis.port=6379
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
-spring.redis.password=password
+spring.redis.password=
 # \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 spring.redis.pool.max-active=8
 # \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
diff --git a/mallplus-admin/src/main/resources/application.properties b/mallplus-admin/src/main/resources/application.properties
index f1a1d0207139b9d663102523fb54ac2b0700fdd2..a708525e8256609cf6a8a7b1dbea39c6bdf769d1 100644
--- a/mallplus-admin/src/main/resources/application.properties
+++ b/mallplus-admin/src/main/resources/application.properties
@@ -1,6 +1,8 @@
 #\u9ED8\u8BA4\u4E3A\u5F00\u53D1\u73AF\u5883
 spring.profiles.active=prod
 server.port=8085
+
+spring.jackson.time-zone=GMT+8
 #===mybatis start===
 redis.key.prefix.authCode=admin:authCode:
 redis.key.prefix.orderId=admin:orderId:
@@ -39,7 +41,7 @@ jwt.tokenHead=Bearer
 #===JWT end===
 #===OSS start===
 aliyun.oss.endpoint=oss-cn-beijing.aliyuncs.com
-aliyun.oss.accessKeyId=5Jii89BFukxmun5j
+aliyun.oss.accessKeyId=LTAI4FhoMuUqdigjDnFT1bY6
 aliyun.oss.accessKeySecret=JvE9FcILlHu5gClmAJr89ZkEv00l9s
 aliyun.oss.bucketName=yjlive160322
 aliyun.oss.policy.expire=300
@@ -52,9 +54,8 @@ qiniu.secretKey=1iUDYRKdibiVP-WZLrGoErtdWWCqYWXjKUbQtAYQ
 qiniu.bucketName=j5shop
 qiniu.basePath=http://p0bt2oaom.bkt.clouddn.com/
 qiniu.max-size=15
-
 oss.type=1
-oss.aliyun.first.accessKeyId=5Jii89BFukxmun5j
+oss.aliyun.first.accessKeyId=LTAI4FhoMuUqdigjDnFT1bY6
 oss.aliyun.first.accessKeySecret=JvE9FcILlHu5gClmAJr89ZkEv00l9s
 oss.aliyun.first.bucketName=yjlive160322
 oss.aliyun.first.endPoint=oss-cn-beijing.aliyuncs.com
@@ -67,7 +68,7 @@ oss.aliyun.second.endPoint=oss-cn-beijing.aliyuncs.com
 oss.aliyun.second.styleName=
 oss.aliyun.second.prefix=user
 oss.aliyun.domain=http://yjlive160322.oss-cn-beijing.aliyuncs.com/
-oss.aliyun.defalut.accessKeyId=5Jii89BFukxmun5j
+oss.aliyun.defalut.accessKeyId=LTAI4FhoMuUqdigjDnFT1bY6
 oss.aliyun.defalut.accessKeySecret=JvE9FcILlHu5gClmAJr89ZkEv00l9s
 oss.aliyun.defalut.bucketName=yjlive160322
 oss.aliyun.defalut.endPoint=oss-cn-beijing.aliyuncs.com
diff --git a/mallplus-admin/src/main/resources/template/email/email.ftl b/mallplus-admin/src/main/resources/template/email/email.ftl
index 3a1863582c4ec46c47164a81c82be0c5ca8d7f9c..7eb0a7954c72f89451385a8223237afbe8ab7788 100644
--- a/mallplus-admin/src/main/resources/template/email/email.ftl
+++ b/mallplus-admin/src/main/resources/template/email/email.ftl
@@ -21,7 +21,7 @@
     <div style="padding: 10px;padding-bottom: 0px;">
         <p style="margin-bottom: 10px;padding-bottom: 0px;">尊敬的用户，您好：</p>
         <p style="text-indent: 2em; margin-bottom: 10px;">您正在申请邮箱验证，您的验证码为：</p>
-            <p style="text-align: center;
+        <p style="text-align: center;
 			font-family: Times New Roman;
 			font-size: 22px;
 			color: #C60024;
@@ -34,7 +34,9 @@
 			maigin-bottom: 10px;
 			font-size: 14px;
             color: #555;">
-            <p style="line-height: 12px;">Github：<a hover="color: #DA251D;" style="color: #999;" href="https://github.com/elunez/eladmin" target="_blank">https://github.com/elunez/eladmin</a></p>
+            <p style="line-height: 12px;">Github：<a hover="color: #DA251D;" style="color: #999;"
+                                                    href="https://github.com/elunez/eladmin" target="_blank">https://github.com/elunez/eladmin</a>
+            </p>
         </div>
         <div class="foot-hr hr" style="margin: 0 auto;
 			z-index: 111;
@@ -46,7 +48,7 @@
 			font-size: 12px;
 			padding: 20px 0px;
 			font-family: Microsoft YaHei;">
-                Copyright &copy;${.now?string("yyyy")} EL-ADMIN 后台管理系统 All Rights Reserved.
+            Copyright &copy;${.now?string("yyyy")} EL-ADMIN 后台管理系统 All Rights Reserved.
         </div>
 
     </div>
diff --git a/mallplus-admin/src/main/resources/template/generator/admin/Controller.ftl b/mallplus-admin/src/main/resources/template/generator/admin/Controller.ftl
index 169ad117cfb7abeee99982e7fae58bb91719052c..824602b80fba8d5b8fc886c9cc83282f76aa2de1 100644
--- a/mallplus-admin/src/main/resources/template/generator/admin/Controller.ftl
+++ b/mallplus-admin/src/main/resources/template/generator/admin/Controller.ftl
@@ -43,113 +43,113 @@ public Object get${className}ByPage(${className} entity,
 ) {
 try {
 return new CommonResult().success(I${className}Service.page(new Page<${className}>(pageNum, pageSize), new QueryWrapper<>(entity)));
-    } catch (Exception e) {
-    log.error("根据条件查询所有${prefix}列表：%s", e.getMessage(), e);
-    }
-    return new CommonResult().failed();
-    }
-
-    @SysLog(MODULE = "${moduleName}", REMARK = "保存${prefix}")
-    @ApiOperation("保存${prefix}")
-    @PostMapping(value = "/create")
-    @PreAuthorize("hasAuthority('${moduleName}:${changeClassName}:create')")
-    public Object save${className}(@RequestBody ${className} entity) {
-    try {
+} catch (Exception e) {
+log.error("根据条件查询所有${prefix}列表：%s", e.getMessage(), e);
+}
+return new CommonResult().failed();
+}
+
+@SysLog(MODULE = "${moduleName}", REMARK = "保存${prefix}")
+@ApiOperation("保存${prefix}")
+@PostMapping(value = "/create")
+@PreAuthorize("hasAuthority('${moduleName}:${changeClassName}:create')")
+public Object save${className}(@RequestBody ${className} entity) {
+try {
 
-    if (I${className}Service.save(entity)) {
-    return new CommonResult().success();
-    }
-    } catch (Exception e) {
-    log.error("保存${prefix}：%s", e.getMessage(), e);
-    return new CommonResult().failed(e.getMessage());
-    }
+if (I${className}Service.save(entity)) {
+return new CommonResult().success();
+}
+} catch (Exception e) {
+log.error("保存${prefix}：%s", e.getMessage(), e);
+return new CommonResult().failed(e.getMessage());
+}
+return new CommonResult().failed();
+}
+
+@SysLog(MODULE = "${moduleName}", REMARK = "更新${prefix}")
+@ApiOperation("更新${prefix}")
+@PostMapping(value = "/update/{id}")
+@PreAuthorize("hasAuthority('${moduleName}:${changeClassName}:update')")
+public Object update${className}(@RequestBody ${className} entity) {
+try {
+if (I${className}Service.updateById(entity)) {
+return new CommonResult().success();
+}
+} catch (Exception e) {
+log.error("更新${prefix}：%s", e.getMessage(), e);
+return new CommonResult().failed(e.getMessage());
+}
+return new CommonResult().failed();
+}
+
+@SysLog(MODULE = "${moduleName}", REMARK = "删除${prefix}")
+@ApiOperation("删除${prefix}")
+@GetMapping(value = "/delete/{id}")
+@PreAuthorize("hasAuthority('${moduleName}:${changeClassName}:delete')")
+public Object delete${className}(@ApiParam("${prefix}id") @PathVariable Long id) {
+try {
+if (ValidatorUtils.empty(id)) {
+return new CommonResult().paramFailed("${prefix}id");
+}
+if (I${className}Service.removeById(id)) {
+return new CommonResult().success();
+}
+} catch (Exception e) {
+log.error("删除${prefix}：%s", e.getMessage(), e);
+return new CommonResult().failed(e.getMessage());
+}
+return new CommonResult().failed();
+}
+
+@SysLog(MODULE = "${moduleName}", REMARK = "给${prefix}分配${prefix}")
+@ApiOperation("查询${prefix}明细")
+@GetMapping(value = "/{id}")
+@PreAuthorize("hasAuthority('${moduleName}:${changeClassName}:read')")
+public Object get${className}ById(@ApiParam("${prefix}id") @PathVariable Long id) {
+try {
+if (ValidatorUtils.empty(id)) {
+return new CommonResult().paramFailed("${prefix}id");
+}
+${className} coupon = I${className}Service.getById(id);
+return new CommonResult().success(coupon);
+} catch (Exception e) {
+log.error("查询${prefix}明细：%s", e.getMessage(), e);
+return new CommonResult().failed();
+}
+
+}
+
+@ApiOperation(value = "批量删除${prefix}")
+@RequestMapping(value = "/delete/batch", method = RequestMethod.GET)
+@SysLog(MODULE = "${moduleName}", REMARK = "批量删除${prefix}")
+@PreAuthorize("hasAuthority('${moduleName}:${changeClassName}:delete')")
+public Object deleteBatch(@RequestParam("ids") List
+<Long> ids) {
+    boolean count = I${className}Service.removeByIds(ids);
+    if (count) {
+    return new CommonResult().success(count);
+    } else {
     return new CommonResult().failed();
     }
-
-    @SysLog(MODULE = "${moduleName}", REMARK = "更新${prefix}")
-    @ApiOperation("更新${prefix}")
-    @PostMapping(value = "/update/{id}")
-    @PreAuthorize("hasAuthority('${moduleName}:${changeClassName}:update')")
-    public Object update${className}(@RequestBody ${className} entity) {
-    try {
-    if (I${className}Service.updateById(entity)) {
-    return new CommonResult().success();
-    }
-    } catch (Exception e) {
-    log.error("更新${prefix}：%s", e.getMessage(), e);
-    return new CommonResult().failed(e.getMessage());
-    }
-    return new CommonResult().failed();
     }
 
-    @SysLog(MODULE = "${moduleName}", REMARK = "删除${prefix}")
-    @ApiOperation("删除${prefix}")
-    @GetMapping(value = "/delete/{id}")
-    @PreAuthorize("hasAuthority('${moduleName}:${changeClassName}:delete')")
-    public Object delete${className}(@ApiParam("${prefix}id") @PathVariable Long id) {
-    try {
-    if (ValidatorUtils.empty(id)) {
-    return new CommonResult().paramFailed("${prefix}id");
-    }
-    if (I${className}Service.removeById(id)) {
-    return new CommonResult().success();
-    }
-    } catch (Exception e) {
-    log.error("删除${prefix}：%s", e.getMessage(), e);
-    return new CommonResult().failed(e.getMessage());
-    }
-    return new CommonResult().failed();
-    }
 
-    @SysLog(MODULE = "${moduleName}", REMARK = "给${prefix}分配${prefix}")
-    @ApiOperation("查询${prefix}明细")
-    @GetMapping(value = "/{id}")
-    @PreAuthorize("hasAuthority('${moduleName}:${changeClassName}:read')")
-    public Object get${className}ById(@ApiParam("${prefix}id") @PathVariable Long id) {
-    try {
-    if (ValidatorUtils.empty(id)) {
-    return new CommonResult().paramFailed("${prefix}id");
-    }
-    ${className} coupon = I${className}Service.getById(id);
-    return new CommonResult().success(coupon);
-    } catch (Exception e) {
-    log.error("查询${prefix}明细：%s", e.getMessage(), e);
-    return new CommonResult().failed();
-    }
+    @SysLog(MODULE = "${moduleName}", REMARK = "导出社区数据")
+    @GetMapping("/exportExcel")
+    public void export(HttpServletResponse response, ${className} entity) {
+    // 模拟从数据库获取需要导出的数据
+    List<${className}> personList = I${className}Service.list(new QueryWrapper<>(entity));
+    // 导出操作
+    EasyPoiUtils.exportExcel(personList, "导出社区数据", "社区数据", ${className}.class, "导出社区数据.xls", response);
 
     }
 
-    @ApiOperation(value = "批量删除${prefix}")
-    @RequestMapping(value = "/delete/batch", method = RequestMethod.GET)
-    @SysLog(MODULE = "${moduleName}", REMARK = "批量删除${prefix}")
-    @PreAuthorize("hasAuthority('${moduleName}:${changeClassName}:delete')")
-    public Object deleteBatch(@RequestParam("ids") List<Long> ids) {
-        boolean count = I${className}Service.removeByIds(ids);
-        if (count) {
-        return new CommonResult().success(count);
-        } else {
-        return new CommonResult().failed();
-        }
-        }
-
-
-
-        @SysLog(MODULE = "${moduleName}", REMARK = "导出社区数据")
-        @GetMapping("/exportExcel")
-        public void export(HttpServletResponse response, ${className} entity) {
-        // 模拟从数据库获取需要导出的数据
-        List<${className}> personList = I${className}Service.list(new QueryWrapper<>(entity));
-            // 导出操作
-            EasyPoiUtils.exportExcel(personList, "导出社区数据", "社区数据", ${className}.class, "导出社区数据.xls", response);
-
-            }
-
-            @SysLog(MODULE = "${moduleName}", REMARK = "导入社区数据")
-            @PostMapping("/importExcel")
-            public void importUsers(@RequestParam MultipartFile file) {
-            List<${className}> personList = EasyPoiUtils.importExcel(file, ${className}.class);
-                I${className}Service.saveBatch(personList);
-                }
-                }
+    @SysLog(MODULE = "${moduleName}", REMARK = "导入社区数据")
+    @PostMapping("/importExcel")
+    public void importUsers(@RequestParam MultipartFile file) {
+    List<${className}> personList = EasyPoiUtils.importExcel(file, ${className}.class);
+    I${className}Service.saveBatch(personList);
+    }
+    }
 
 
diff --git a/mallplus-admin/src/main/resources/template/generator/admin/Entity.ftl b/mallplus-admin/src/main/resources/template/generator/admin/Entity.ftl
index 3ca86d91933339a19c8234d1507b6b2e82bec1b2..760f305368b2148d09ab478f59c084aa9bccc547 100644
--- a/mallplus-admin/src/main/resources/template/generator/admin/Entity.ftl
+++ b/mallplus-admin/src/main/resources/template/generator/admin/Entity.ftl
@@ -11,17 +11,17 @@ import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
 <#if hasTimestamp>
-import java.sql.Timestamp;
+    import java.sql.Timestamp;
 </#if>
 <#if hasBigDecimal>
-import java.math.BigDecimal;
+    import java.math.BigDecimal;
 </#if>
 import java.io.Serializable;
 
 /**
 * @author ${author}
 * @date ${date}
-        ${prefix}
+${prefix}
 */
 @Data
 @TableName("${tableName}")
@@ -29,13 +29,14 @@ public class ${className} implements Serializable {
 <#if columns??>
     <#list columns as column>
 
-<#if column.columnKey??>
-    <#if column.columnKey = 'PRI'>
-        @TableId(value = "id", type = IdType.AUTO)
-    </#if>
-</#if>
-    @TableField( "${column.columnName}")
-    private ${column.columnType} ${column.changeColumnName};
+
+        <#if column.changeColumnName = 'id'>
+            @TableId(value = "id", type = IdType.AUTO)
+        </#if>
+        <#if column.changeColumnName != 'id'>
+            @TableField( "${column.columnName}")
+        </#if>
+        private ${column.columnType} ${column.changeColumnName};
     </#list>
 </#if>
 
diff --git a/mallplus-admin/src/main/resources/template/generator/admin/ServiceImpl.ftl b/mallplus-admin/src/main/resources/template/generator/admin/ServiceImpl.ftl
index 97ebd9e8224dece509e8f1bc51e0f1be667aac73..f80189c3faf1d52722802fea9e5367e79959be93 100644
--- a/mallplus-admin/src/main/resources/template/generator/admin/ServiceImpl.ftl
+++ b/mallplus-admin/src/main/resources/template/generator/admin/ServiceImpl.ftl
@@ -11,10 +11,11 @@ import javax.annotation.Resource;
 * @date ${date}
 */
 @Service
-public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${className}> implements I${className}Service {
+public class ${className}ServiceImpl extends ServiceImpl
+<${className}Mapper, ${className}> implements I${className}Service {
 
-    @Resource
-    private  ${className}Mapper ${changeClassName}Mapper;
+@Resource
+private  ${className}Mapper ${changeClassName}Mapper;
 
 
 }
diff --git a/mallplus-admin/src/main/resources/template/generator/admin/menu.sql.ftl b/mallplus-admin/src/main/resources/template/generator/admin/menu.sql.ftl
index 9fa97ed6a72acaa7300cc9e7b6d18746626d8ff2..d95ea5d467d26af90c9c0bb609c9a4623c6d969b 100644
--- a/mallplus-admin/src/main/resources/template/generator/admin/menu.sql.ftl
+++ b/mallplus-admin/src/main/resources/template/generator/admin/menu.sql.ftl
@@ -1,16 +1,13 @@
-
-
 -- 菜单对应按钮SQL
 
 insert into `sys_permission` ( `name`, `pid`, `status`, `sort`, `value`, `type`, `create_time`, `uri`, `icon`) values
- ( '${prefix}列表', '47', '1', '0', '${moduleName}:${changeClassName}:read', '1', '2018-09-29 16:18:51', '${changeClassName}', null);
- insert into `sys_permission` ( `name`, `pid`, `status`, `sort`, `value`, `type`, `create_time`, `uri`, `icon`) values
- ( '添加${prefix}', '47', '1', '0', '${moduleName}:${changeClassName}:create', '2', '2018-09-29 16:18:51', 'add${className}', null);
- insert into `sys_permission` ( `name`, `pid`, `status`, `sort`, `value`, `type`, `create_time`, `uri`, `icon`) values
- ( '修改${prefix}', '47', '1', '0', '${moduleName}:${changeClassName}:update', '2', '2018-09-29 16:18:51', 'update${className}', null);
- insert into `sys_permission` ( `name`, `pid`, `status`, `sort`, `value`, `type`, `create_time`, `uri`, `icon`) values
- ( '删除${prefix}', '47', '1', '0', '${moduleName}:${changeClassName}:delete', '2', '2018-09-29 16:18:51', 'delete${className}', null);
-
+( '${prefix}列表', '47', '1', '0', '${moduleName}:${changeClassName}:read', '1', '2018-09-29 16:18:51', '${changeClassName}', null);
+insert into `sys_permission` ( `name`, `pid`, `status`, `sort`, `value`, `type`, `create_time`, `uri`, `icon`) values
+( '添加${prefix}', '47', '1', '0', '${moduleName}:${changeClassName}:create', '2', '2018-09-29 16:18:51', 'add${className}', null);
+insert into `sys_permission` ( `name`, `pid`, `status`, `sort`, `value`, `type`, `create_time`, `uri`, `icon`) values
+( '修改${prefix}', '47', '1', '0', '${moduleName}:${changeClassName}:update', '2', '2018-09-29 16:18:51', 'update${className}', null);
+insert into `sys_permission` ( `name`, `pid`, `status`, `sort`, `value`, `type`, `create_time`, `uri`, `icon`) values
+( '删除${prefix}', '47', '1', '0', '${moduleName}:${changeClassName}:delete', '2', '2018-09-29 16:18:51', 'delete${className}', null);
 
 
 {
diff --git a/mallplus-admin/src/main/resources/template/generator/front/eForm.ftl b/mallplus-admin/src/main/resources/template/generator/front/eForm.ftl
index 9129135994c674116d160b64b1a9c18b66fd6e2b..e7f74398ba40ff59075bff3bf0bb45042b61a182 100644
--- a/mallplus-admin/src/main/resources/template/generator/front/eForm.ftl
+++ b/mallplus-admin/src/main/resources/template/generator/front/eForm.ftl
@@ -1,162 +1,165 @@
 <template> 
-  <el-card class="form-container" shadow="never">
-    <el-form  :model="${changeClassName}" :rules="rules" ref="${className}From" label-width="150px">
+    <el-card class="form-container" shadow="never">
+        <el-form :model="${changeClassName}" :rules="rules" ref="${className}From" label-width="150px">
 
-      <#if columns??>
-        <#list columns as column>
+            <#if columns??>
+                <#list columns as column>
 
-            <el-form-item label="<#if column.columnComment != ''>${column.columnComment}<#else>${column.changeColumnName}</#if>" prop="${column.changeColumnName}">
-              <el-input v-model="${changeClassName}.${column.changeColumnName}" style="width: 370px;"/>
-            </el-form-item>
+                    <el-form-item
+                            label="<#if column.columnComment != ''>${column.columnComment}<#else>${column.changeColumnName}</#if>"
+                            prop="${column.changeColumnName}">
+                        <el-input v-model="${changeClassName}.${column.changeColumnName}" style="width: 370px;"/>
+                    </el-form-item>
 
-        </#list>
-      </#if>
+                </#list>
+            </#if>
 
-      <el-form-item>
-        <el-button type="primary" @click="onSubmit('${className}From')">提交</el-button>
-        <el-button v-if="!isEdit" @click="resetForm('${className}From')">重置</el-button>
-      </el-form-item>
-    </el-form>
-  </el-card>
+            <el-form-item>
+                <el-button type="primary" @click="onSubmit('${className}From')">提交</el-button>
+                <el-button v-if="!isEdit" @click="resetForm('${className}From')">重置</el-button>
+            </el-form-item>
+        </el-form>
+    </el-card>
 </template>
 <script>
-  import {create${className}, get${className}, update${className}} from  '@/api/${moduleName}/${changeClassName}'
-  import SingleUpload from '@/components/Upload/singleUpload'
-
-  const default${className}= {
-    name: ''
-  };
-  export default {
-    name: '${className}Detail',
-    components: {SingleUpload},
-    props: {
-      isEdit: {
-        type: Boolean,
-        default: false
-      }
-    },
-    data() {
-      return {
-      ${changeClassName}:
-      Object.assign({},
-    default${className}),
-      rules: {
-        name: [
-          {required: true, message: '请输入品牌名称', trigger: 'blur'},
-          {min: 2, max: 140, message: '长度在 2 到 140 个字符', trigger: 'blur'}
-        ],
-                logo
-      :
-        [
-          {required: true, message: '请输入品牌logo', trigger: 'blur'}
-        ],
-                sort
-      :
-        [
-          {type: 'number', message: '排序必须为数字'}
-        ],
-      }
-    }
-    },
-    created() {
-      if (this.isEdit) {
-        get${className}(this.$route.query.id).then(response => {
-          this.${changeClassName} = response.data;
-      })
-        ;
-      } else {
-        this.${changeClassName} = Object.assign({},
-      default${className})
-        ;
-      }
-    },
-    methods: {
-      onSubmit(formName) {
-        this.$refs[formName].validate((valid) => {
-          if(valid) {
-            this.$confirm('是否提交数据', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              if(this.isEdit
-          )
-            {
-              update${className}(this.$route.query.id, this.${changeClassName}).then(response => {
-                if(response.code == 200
-            )
-              {
-                this.$refs[formName].resetFields();
-                this.$message({
-                  message: '修改成功',
-                  type: 'success',
-                  duration: 1000
-                });
-                this.$router.back();
-              }
-            else
-              {
-                this.$message({
-                  message: response.msg,
-                  type: 'error',
-                  duration: 1000
-                });
-              }
+    import {create${className}, get${className}, update${className}} from '@/api/${moduleName}/${changeClassName}'
+    import SingleUpload from '@/components/Upload/singleUpload'
 
-            })
-              ;
+    const default
+    ${className} = {
+        name: ''
+    };
+    export default {
+        name: '${className}Detail',
+        components: {SingleUpload},
+        props: {
+            isEdit: {
+                type: Boolean,
+                default: false
             }
-          else
-            {
-              create${className}(this.${changeClassName}).then(response => {
-                if(response.code == 200
-            )
-              {
-                this.$refs[formName].resetFields();
+        },
+        data() {
+            return {
+            ${changeClassName}:
+            Object.assign({},
+        default${className}),
+            rules: {
+                name: [
+                    {required: true, message: '请输入品牌名称', trigger: 'blur'},
+                    {min: 2, max: 140, message: '长度在 2 到 140 个字符', trigger: 'blur'}
+                ],
+                    logo
+            :
+                [
+                    {required: true, message: '请输入品牌logo', trigger: 'blur'}
+                ],
+                    sort
+            :
+                [
+                    {type: 'number', message: '排序必须为数字'}
+                ],
+            }
+        }
+        },
+        created() {
+            if (this.isEdit) {
+                get${className}(this.$route.query.id).then(response = > {
+                    this.${changeClassName} = response.data;
+            })
+                ;
+            } else {
                 this.${changeClassName} = Object.assign({},
-              default${className})
+            default${className})
                 ;
-                this.$message({
-                  message: '提交成功',
-                  type: 'success',
-                  duration: 1000
-                });
-                this.$router.back();
-              }
-            else
-              {
-                this.$message({
-                  message: response.msg,
-                  type: 'error',
-                  duration: 1000
-                });
-              }
+            }
+        },
+        methods: {
+            onSubmit(formName) {
+                this.$refs[formName].validate((valid) = > {
+                    if(valid) {
+                        this.$confirm('是否提交数据', '提示', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                            type: 'warning'
+                        }).then(() = > {
+                            if(this.isEdit
+                    )
+                        {
+                            update${className}(this.$route.query.id, this.${changeClassName}).then(response = > {
+                                if(response.code == 200
+                        )
+                            {
+                                this.$refs[formName].resetFields();
+                                this.$message({
+                                    message: '修改成功',
+                                    type: 'success',
+                                    duration: 1000
+                                });
+                                this.$router.back();
+                            }
+                        else
+                            {
+                                this.$message({
+                                    message: response.msg,
+                                    type: 'error',
+                                    duration: 1000
+                                });
+                            }
+
+                        })
+                            ;
+                        }
+                    else
+                        {
+                            create${className}(this.${changeClassName}).then(response = > {
+                                if(response.code == 200
+                        )
+                            {
+                                this.$refs[formName].resetFields();
+                                this.${changeClassName} = Object.assign({},
+                            default${className})
+                                ;
+                                this.$message({
+                                    message: '提交成功',
+                                    type: 'success',
+                                    duration: 1000
+                                });
+                                this.$router.back();
+                            }
+                        else
+                            {
+                                this.$message({
+                                    message: response.msg,
+                                    type: 'error',
+                                    duration: 1000
+                                });
+                            }
+
+                        })
+                            ;
+                        }
+                    })
+                        ;
 
+                    } else {
+                        this.$message({
+                            message: '验证失败',
+                            type: 'error',
+                            duration: 1000
+                        });
+                return false;
+            }
             })
-              ;
+                ;
+            },
+            resetForm(formName) {
+                this.$refs[formName].resetFields();
+                this.${changeClassName} = Object.assign({},
+            default${className})
+                ;
             }
-          })
-            ;
-
-          } else {
-            this.$message({
-              message: '验证失败',
-              type: 'error',
-              duration: 1000
-            });
-        return false;
-      }
-      })
-        ;
-      },
-      resetForm(formName) {
-        this.$refs[formName].resetFields();
-        this.${changeClassName} = Object.assign({},
-      default${className})
-        ;
-      }
+        }
     }
-  }
 </script>
 <style>
 </style>
diff --git a/mallplus-admin/src/main/resources/template/generator/front/index.ftl b/mallplus-admin/src/main/resources/template/generator/front/index.ftl
index 784e810a8cf8ba06fbc5b376a85954596843bf20..fef91e8607660c37feb072e22766088391115fa9 100644
--- a/mallplus-admin/src/main/resources/template/generator/front/index.ftl
+++ b/mallplus-admin/src/main/resources/template/generator/front/index.ftl
@@ -1,236 +1,238 @@
 <template> 
-  <div class="app-container">
-    <el-card class="filter-container" shadow="never">
-      <div>
-        <i class="el-icon-search"></i>
-        <span>筛选搜索</span>
-        <el-button
-                style="float: right"
-                @click="search${className}List()"
-                type="primary"
-                size="small">
-          查询结果
-        </el-button>
-      </div>
-      <div style="margin-top: 15px">
-        <el-form :inline="true" :model="listQuery" size="small" label-width="140px">
-          <el-form-item label="输入搜索：">
-            <el-input style="width: 203px" v-model="listQuery.keyword" placeholder="类型名称/关键字"></el-input>
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-card>
-    <el-card class="operate-container" shadow="never">
-      <i class="el-icon-tickets"></i>
-      <span>数据列表</span>
-      <el-button
-              class="btn-add"
-              @click="add${className}()"
-              size="mini">
-        添加
-      </el-button>
-    </el-card>
-    <div class="table-container">
-      <el-table ref="${changeClassName}Table"
-                :data="list"
-                style="width: 100%"
-                @selection-change="handleSelectionChange"
-                v-loading="listLoading"
-                border>
-        <el-table-column type="selection" width="60" align="center"></el-table-column>
-
-
-        <#if columns??>
-          <#list columns as column>
-            <#if column.columnShow = 'true'>
-
-                <el-table-column prop="${column.changeColumnName}" label="<#if column.columnComment != ''>${column.columnComment}<#else>${column.changeColumnName}</#if>">
-                  <template slot-scope="scope">
-                    {{scope.row.${column.changeColumnName} }}
-                  </template>
-                </el-table-column>
-
-            </#if>
-          </#list>
-        </#if>
-
-        <el-table-column label="操作" width="200" align="center">
-          <template slot-scope="scope">
+    <div class="app-container">
+        <el-card class="filter-container" shadow="never">
+            <div>
+                <i class="el-icon-search"></i>
+                <span>筛选搜索</span>
+                <el-button
+                        style="float: right"
+                        @click="search${className}List()"
+                        type="primary"
+                        size="small">
+                    查询结果
+                </el-button>
+            </div>
+            <div style="margin-top: 15px">
+                <el-form :inline="true" :model="listQuery" size="small" label-width="140px">
+                    <el-form-item label="输入搜索：">
+                        <el-input style="width: 203px" v-model="listQuery.keyword" placeholder="类型名称/关键字"></el-input>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </el-card>
+        <el-card class="operate-container" shadow="never">
+            <i class="el-icon-tickets"></i>
+            <span>数据列表</span>
             <el-button
-                    size="mini"
-                    @click="handleUpdate(scope.$index, scope.row)">编辑
+                    class="btn-add"
+                    @click="add${className}()"
+                    size="mini">
+                添加
             </el-button>
-            <el-button
-                    size="mini"
-                    type="danger"
-                    @click="handleDelete(scope.$index, scope.row)">删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div class="batch-operate-container">
-
-    </div>
-    <div class="pagination-container">
-      <el-pagination
-              background
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              layout="total, sizes,prev, pager, next,jumper"
-              :page-size="listQuery.pageSize"
-              :page-sizes="[5,10,15]"
-              :current-page.sync="listQuery.pageNum"
-              :total="total">
-      </el-pagination>
+        </el-card>
+        <div class="table-container">
+            <el-table ref="${changeClassName}Table"
+                      :data="list"
+                      style="width: 100%"
+                      @selection-change="handleSelectionChange"
+                      v-loading="listLoading"
+                      border>
+                <el-table-column type="selection" width="60" align="center"></el-table-column>
+
+
+                <#if columns??>
+                    <#list columns as column>
+                        <#if column.columnShow = 'true'>
+
+                            <el-table-column prop="${column.changeColumnName}"
+                                             label="<#if column.columnComment != ''>${column.columnComment}<#else>${column.changeColumnName}</#if>">
+                                <template slot-scope="scope">
+                                    {{scope.row.${column.changeColumnName} }}
+                                </template>
+                            </el-table-column>
+
+                        </#if>
+                    </#list>
+                </#if>
+
+                <el-table-column label="操作" width="200" align="center">
+                    <template slot-scope="scope">
+                        <el-button
+                                size="mini"
+                                @click="handleUpdate(scope.$index, scope.row)">编辑
+                        </el-button>
+                        <el-button
+                                size="mini"
+                                type="danger"
+                                @click="handleDelete(scope.$index, scope.row)">删除
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+        <div class="batch-operate-container">
+
+        </div>
+        <div class="pagination-container">
+            <el-pagination
+                    background
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                    layout="total, sizes,prev, pager, next,jumper"
+                    :page-size="listQuery.pageSize"
+                    :page-sizes="[5,10,15]"
+                    :current-page.sync="listQuery.pageNum"
+                    :total="total">
+            </el-pagination>
+        </div>
     </div>
-  </div>
 </template>
 <script>
-  //将$都替换为$
-  import {fetchList, delete${className}} from '@/api/${moduleName}/${changeClassName}'
-  import {formatDate} from '@/utils/date';
-
-  export default {
-    name: '${changeClassName}List',
-    data() {
-      return {
-        operates: [
-
-        ],
-        operateType: null,
-        listQuery: {
-          keyword: null,
-          pageNum: 1,
-          pageSize: 10
+    //将$都替换为$
+    import {fetchList, delete${className}} from '@/api/${moduleName}/${changeClassName}'
+    import {formatDate} from '@/utils/date';
+
+    export default {
+        name: '${changeClassName}List',
+        data() {
+            return {
+                operates: [],
+                operateType: null,
+                listQuery: {
+                    keyword: null,
+                    pageNum: 1,
+                    pageSize: 10
+                },
+                list: null,
+                total: null,
+                listLoading: true,
+                multipleSelection: []
+            }
         },
-        list: null,
-        total: null,
-        listLoading: true,
-        multipleSelection: []
-      }
-    },
-    created() {
-      this.getList();
-    },
-    filters: {
-      formatCreateTime(time) {
-        let date = new Date(time);
-        return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
-      },
-
-      formatStatus(value) {
-        if (value === 1) {
-          return '未开始';
-        } else if (value === 2) {
-          return '活动中';
-        } else if (value === 3) {
-          return '已结束';
-        } else if (value === 4) {
-          return '已失效';
-        }
-      },
-    },
-    methods: {
-      getList() {
-        this.listLoading = true;
-        fetchList(this.listQuery).then(response => {
-          this.listLoading = false;
-        this.list = response.data.records;
-        this.total = response.data.total;
-        this.totalPage = response.data.pages;
-        this.pageSize = response.data.size;
-      });
-
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
-      handleUpdate(index, row) {
-        this.$router.push(
-                {path: '/${moduleName}/update${className}', query: {id: row.id}})
-      },
-      handleDelete(index, row) {
-        this.$confirm('是否要删除该类型', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          delete${className}(row.id
-      ).
-        then(response => {
-          this.$message({
-            message: '删除成功',
-            type: 'success',
-            duration: 1000
-          });
-        this.getList();
-      });
-
-      });
-
-      },
-
-
-      handleSizeChange(val) {
-        this.listQuery.pageNum = 1;
-        this.listQuery.pageSize = val;
-        this.getList();
-      },
-      handleCurrentChange(val) {
-        this.listQuery.pageNum = val;
-        this.getList();
-      },
-      search${className}List() {
-        this.listQuery.pageNum = 1;
-        this.getList();
-      },
-      handleBatchOperate() {
-        console.log(this.multipleSelection);
-        if (this.multipleSelection < 1) {
-          this.$message({
-            message: '请选择一条记录',
-            type: 'warning',
-            duration: 1000
-          });
-          return;
-        }
-        let showStatus = 0;
-        if (this.operateType === 'show${className}') {
-          showStatus = 1;
-        } else if (this.operateType === 'hide${className}') {
-          showStatus = 0;
-        } else {
-          this.$message({
-            message: '请选择批量操作类型',
-            type: 'warning',
-            duration: 1000
-          });
-          return;
-        }
-        let ids = [];
-        for (let i = 0; i < this.multipleSelection.length; i++) {
-          ids.push(this.multipleSelection[i].id);
+        created() {
+            this.getList();
+        },
+        filters: {
+            formatCreateTime(time) {
+                let date = new Date(time);
+                return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
+            },
+
+            formatStatus(value) {
+                if (value === 1) {
+                    return '未开始';
+                } else if (value === 2) {
+                    return '活动中';
+                } else if (value === 3) {
+                    return '已结束';
+                } else if (value === 4) {
+                    return '已失效';
+                }
+            },
+        },
+        methods: {
+            getList() {
+                this.listLoading = true;
+                fetchList(this.listQuery).then(response = > {
+                    this.listLoading = false;
+                this.list = response.data.records;
+                this.total = response.data.total;
+                this.totalPage = response.data.pages;
+                this.pageSize = response.data.size;
+            })
+                ;
+
+            },
+            handleSelectionChange(val) {
+                this.multipleSelection = val;
+            },
+            handleUpdate(index, row) {
+                this.$router.push(
+                    {path: '/${moduleName}/update${className}', query: {id: row.id}})
+            },
+            handleDelete(index, row) {
+                this.$confirm('是否要删除该类型', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() = > {
+                    delete${className}(row.id
+            ).
+                then(response = > {
+                    this.$message({
+                        message: '删除成功',
+                        type: 'success',
+                        duration: 1000
+                    });
+                this.getList();
+            })
+                ;
+
+            })
+                ;
+
+            },
+
+
+            handleSizeChange(val) {
+                this.listQuery.pageNum = 1;
+                this.listQuery.pageSize = val;
+                this.getList();
+            },
+            handleCurrentChange(val) {
+                this.listQuery.pageNum = val;
+                this.getList();
+            },
+            search${className}List() {
+                this.listQuery.pageNum = 1;
+                this.getList();
+            },
+            handleBatchOperate() {
+                console.log(this.multipleSelection);
+                if (this.multipleSelection < 1) {
+                    this.$message({
+                        message: '请选择一条记录',
+                        type: 'warning',
+                        duration: 1000
+                    });
+                    return;
+                }
+                let showStatus = 0;
+                if (this.operateType === 'show${className}') {
+                    showStatus = 1;
+                } else if (this.operateType === 'hide${className}') {
+                    showStatus = 0;
+                } else {
+                    this.$message({
+                        message: '请选择批量操作类型',
+                        type: 'warning',
+                        duration: 1000
+                    });
+                    return;
+                }
+                let ids = [];
+                for (let i = 0; i < this.multipleSelection.length; i++) {
+                    ids.push(this.multipleSelection[i].id);
+                }
+                let data = new URLSearchParams();
+                data.append("ids", ids);
+                data.append("showStatus", showStatus);
+                updateShowStatus(data).then(response = > {
+                    this.getList();
+                this.$message({
+                    message: '修改成功',
+                    type: 'success',
+                    duration: 1000
+                });
+            })
+                ;
+            },
+            add${className}() {
+                //手动将router,改成$router
+                this.$router.push({path: '/${moduleName}/add${className}'})
+            }
         }
-        let data = new URLSearchParams();
-        data.append("ids", ids);
-        data.append("showStatus", showStatus);
-        updateShowStatus(data).then(response => {
-          this.getList();
-        this.$message({
-          message: '修改成功',
-          type: 'success',
-          duration: 1000
-        });
-      })
-        ;
-      },
-      add${className}() {
-        //手动将router,改成$router
-        this.$router.push({path: '/${moduleName}/add${className}'})
-      }
     }
-  }
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
 
diff --git a/mallplus-admin/src/test/java/com/zscat/mallplus/Demo2.java b/mallplus-admin/src/test/java/com/zscat/mallplus/Demo2.java
index b9f74fa74d232950477c803643db2158ac1e27fa..8f8e60e429a5da90251351171117ebbc83341f98 100644
--- a/mallplus-admin/src/test/java/com/zscat/mallplus/Demo2.java
+++ b/mallplus-admin/src/test/java/com/zscat/mallplus/Demo2.java
@@ -16,72 +16,72 @@ import java.util.Map;
 
 public class Demo2 {
 
- public static void main(String[] args) {
+    public static void main(String[] args) {
 
-  // 需要爬的网页的文章列表
-  String url = "https://www.toutiao.com/ch/news_tech/";
-  //文章详情页的前缀(由于今日头条的文章都是在group这个目录下,所以定义了前缀,而且通过请求获取到的html页面)
-  String url2="http://www.toutiao.com/group/";
-  //链接到该网站
-  Connection connection = Jsoup.connect(url);
-  Document content = null;
-  try {
-    //获取内容
-    content = connection.get();
-  } catch (IOException e) {
-    e.printStackTrace();
-  }
-  //转换成字符串
-  String htmlStr = content.html();
-  //因为今日头条的文章展示比较奇葩,都是通过js定义成变量,所以无法使用获取dom元素的方式获取值
-  String jsonStr = StringUtils.substringBetween(htmlStr,"var _data = ", ";");
+        // 需要爬的网页的文章列表
+        String url = "https://www.toutiao.com/ch/news_tech/";
+        //文章详情页的前缀(由于今日头条的文章都是在group这个目录下,所以定义了前缀,而且通过请求获取到的html页面)
+        String url2 = "http://www.toutiao.com/group/";
+        //链接到该网站
+        Connection connection = Jsoup.connect(url);
+        Document content = null;
+        try {
+            //获取内容
+            content = connection.get();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        //转换成字符串
+        String htmlStr = content.html();
+        //因为今日头条的文章展示比较奇葩,都是通过js定义成变量,所以无法使用获取dom元素的方式获取值
+        String jsonStr = StringUtils.substringBetween(htmlStr, "var _data = ", ";");
 
-  Map parse = (Map) JSONObject.parse(jsonStr);
-  JSONArray parseArray = (JSONArray) parse.get("real_time_news");
-     System.out.println(parseArray);
-  Map map=null;
-  List<Map> maps=new ArrayList<>();
-  //遍历这个jsonArray,获取到每一个json对象,然后将其转换成Map对象(在这里其实只需要一个group_id,那么没必要使用map)
-  for(int i=0;i<parseArray.size();i++){
-    map = (Map)parseArray.get(i);
-    maps.add((Map)parseArray.get(i));
-  }
-  //遍历之前获取到的map集合,然后分别访问这些文章详情页
-  for (Map map2 : maps) {
-    connection = Jsoup.connect(url2+map2.get("group_id"));
-      System.out.println(url2+map2.get("group_id"));
-    try {
-      Document document = connection.get();
-        System.out.println(document.html());
-        String detailStr = StringUtils.substringBetween(document.html(),"articleInfo: ", ";");
-        if (ValidatorUtils.empty(detailStr)){
-            continue;
+        Map parse = (Map) JSONObject.parse(jsonStr);
+        JSONArray parseArray = (JSONArray) parse.get("real_time_news");
+        System.out.println(parseArray);
+        Map map = null;
+        List<Map> maps = new ArrayList<>();
+        //遍历这个jsonArray,获取到每一个json对象,然后将其转换成Map对象(在这里其实只需要一个group_id,那么没必要使用map)
+        for (int i = 0; i < parseArray.size(); i++) {
+            map = (Map) parseArray.get(i);
+            maps.add((Map) parseArray.get(i));
         }
-        System.out.println(detailStr);
+        //遍历之前获取到的map集合,然后分别访问这些文章详情页
+        for (Map map2 : maps) {
+            connection = Jsoup.connect(url2 + map2.get("group_id"));
+            System.out.println(url2 + map2.get("group_id"));
+            try {
+                Document document = connection.get();
+                System.out.println(document.html());
+                String detailStr = StringUtils.substringBetween(document.html(), "articleInfo: ", ";");
+                if (ValidatorUtils.empty(detailStr)) {
+                    continue;
+                }
+                System.out.println(detailStr);
 
-        Map parse1 = (Map) net.sf.json.JSONObject.fromObject(detailStr);
-        System.out.println(parse1);
-        if (ValidatorUtils.empty(parse1)){
-            continue;
+                Map parse1 = (Map) net.sf.json.JSONObject.fromObject(detailStr);
+                System.out.println(parse1);
+                if (ValidatorUtils.empty(parse1)) {
+                    continue;
+                }
+                JSONArray parseArray1 = (JSONArray) parse1.get("articleInfo");
+                System.out.println(parseArray1);
+                //获取文章标题
+                Elements title = document.select("[class=article-title]");
+                System.out.println("tt=" + title);
+                System.out.println("tt=" + title.outerHtml());
+                //获取文章来源和文章发布时间
+                Elements articleInfo = document.select("[class=articleInfo]");
+                Elements src = articleInfo.select("[class=src]");
+                System.out.println(src.html());
+                Elements time = articleInfo.select("[class=time]");
+                System.out.println(time.html());
+                //获取文章内容
+                Elements contentEle = document.select("[class=article-content]");
+                System.out.println(contentEle.html());
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }
-        JSONArray parseArray1 = (JSONArray) parse1.get("articleInfo");
-        System.out.println(parseArray1);
-      //获取文章标题
-      Elements title = document.select("[class=article-title]");
-      System.out.println("tt="+title);
-        System.out.println("tt="+title.outerHtml());
-      //获取文章来源和文章发布时间
-      Elements articleInfo = document.select("[class=articleInfo]");
-      Elements src = articleInfo.select("[class=src]");
-      System.out.println(src.html());
-      Elements time = articleInfo.select("[class=time]");
-      System.out.println(time.html());
-      //获取文章内容
-      Elements contentEle = document.select("[class=article-content]");
-      System.out.println(contentEle.html());
-    } catch (IOException e) {
-      e.printStackTrace();
     }
-  }
- }
 }
diff --git a/mallplus-admin/src/test/java/com/zscat/mallplus/GlobalConstants.java b/mallplus-admin/src/test/java/com/zscat/mallplus/GlobalConstants.java
index c8755969cbc1a5cb1603676d704ce7effd6c8703..0970135821656866a4236ae7577b34477b573736 100644
--- a/mallplus-admin/src/test/java/com/zscat/mallplus/GlobalConstants.java
+++ b/mallplus-admin/src/test/java/com/zscat/mallplus/GlobalConstants.java
@@ -6,11 +6,11 @@ import org.jsoup.nodes.Document;
 import java.net.URL;
 
 /**
- *@Author:liangjilong
- *@Date:2015-1-4
- *@Email:jilongliang@sina.com
- *@Version:1.0
- *@Description
+ * @Author:liangjilong
+ * @Date:2015-1-4
+ * @Email:jilongliang@sina.com
+ * @Version:1.0
+ * @Description
  */
 public class GlobalConstants {
 
@@ -20,9 +20,9 @@ public class GlobalConstants {
      * @param format格式（XML、JSON）
      * @return
      */
-    public static String getUrl(Integer page,String format){
-        StringBuffer buffer=new StringBuffer("http://api.roll.news.sina.com.cn/zt_list?channel=news");
-        String url="";
+    public static String getUrl(Integer page, String format) {
+        StringBuffer buffer = new StringBuffer("http://api.roll.news.sina.com.cn/zt_list?channel=news");
+        String url = "";
         buffer.append("&cat_1=shxw");//显示新闻
         buffer.append("&cat_2==zqsk||=qwys||=shwx||=fz-shyf");
         buffer.append("&level==1||=2");//级别
@@ -30,10 +30,10 @@ public class GlobalConstants {
         buffer.append("&show_all=1");//显示所有
         buffer.append("&show_num=22");//显示多少条
         buffer.append("&tag=1");
-        buffer.append("&format="+format);
-        buffer.append("&page="+page);
+        buffer.append("&format=" + format);
+        buffer.append("&page=" + page);
         buffer.append("&callback=newsloader");
-        url=buffer.toString();
+        url = buffer.toString();
         return url;
     }
 
@@ -44,12 +44,12 @@ public class GlobalConstants {
      * @param url
      * @return
      */
-    public static String getNewsContent(String url) throws Exception{
-        Document doc=Jsoup.parse(new URL(url), 3000);
-        if(doc!=null){
-            String artibody=doc.getElementById("artibody").html();//通过网页的html的id去拿到新闻内容artibody
+    public static String getNewsContent(String url) throws Exception {
+        Document doc = Jsoup.parse(new URL(url), 3000);
+        if (doc != null) {
+            String artibody = doc.getElementById("artibody").html();//通过网页的html的id去拿到新闻内容artibody
             return artibody;
-        }else{
+        } else {
             return "网络异常";
         }
     }
diff --git a/mallplus-admin/src/test/java/com/zscat/mallplus/HttpRequestUtils.java b/mallplus-admin/src/test/java/com/zscat/mallplus/HttpRequestUtils.java
index 333339c110ee92726492852d000c760b93687592..05fc63ecf8513edaa85b54753aeb87b2e0ff2da1 100644
--- a/mallplus-admin/src/test/java/com/zscat/mallplus/HttpRequestUtils.java
+++ b/mallplus-admin/src/test/java/com/zscat/mallplus/HttpRequestUtils.java
@@ -7,22 +7,23 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 
 /**
- *@Author:liangjilong
- *@Date:2015-1-4
- *@Email:jilongliang@sina.com
- *@Version:1.0
- *@Description
+ * @Author:liangjilong
+ * @Date:2015-1-4
+ * @Email:jilongliang@sina.com
+ * @Version:1.0
+ * @Description
  */
 
 public class HttpRequestUtils {
     /**
      * 发送http请求
      * POST和GET请求都可以
-     * @param requestUrl 请求地址
+     *
+     * @param requestUrl     请求地址
      * @param method传入的执行的方式 是GET还是POST方式
      * @return String
      */
-    public static String HttpURLConnRequest(String requestUrl,String method) {
+    public static String HttpURLConnRequest(String requestUrl, String method) {
         StringBuffer buffer = new StringBuffer();
         try {
             URL url = new URL(requestUrl);
diff --git a/mallplus-admin/src/test/java/com/zscat/mallplus/JsoupTest.java b/mallplus-admin/src/test/java/com/zscat/mallplus/JsoupTest.java
index 801c828012f9fc4acd371b2a3d98ad3a00d5acfb..555c12da68e8d43bf52890f973854341c26a2637 100644
--- a/mallplus-admin/src/test/java/com/zscat/mallplus/JsoupTest.java
+++ b/mallplus-admin/src/test/java/com/zscat/mallplus/JsoupTest.java
@@ -10,32 +10,32 @@ import java.io.IOException;
 public class JsoupTest {
     public static void main(String[] args) throws IOException {
         //获取编辑推荐页
-        Document document=Jsoup.connect("https://www.zhihu.com/explore/recommendations")
+        Document document = Jsoup.connect("https://www.zhihu.com/explore/recommendations")
                 //模拟火狐浏览器
                 .userAgent("Mozilla/4.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)")
                 .get();
-        Element main=document.getElementById("zh-recommend-list-full");
-        Elements url=main.select("div").select("div:nth-child(2)")
+        Element main = document.getElementById("zh-recommend-list-full");
+        Elements url = main.select("div").select("div:nth-child(2)")
                 .select("h2").select("a[class=question_link]");
-        for(Element question:url){
+        for (Element question : url) {
             //输出href后的值，即主页上每个关注问题的链接
-            String URL=question.attr("abs:href");
+            String URL = question.attr("abs:href");
             //下载问题链接指向的页面
-            Document document2=Jsoup.connect(URL)
+            Document document2 = Jsoup.connect(URL)
                     .userAgent("Mozilla/4.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)")
                     .get();
             //问题
-            Elements title=document2.select("#zh-question-title").select("h2").select("a");
+            Elements title = document2.select("#zh-question-title").select("h2").select("a");
             //问题描述
-            Elements detail=document2.select("#zh-question-detail");
+            Elements detail = document2.select("#zh-question-detail");
             //回答
-            Elements answer=document2.select("#zh-question-answer-wrap")
+            Elements answer = document2.select("#zh-question-answer-wrap")
                     .select("div.zm-item-rich-text.expandable.js-collapse-body")
                     .select("div.zm-editable-content.clearfix");
-            System.out.println("\n"+"链接："+URL
-                    +"\n"+"标题："+title.text()
-                    +"\n"+"问题描述："+detail.text()
-                    +"\n"+"回答："+answer.text());
+            System.out.println("\n" + "链接：" + URL
+                    + "\n" + "标题：" + title.text()
+                    + "\n" + "问题描述：" + detail.text()
+                    + "\n" + "回答：" + answer.text());
         }
     }
 }
diff --git a/mallplus-admin/src/test/java/com/zscat/mallplus/News.java b/mallplus-admin/src/test/java/com/zscat/mallplus/News.java
index c6bb5c648f3328f3d99deee2a8c37c9a19fedf4b..d3328772d333ece8476c2e22eb879e7da26f6648 100644
--- a/mallplus-admin/src/test/java/com/zscat/mallplus/News.java
+++ b/mallplus-admin/src/test/java/com/zscat/mallplus/News.java
@@ -6,58 +6,58 @@ import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
 import java.io.IOException;
+
 /**
- *
  * 类名称：News
  * 类描述： 抓取开源中国新闻列表
  * 创建人：geekfly
  * 创建时间：2017年7月19日 下午8:54:46
- * @version  V1.0
  *
+ * @version V1.0
  */
 public class News {
 
-	public static void main(String[] args) throws IOException {
-		String url = "https://www.oschina.net/news";
-		Document document = Jsoup.connect(url)
-		.userAgent("Mozilla/5.0 (Windows NT 6.1; rv:30.0) Gecko/20100101 Firefox/30.0")
-		.get();
-
-		Elements items = document.select("#all-news .item");
-		System.out.println(items.size());
-		String host = "https://www.oschina.net";
-		for(Element item: items){
-			//过滤广告
-			if(!item.attr("data-tracepid").isEmpty()){
-				continue;
-			}
-			// 标题
-			String title = item.select("a").first().text();
-
-			//标题地址
-			String title_href = item.select("a").first().attr("href");
-			if(!title_href.startsWith("https://")){
-				title_href = host + title_href;
-			}
-			//描述
-			String desc = item.select("div[class=sc sc-text text-gradient wrap summary]").text();
-
-			//作者头像
-			String author_image = item.select("img[class=avatar]").attr("src");
-			//String author_image = item.select("img").first().attr("src");
-
-			Element mr = item.select(".from .mr").get(0);
-			//作者
-			String author = mr.select("a").text();
-			// 从span[class=mr]中移除a标签，输出的即为发布时间
-			mr.select("a").remove();
-			String published = mr.text();
-
-			String number = item.select(".from .mr").last().text();
-			System.out.println(number);
-
-		}
-
-	}
+    public static void main(String[] args) throws IOException {
+        String url = "https://www.oschina.net/news";
+        Document document = Jsoup.connect(url)
+                .userAgent("Mozilla/5.0 (Windows NT 6.1; rv:30.0) Gecko/20100101 Firefox/30.0")
+                .get();
+
+        Elements items = document.select("#all-news .item");
+        System.out.println(items.size());
+        String host = "https://www.oschina.net";
+        for (Element item : items) {
+            //过滤广告
+            if (!item.attr("data-tracepid").isEmpty()) {
+                continue;
+            }
+            // 标题
+            String title = item.select("a").first().text();
+
+            //标题地址
+            String title_href = item.select("a").first().attr("href");
+            if (!title_href.startsWith("https://")) {
+                title_href = host + title_href;
+            }
+            //描述
+            String desc = item.select("div[class=sc sc-text text-gradient wrap summary]").text();
+
+            //作者头像
+            String author_image = item.select("img[class=avatar]").attr("src");
+            //String author_image = item.select("img").first().attr("src");
+
+            Element mr = item.select(".from .mr").get(0);
+            //作者
+            String author = mr.select("a").text();
+            // 从span[class=mr]中移除a标签，输出的即为发布时间
+            mr.select("a").remove();
+            String published = mr.text();
+
+            String number = item.select(".from .mr").last().text();
+            System.out.println(number);
+
+        }
+
+    }
 
 }
diff --git a/mallplus-admin/src/test/java/com/zscat/mallplus/SinaNew.java b/mallplus-admin/src/test/java/com/zscat/mallplus/SinaNew.java
index 18e287d0039509716565a9cf77f1949954528610..da228026b2f10ff8336afb7697e31f3040e36888 100644
--- a/mallplus-admin/src/test/java/com/zscat/mallplus/SinaNew.java
+++ b/mallplus-admin/src/test/java/com/zscat/mallplus/SinaNew.java
@@ -8,35 +8,35 @@ import org.jsoup.select.Elements;
 import java.net.URL;
 
 /**
- *@Author:liangjilong
- *@Date:2015-1-4
- *@Email:jilongliang@sina.com
- *@Version:1.0
- *@Description这个是通过jsoup处理的
+ * @Author:liangjilong
+ * @Date:2015-1-4
+ * @Email:jilongliang@sina.com
+ * @Version:1.0
+ * @Description这个是通过jsoup处理的
  */
 public class SinaNew {
 
-    public static void main(String[] args)throws Exception {
+    public static void main(String[] args) throws Exception {
         String requestURL = "https://news.sina.com.cn/roll/#pageid=153&lid=2509&k=&num=50&page=2";
-        org.jsoup.nodes.Document doc=Jsoup.parse(new URL(requestURL), 30000);
+        org.jsoup.nodes.Document doc = Jsoup.parse(new URL(requestURL), 30000);
         // String html=doc.html();
-        Elements items=doc.select("item");//获取item（item具有多个节点）
+        Elements items = doc.select("item");//获取item（item具有多个节点）
 
         String title = "", url = "", keywords = "", img = "", media_name = "";
-        int i=1;
+        int i = 1;
         for (Element its : items) {
 
-            title=its.select("title").html();
-            url=its.select("url").html();
-            keywords=its.select("keywords").html();
-            img=its.select("img").html();
-            media_name=its.select("media_name").html();
+            title = its.select("title").html();
+            url = its.select("url").html();
+            keywords = its.select("keywords").html();
+            img = its.select("img").html();
+            media_name = its.select("media_name").html();
 
-            String newsText=GlobalConstants.getNewsContent(url);//处理新闻内容
+            String newsText = GlobalConstants.getNewsContent(url);//处理新闻内容
 
             //System.out.println(title + "\n" + url + "\n" + keywords + "\n"+ url + "\n" + media_name);
 
-            System.out.println("==================第"+i+"篇=================="+newsText);
+            System.out.println("==================第" + i + "篇==================" + newsText);
             i++;
         }
     }
diff --git a/mallplus-admin/src/test/java/com/zscat/mallplus/qczj/GrapNews.java b/mallplus-admin/src/test/java/com/zscat/mallplus/qczj/GrapNews.java
index ec3e482e1061377943a9e8c66f9a5fd02b68f126..5f6a97da5a5a52e130df00edcafc44bc74681695 100644
--- a/mallplus-admin/src/test/java/com/zscat/mallplus/qczj/GrapNews.java
+++ b/mallplus-admin/src/test/java/com/zscat/mallplus/qczj/GrapNews.java
@@ -28,67 +28,67 @@ public class GrapNews {
 
     /**
      * 从笑话集抓取笑话
+     *
      * @param size
      * @param baseUrl
      * @param domainName
      * @param newsListClassOrId
-
      * @param newsULIndex
      * @param newsContentClassOrId
      * @param titleTagOrClass
      * @param dateTag
      * @return
      */
-    public static ArrayList<News> getNewsFromJokeji(int size,String baseUrl,String domainName,
-            String newsListClassOrId,int newsULIndex,
-            String newsContentClassOrId,String titleTagOrClass,String dateTag){
+    public static ArrayList<News> getNewsFromJokeji(int size, String baseUrl, String domainName,
+                                                    String newsListClassOrId, int newsULIndex,
+                                                    String newsContentClassOrId, String titleTagOrClass, String dateTag) {
         ArrayList<News> newsList = new ArrayList<News>();
         Document doc;
-        Element element =null;
-        Element title =null;
+        Element element = null;
+        Element title = null;
         News news = null;
         try {
             doc = Jsoup.connect(baseUrl).timeout(10000).get();
             element = (Element) doc.getElementsByClass(newsListClassOrId).first();
             System.out.println(element);
             Elements elements = element.getElementsByTag("li");
-            if(elements!=null&&elements.size()>0){
-                for(Element ele:elements){
+            if (elements != null && elements.size() > 0) {
+                for (Element ele : elements) {
                     news = new News();
                     title = ele.select("a").first();
-                    if(title==null){
+                    if (title == null) {
                         continue;
                     }
                     news.setTitle(title.getElementsByTag(titleTagOrClass).text());
-                    if(news.getTitle()==null||news.getTitle().equals("")){
+                    if (news.getTitle() == null || news.getTitle().equals("")) {
                         continue;
                     }
-                    news.setHref(domainName+title.attr("href"));
-                    if(dateTag!=null){
-                        String date=ele.select("i").text();
+                    news.setHref(domainName + title.attr("href"));
+                    if (dateTag != null) {
+                        String date = ele.select("i").text();
                         news.setDate(date);
                     }
-                    String newsUrl =news.getHref();
+                    String newsUrl = news.getHref();
                     if (isContainChinese(news.getHref())) {
                         newsUrl = URLEncoder.encode(news.getHref(), "utf-8")
                                 .toLowerCase().replace("%3a", ":").replace("%2f", "/");
                     }
                     Document newsDoc = Jsoup.connect(newsUrl).timeout(10000).get();
-                    String text=newsDoc.getElementById(newsContentClassOrId).html();
-                    text=deleteImg(text);
-                    text=deleteA(text);
-                     StringBuffer textBuffer=new StringBuffer(5);
-                     textBuffer.append("<!DOCTYPE html><html><head><meta name=\"content-type\" content=\"text/html; charset=UTF-8\">");
-                     textBuffer.append("</head><body>");
-                     textBuffer.append(deleteSource(text));
-                     textBuffer.append("</body></html>");
-                     news.setContent(textBuffer.toString());
-                     news.setContent(textBuffer.toString());
-                     System.out.println("标题====="+news.getTitle());
-                     System.out.println("href====="+news.getHref());
-                     System.out.println("content====="+news.getContent());
-                     newsList.add(news);
-                    if(newsList.size()==size){
+                    String text = newsDoc.getElementById(newsContentClassOrId).html();
+                    text = deleteImg(text);
+                    text = deleteA(text);
+                    StringBuffer textBuffer = new StringBuffer(5);
+                    textBuffer.append("<!DOCTYPE html><html><head><meta name=\"content-type\" content=\"text/html; charset=UTF-8\">");
+                    textBuffer.append("</head><body>");
+                    textBuffer.append(deleteSource(text));
+                    textBuffer.append("</body></html>");
+                    news.setContent(textBuffer.toString());
+                    news.setContent(textBuffer.toString());
+                    System.out.println("标题=====" + news.getTitle());
+                    System.out.println("href=====" + news.getHref());
+                    System.out.println("content=====" + news.getContent());
+                    newsList.add(news);
+                    if (newsList.size() == size) {
                         break;
                     }
                 }
@@ -101,70 +101,70 @@ public class GrapNews {
 
     /**
      * 从汽车之家抓新闻
+     *
      * @param size
      * @param baseUrl
      * @param domainName
      * @param newsListId
      * @param newsContentClass
-
      * @param dateTag
      * @param needDeleteAlt
      * @return
      */
-    public static ArrayList<News> getNewsFromCarHome(int size,String baseUrl,String domainName,String newsListId,
-            String newsContentClass,String titleTag,String dateTag,String needDeleteAlt){
+    public static ArrayList<News> getNewsFromCarHome(int size, String baseUrl, String domainName, String newsListId,
+                                                     String newsContentClass, String titleTag, String dateTag, String needDeleteAlt) {
         ArrayList<News> newsList = new ArrayList<News>();
         Document doc;
-        Elements elements =null;
-        Element title =null;
+        Elements elements = null;
+        Element title = null;
         News news = null;
         try {
             doc = Jsoup.connect(baseUrl).timeout(10000).get();
             elements = (Elements) doc.getElementById(newsListId).children();
-            if(elements!=null&&elements.size()>0){
-                for(Element ele:elements){
+            if (elements != null && elements.size() > 0) {
+                for (Element ele : elements) {
                     news = new News();
                     title = ele.select("a").first();
-                    if(title==null){
+                    if (title == null) {
                         continue;
                     }
                     news.setTitle(title.getElementsByTag(titleTag).text());
-                    if(news.getTitle()==null||news.getTitle().equals("")){
+                    if (news.getTitle() == null || news.getTitle().equals("")) {
                         continue;
                     }
-                    news.setHref(domainName+title.attr("href"));
-                    if(dateTag!=null){
-                        String date=ele.select("i").text();
+                    news.setHref(domainName + title.attr("href"));
+                    if (dateTag != null) {
+                        String date = ele.select("i").text();
                         news.setDate(date);
                     }
-                    String newsUrl =news.getHref();
+                    String newsUrl = news.getHref();
                     if (isContainChinese(news.getHref())) {
                         newsUrl = URLEncoder.encode(news.getHref(), "utf-8")
                                 .toLowerCase().replace("%3a", ":").replace("%2f", "/");
                     }
                     Document newsDoc = Jsoup.connect(newsUrl).timeout(10000).get();
-                    String text=newsDoc.getElementsByClass(newsContentClass).html();
-                    if(text.indexOf("余下全文")>0||text.indexOf("未经许可")>0
-                            ||text.indexOf("禁止转载")>0||text.indexOf("公众号")>0||text.indexOf("公众账号")>0){
+                    String text = newsDoc.getElementsByClass(newsContentClass).html();
+                    if (text.indexOf("余下全文") > 0 || text.indexOf("未经许可") > 0
+                            || text.indexOf("禁止转载") > 0 || text.indexOf("公众号") > 0 || text.indexOf("公众账号") > 0) {
                         continue;
                     }
-                     text=replaceImgSrcFromDataSrc(text,true,needDeleteAlt);
-                     int index=text.lastIndexOf("（");
-                     if(index>0){
-                         text=text.substring(0,index);
-                     }
-                     StringBuffer textBuffer=new StringBuffer(5);
-                     textBuffer.append("<!DOCTYPE html><html><head><meta name=\"content-type\" content=\"text/html; charset=UTF-8\">");
-                     textBuffer.append("</head><body>");
-                     textBuffer.append(deleteSource(text));
-                     textBuffer.append("</body></html>");
-                     news.setContent(textBuffer.toString());
-                     news.setContent(textBuffer.toString());
-                     System.out.println("标题====="+news.getTitle());
-                     System.out.println("href====="+news.getHref());
-                     System.out.println("content====="+news.getContent());
-                     newsList.add(news);
-                    if(newsList.size()==size){
+                    text = replaceImgSrcFromDataSrc(text, true, needDeleteAlt);
+                    int index = text.lastIndexOf("（");
+                    if (index > 0) {
+                        text = text.substring(0, index);
+                    }
+                    StringBuffer textBuffer = new StringBuffer(5);
+                    textBuffer.append("<!DOCTYPE html><html><head><meta name=\"content-type\" content=\"text/html; charset=UTF-8\">");
+                    textBuffer.append("</head><body>");
+                    textBuffer.append(deleteSource(text));
+                    textBuffer.append("</body></html>");
+                    news.setContent(textBuffer.toString());
+                    news.setContent(textBuffer.toString());
+                    System.out.println("标题=====" + news.getTitle());
+                    System.out.println("href=====" + news.getHref());
+                    System.out.println("content=====" + news.getContent());
+                    newsList.add(news);
+                    if (newsList.size() == size) {
                         break;
                     }
                 }
@@ -176,80 +176,80 @@ public class GrapNews {
     }
 
 
-
-    public static String getVideoFromMiaoPai(String baseUrl) throws Exception{
-        Document doc= Jsoup.connect(baseUrl).timeout(10000).get();
-        String html=doc.html().trim();
+    public static String getVideoFromMiaoPai(String baseUrl) throws Exception {
+        Document doc = Jsoup.connect(baseUrl).timeout(10000).get();
+        String html = doc.html().trim();
         return getUrlFromMiaoPaiHtml(html);
     }
 
-    public static String getUrlFromMiaoPaiHtml(String html){
-        int startIndex=html.indexOf("videoSrc");
-        int endIndex=html.indexOf("poster");
-        String videoUrl=html.substring(startIndex+11,endIndex+5);
-        int index=videoUrl.indexOf('"');
-        if(index>0){
+    public static String getUrlFromMiaoPaiHtml(String html) {
+        int startIndex = html.indexOf("videoSrc");
+        int endIndex = html.indexOf("poster");
+        String videoUrl = html.substring(startIndex + 11, endIndex + 5);
+        int index = videoUrl.indexOf('"');
+        if (index > 0) {
             return videoUrl.substring(0, index);
         }
         return videoUrl;
     }
 
-    public static String getVideoPhotoFromMiaoPaiHtml(String html){
+    public static String getVideoPhotoFromMiaoPaiHtml(String html) {
         System.out.println(html);
-        int startIndex=html.indexOf("poster");
-        int index=html.substring(startIndex).indexOf("jpg");
-        return html.substring(startIndex+9,startIndex+index+3);
+        int startIndex = html.indexOf("poster");
+        int index = html.substring(startIndex).indexOf("jpg");
+        return html.substring(startIndex + 9, startIndex + index + 3);
     }
 
-    public static void main(String[] args) throws Exception{
-        getNewsFromCarHome(2,"http://m.autohome.com.cn/channel","http://m.autohome.com.cn","list","details","h4","time","汽车之家");
-        getNewsFromJokeji(3,"http://www.jokeji.cn/list.htm","http://www.jokeji.cn","list_title",1,"text110","a","i");
-        getNewsFromSouHu(20,"http://m.sohu.com/c/1592/","a",null,null);
+    public static void main(String[] args) throws Exception {
+        getNewsFromCarHome(2, "http://m.autohome.com.cn/channel", "http://m.autohome.com.cn", "list", "details", "h4", "time", "汽车之家");
+        getNewsFromJokeji(3, "http://www.jokeji.cn/list.htm", "http://www.jokeji.cn", "list_title", 1, "text110", "a", "i");
+        getNewsFromSouHu(20, "http://m.sohu.com/c/1592/", "a", null, null);
     }
-     /**
+
+    /**
      * 从秒拍抓视频
+     *
      * @param size
      * @param baseUrl
-
      * @return
      */
-    public static ArrayList<News> getVideoFromMiaopai(int size,String baseUrl){
+    public static ArrayList<News> getVideoFromMiaopai(int size, String baseUrl) {
         ArrayList<News> newsList = new ArrayList<News>();
         try {
             News news = null;
-            Element videoEmement=null;
+            Element videoEmement = null;
             Document doc = null;
-            String videoUrl=null;
+            String videoUrl = null;
             doc = Jsoup.connect(baseUrl).timeout(10000).get();
-            Elements    elements = doc.getElementsByClass("videoCont");
-            String videoDetailUrl="";
-            if(elements!=null&&elements.size()>0){
-                for(Element ele:elements){
-                videoEmement=ele.getElementsByClass("MIAOPAI_player").first();
-                String videoId=videoEmement.attr("data-scid").toString();
-                String videoPhotoUrl=videoEmement.attr("data-img").toString();
-                String videoTitle=ele.getElementsByClass("viedoAbout").first().getElementsByTag("p").text();
-                System.out.println("视频id"+videoId);
-                System.out.println("视频封面url"+videoPhotoUrl);
-                System.out.println("视频标题"+videoTitle);
-                news = new News();
-                if(videoId!=null){
-                    news.setTitle(videoTitle);
-                    videoDetailUrl="http://www.miaopai.com/show/"+videoId+".html";
-                    doc = Jsoup.connect("http://www.miaopai.com/show/"+videoId+".html").timeout(10000).get();
-                    System.out.println("视频详情url========"+videoDetailUrl);
-                    news.setHref("http://m.miaopai.com/show/"+videoId);
-                    news.setPhotoUrl(videoPhotoUrl);
-                }
-                if(doc!=null){
-                     videoUrl=getUrlFromMiaoPaiHtml(doc.html());
-                }
-                if(videoUrl!=null){
-                     news.setContent(createVideoHtml(videoUrl, videoPhotoUrl));
-                     System.out.println("视频url====="+videoUrl);
-                     System.out.println("视频html======"+news.getContent());
-                     newsList.add(news);
-                }
+            Elements elements = doc.getElementsByClass("videoCont");
+            String videoDetailUrl = "";
+            if (elements != null && elements.size() > 0) {
+                for (Element ele : elements) {
+                    videoEmement = ele.getElementsByClass("MIAOPAI_player").first();
+                    String videoId = videoEmement.attr("data-scid").toString();
+                    String videoPhotoUrl = videoEmement.attr("data-img").toString();
+                    String videoTitle = ele.getElementsByClass("viedoAbout").first().getElementsByTag("p").text();
+                    System.out.println("视频id" + videoId);
+                    System.out.println("视频封面url" + videoPhotoUrl);
+                    System.out.println("视频标题" + videoTitle);
+                    news = new News();
+                    if (videoId != null) {
+                        news.setTitle(videoTitle);
+                        videoDetailUrl = "http://www.miaopai.com/show/" + videoId + ".html";
+                        doc = Jsoup.connect("http://www.miaopai.com/show/" + videoId + ".html").timeout(10000).get();
+                        System.out.println("视频详情url========" + videoDetailUrl);
+                        news.setHref("http://m.miaopai.com/show/" + videoId);
+                        news.setPhotoUrl(videoPhotoUrl);
+                    }
+                    if (doc != null) {
+                        videoUrl = getUrlFromMiaoPaiHtml(doc.html());
+                    }
+                    if (videoUrl != null) {
+                        news.setContent(createVideoHtml(videoUrl, videoPhotoUrl));
+                        System.out.println("视频url=====" + videoUrl);
+                        System.out.println("视频html======" + news.getContent());
+                        newsList.add(news);
+                    }
 
                 }
             }
@@ -259,7 +259,7 @@ public class GrapNews {
         return newsList;
     }
 
-    public static String createVideoHtml(String videoUrl,String videoPhotoUrl) {
+    public static String createVideoHtml(String videoUrl, String videoPhotoUrl) {
         Document doc;
         StringBuffer textBuffer = new StringBuffer(5);
         textBuffer.append("<!DOCTYPE html><html><head><meta name=\"content-type\" content=\"text/html; charset=UTF-8\">");
@@ -270,84 +270,84 @@ public class GrapNews {
         doc = Jsoup.parse(textBuffer.toString());
         doc.getElementsByTag("body").attr("style", "height:400px;");
         doc.getElementsByTag("video").attr("style", "width:100%;max-height:400px;")
-            .attr("poster", videoPhotoUrl).attr("autoplay", "autoplay")
+                .attr("poster", videoPhotoUrl).attr("autoplay", "autoplay")
                 .attr("controls", "controls").attr("src", videoUrl);
         return doc.toString();
     }
 
     /**
      * 从搜狐抓新闻
+     *
      * @param size
      * @param baseUrl
-
      * @param dateTag
      * @param needDeleteAlt
      * @return
      */
-    public static ArrayList<News> getNewsFromSouHu(int size,String baseUrl,
-            String titleTag,String dateTag,String needDeleteAlt){
+    public static ArrayList<News> getNewsFromSouHu(int size, String baseUrl,
+                                                   String titleTag, String dateTag, String needDeleteAlt) {
         ArrayList<News> newsList = new ArrayList<News>();
         Document doc;
-        Element element =null;
-        Element title =null;
+        Element element = null;
+        Element title = null;
         News news = null;
         try {
             doc = Jsoup.connect(baseUrl).timeout(10000).get();
-            element =doc.getElementsByTag("section").get(2);
+            element = doc.getElementsByTag("section").get(2);
             element = element.getElementsByClass("headlines").get(0);
-             Elements elements=element.children();
-            if(elements!=null&&elements.size()>0){
-                for(Element ele:elements){
+            Elements elements = element.children();
+            if (elements != null && elements.size() > 0) {
+                for (Element ele : elements) {
                     news = new News();
                     title = ele.select("a").first();
-                    if(title==null){
+                    if (title == null) {
                         continue;
                     }
                     news.setTitle(title.getElementsByTag(titleTag).text());
-                    if(news.getTitle()==null||news.getTitle().equals("")
-                            ||news.getTitle().indexOf("广告")>0||news.getTitle().indexOf("视频")>0){
+                    if (news.getTitle() == null || news.getTitle().equals("")
+                            || news.getTitle().indexOf("广告") > 0 || news.getTitle().indexOf("视频") > 0) {
                         continue;
                     }
-                    news.setHref("https://m.sohu.com"+title.attr("href"));
-                    if(dateTag!=null){
-                        String dateStr=ele.select(dateTag).first().text();
+                    news.setHref("https://m.sohu.com" + title.attr("href"));
+                    if (dateTag != null) {
+                        String dateStr = ele.select(dateTag).first().text();
                         news.setDate(dateStr);
                     }
-                    String newsUrl =news.getHref();
+                    String newsUrl = news.getHref();
                     if (isContainChinese(news.getHref())) {
                         newsUrl = URLEncoder.encode(news.getHref(), "utf-8")
                                 .toLowerCase().replace("%3a", ":").replace("%2f", "/");
                     }
                     Document newsDoc = Jsoup.connect(newsUrl).timeout(10000).get();
-                    String text=newsDoc.getElementsByTag("article").html();
-                    if(text.indexOf("未经许可")>0||text.indexOf("禁止转载")>0
-                            ||text.indexOf("公众号")>0||text.indexOf("公众账号")>0){
+                    String text = newsDoc.getElementsByTag("article").html();
+                    if (text.indexOf("未经许可") > 0 || text.indexOf("禁止转载") > 0
+                            || text.indexOf("公众号") > 0 || text.indexOf("公众账号") > 0) {
                         continue;
                     }
-                    int index=text.indexOf("<p class=\"para\">");
-                    int lastIndex=text.indexOf("<div class=\"expend-wp\"> ");
-                    if(lastIndex>0){
-                         text=text.substring(index,lastIndex);
-                    }else if(index>0){
-                        text=text.substring(index,text.length());
+                    int index = text.indexOf("<p class=\"para\">");
+                    int lastIndex = text.indexOf("<div class=\"expend-wp\"> ");
+                    if (lastIndex > 0) {
+                        text = text.substring(index, lastIndex);
+                    } else if (index > 0) {
+                        text = text.substring(index, text.length());
                     }
-                    text=replaceImgSrcFromDataSrc(text,true,null);
-                    if(text==null||text.length()==0){
+                    text = replaceImgSrcFromDataSrc(text, true, null);
+                    if (text == null || text.length() == 0) {
                         continue;
                     }
-                     StringBuffer textBuffer=new StringBuffer(5);
-                     textBuffer.append("<!DOCTYPE html><html><head>"
+                    StringBuffer textBuffer = new StringBuffer(5);
+                    textBuffer.append("<!DOCTYPE html><html><head>"
                             + "<meta name=\"content-type\" content=\"text/html; charset=UTF-8\">");
-                     textBuffer.append("</head><body>");
-                     textBuffer.append(deleteSource(text));
-                     textBuffer.append("</body></html>");
-                     news.setContent(textBuffer.toString());
-                     news.setContent(textBuffer.toString());
-                     System.out.println("标题====="+news.getTitle());
-                     System.out.println("href====="+news.getHref());
-                     System.out.println("content====="+news.getContent());
-                     newsList.add(news);
-                    if(newsList.size()==size){
+                    textBuffer.append("</head><body>");
+                    textBuffer.append(deleteSource(text));
+                    textBuffer.append("</body></html>");
+                    news.setContent(textBuffer.toString());
+                    news.setContent(textBuffer.toString());
+                    System.out.println("标题=====" + news.getTitle());
+                    System.out.println("href=====" + news.getHref());
+                    System.out.println("content=====" + news.getContent());
+                    newsList.add(news);
+                    if (newsList.size() == size) {
                         break;
                     }
                 }
@@ -369,15 +369,17 @@ public class GrapNews {
     private static String deleteSource(String text) {
         return text.replaceAll("\\(.*?\\)|\\[.*?]", "");
     }
+
     /**
      * 删除a标签中的href
+     *
      * @param content
      * @return
      */
-    public static String removeHref(String content){
+    public static String removeHref(String content) {
         Document document = Jsoup.parse(content);
         Elements elements = document.select("a[href]");
-        for(Element el:elements){
+        for (Element el : elements) {
             el.removeAttr("href");
         }
         return document.html();
@@ -387,17 +389,18 @@ public class GrapNews {
     /**
      * 将htmlBody中所有img标签中的src内容替换为原data-src的内容, <br/>
      * 如果不报含data-src,则src的内容不会被替换 <br/>
-     * @param htmlBody html内容
-     * @param needDeleteAlt 需要剔除的图片的alt信息
+     *
+     * @param htmlBody                    html内容
+     * @param needDeleteAlt               需要剔除的图片的alt信息
      * @param imgUrlNeedAddProtocolPrefix 图片的url是否需要添加http协议前缀
      * @return 返回替换后的内容
      */
     public static String replaceImgSrcFromDataSrc(String htmlBody,
-            boolean imgUrlNeedAddProtocolPrefix,String needDeleteAlt) {
+                                                  boolean imgUrlNeedAddProtocolPrefix, String needDeleteAlt) {
         Document document = Jsoup.parseBodyFragment(htmlBody);
         List<Element> nodes = document.select("img");
         int nodeLenth = nodes.size();
-        if(nodeLenth==0){
+        if (nodeLenth == 0) {
             return htmlBody;
         }
         for (int i = 0; i < nodeLenth; i++) {
@@ -409,44 +412,44 @@ public class GrapNews {
             }
             String originalSrc = e.attr("original");
             if (isNotBlank(originalSrc)) {
-                e.attr("src", "http:"+originalSrc);
+                e.attr("src", "http:" + originalSrc);
                 e.removeAttr("originalSrc");
             }
             String originalHiddenSrc = e.attr("original-hidden");
             if (isNotBlank(originalHiddenSrc)) {
-                e.attr("src", "http:"+originalHiddenSrc);
+                e.attr("src", "http:" + originalHiddenSrc);
                 e.removeAttr("original-hidden");
             }
         }
         if (htmlBody.contains("<html>")) {
-            if(needDeleteAlt==null&&!imgUrlNeedAddProtocolPrefix){
+            if (needDeleteAlt == null && !imgUrlNeedAddProtocolPrefix) {
                 return document.toString();
-            }else if(needDeleteAlt==null&&imgUrlNeedAddProtocolPrefix){
+            } else if (needDeleteAlt == null && imgUrlNeedAddProtocolPrefix) {
                 return document.toString().replace("src=\"//", "src=\"http://");
-            }else if(needDeleteAlt!=null&&imgUrlNeedAddProtocolPrefix){
+            } else if (needDeleteAlt != null && imgUrlNeedAddProtocolPrefix) {
                 return document.toString().replace("src=\"//", "src=\"http://")
-                        .replace("alt="+needDeleteAlt, "");
+                        .replace("alt=" + needDeleteAlt, "");
             }
-            return document.toString().replace("alt="+needDeleteAlt, "");
+            return document.toString().replace("alt=" + needDeleteAlt, "");
         } else {
-            if(needDeleteAlt==null&&!imgUrlNeedAddProtocolPrefix){
+            if (needDeleteAlt == null && !imgUrlNeedAddProtocolPrefix) {
                 return document.select("body>*").toString();
-            }else if(needDeleteAlt==null&&imgUrlNeedAddProtocolPrefix){
+            } else if (needDeleteAlt == null && imgUrlNeedAddProtocolPrefix) {
                 return document.select("body>*").toString().replace("src=\"//", "src=\"http://");
-            }else if(needDeleteAlt!=null&&imgUrlNeedAddProtocolPrefix){
+            } else if (needDeleteAlt != null && imgUrlNeedAddProtocolPrefix) {
                 return document.select("body>*").
-                        toString().replace("src=\"//", "src=\"http://").replace("alt="+needDeleteAlt, "");
+                        toString().replace("src=\"//", "src=\"http://").replace("alt=" + needDeleteAlt, "");
             }
-            return document.select("body>*").toString().replace("alt="+needDeleteAlt, "");
+            return document.select("body>*").toString().replace("alt=" + needDeleteAlt, "");
         }
 
     }
 
 
-    private static boolean isNotBlank(String str){
-        if(str == null)
+    private static boolean isNotBlank(String str) {
+        if (str == null)
             return false;
-        else if(str.trim().length() == 0)
+        else if (str.trim().length() == 0)
             return false;
         else
             return true;
diff --git a/mallplus-admin/src/test/java/com/zscat/mallplus/qczj/News.java b/mallplus-admin/src/test/java/com/zscat/mallplus/qczj/News.java
index 6a33891d7042b28419f14d84055ef0082c9dff43..69ba16765ab1af409fd31e106ab37ed8ac149c3d 100644
--- a/mallplus-admin/src/test/java/com/zscat/mallplus/qczj/News.java
+++ b/mallplus-admin/src/test/java/com/zscat/mallplus/qczj/News.java
@@ -1,5 +1,5 @@
 package com.zscat.mallplus.qczj;
- 
+
 /**
  * 新闻数据载体
  */
@@ -10,63 +10,64 @@ public class News {
     private String content;
     private String date;
     private String photoUrl;
+
     public News() {
     }
- 
+
     public News(String title, String href, String content, int id) {
         this.title = title;
         this.content = content;
         this.href = href;
         this.id = id;
     }
- 
+
     public int getId() {
         return id;
     }
- 
+
     public void setId(int id) {
         this.id = id;
     }
- 
- 
+
+
     public String getTitle() {
         return title;
     }
- 
+
     public void setTitle(String title) {
         this.title = title;
     }
- 
+
     public String getHref() {
         return href;
     }
- 
+
     public void setHref(String href) {
         this.href = href;
     }
- 
+
     public String getContent() {
         return content;
     }
- 
+
     public void setContent(String content) {
         this.content = content;
     }
- 
+
     public String getDate() {
         return date;
     }
- 
+
     public void setDate(String date) {
         this.date = date;
     }
- 
+
     public String getPhotoUrl() {
         return photoUrl;
     }
- 
+
     public void setPhotoUrl(String photoUrl) {
         this.photoUrl = photoUrl;
     }
-     
-}
\ No newline at end of file
+
+}
diff --git a/mallplus-admin/src/test/java/com/zscat/mallplus/qczj/newCrawl.java b/mallplus-admin/src/test/java/com/zscat/mallplus/qczj/newCrawl.java
index f36e4ba4c4b928aa2c2ab0521eb186378cf80459..b86264bf540a96634f5b5245acf698253c38fb2a 100644
--- a/mallplus-admin/src/test/java/com/zscat/mallplus/qczj/newCrawl.java
+++ b/mallplus-admin/src/test/java/com/zscat/mallplus/qczj/newCrawl.java
@@ -16,122 +16,46 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class newCrawl {
-  public LinkedList ImgUrls=new LinkedList();//用于存放图片URL
-  public LinkedList linkurls=new LinkedList();//用于存放url链接
+    public LinkedList ImgUrls = new LinkedList();//用于存放图片URL
+    public LinkedList linkurls = new LinkedList();//用于存放url链接
 
-  public static void main(String[] args) throws IOException {
-    newCrawl newCl = new newCrawl();
+    public static void main(String[] args) throws IOException {
+        newCrawl newCl = new newCrawl();
 
-    String url="http://mil.huanqiu.com/";
-            Document doc = Jsoup.connect(url).get();
-            newCl.downloadPage(url);//下载网页
-            String title=newCl.getnewTitle(doc);//获取新闻标题
-            String time=newCl.getTime(doc);//获取新闻发布时间
-            String text=newCl.getNewtext(doc);//获取新闻内容
-    System.out.println("新闻Url:"+url);
-    System.out.println("新闻标题:"+title);
-    //System.out.println("newsTime:"+time);
-    System.out.println("新闻内容:"+text);
-    System.out.println("******************************************************************");
+        String url = "http://mil.huanqiu.com/";
+        Document doc = Jsoup.connect(url).get();
+        newCl.downloadPage(url);//下载网页
+        String title = newCl.getnewTitle(doc);//获取新闻标题
+        String time = newCl.getTime(doc);//获取新闻发布时间
+        String text = newCl.getNewtext(doc);//获取新闻内容
+        System.out.println("新闻Url:" + url);
+        System.out.println("新闻标题:" + title);
+        //System.out.println("newsTime:"+time);
+        System.out.println("新闻内容:" + text);
+        System.out.println("******************************************************************");
 
-    newCl.getImgurl(doc);//获取图片链接
-    newCl.getlinkurl(doc);//获取网页链接
-    System.out.println("图片url链接");
-    for (Object IU : newCl.ImgUrls) {
-         System.out.println(IU);
-       }
-
-    System.out.println("*****************************************************************");
-    System.out.println("url链接");
-    for (Object LU : newCl.linkurls) {
-         System.out.println(LU);
-       }
-   }
-
-   public String getnewTitle(Document doc){
-    //获取网页的标题
-    String title=doc.title();
-    return title;
-   }
-   public LinkedList getlinkurl(Document doc) throws IOException{
-    //获取网页中的所有url地址，并保存在linkurls链表中
-    Elements href = doc.select("a[href]");
-    for (Element hre : href) {
-             String linkUrl = hre.attr("abs:href");//获取网页的绝对地址
-             if(!linkurls.contains(linkUrl)){
-             linkurls.add(linkUrl);
-             // System.out.println(linkUrl);
-             }
-           }
-    return linkurls;
-   }
-   public LinkedList getImgurl(Document doc) throws IOException{
-    //获取图片地址，并保存在ImgUrls链表中
-    int count=0;
-    Elements pngs = doc.select("img[src]");
-    for (Element img : pngs) {
-    count++;
-             String imgUrl = img.attr("abs:src");//获取图片的绝对路径
-             // imgUrl = img.absUrl("src");
-              ImgUrls.add(imgUrl);
-              //System.out.println(imgUrl);
-            //  downloadImg(imgUrl,count);
-           }
-    return ImgUrls;
-   }
-   public void  downloadImg(String ImgUrl,int count) throws IOException{
-    //下载图片
-    String str="D:\\Img\\";//保存下载图片文件夹
-    String ss=str+count+".png";//保存图片路径
-    URL url=new URL(ImgUrl);  // 构造URL
-    URLConnection uc=url.openConnection(); // 打开连接
-    InputStream is=uc.getInputStream(); // 输入流
-    File file=new File(ss); //创建文件
-    FileOutputStream out=new FileOutputStream(file);  // 输出的文件流
-     byte[] bs = new byte[1024];
-       // 读取到的数据长度
-       int len;
-       // 开始读取
-       while ((len = is.read(bs)) != -1) {
-       out.write(bs, 0, len);
-       }
-       // 完毕，关闭所有链接
-       out.close();
-       is.close();
-   }
-
-   public String getNewtext(Document doc){
-    //获取新闻内容
-            String text = doc.select("div.text").text();
-            text=text.replace(Jsoup.parse("   ").text(), "");
-            return text;
-   }
+        newCl.getImgurl(doc);//获取图片链接
+        newCl.getlinkurl(doc);//获取网页链接
+        System.out.println("图片url链接");
+        for (Object IU : newCl.ImgUrls) {
+            System.out.println(IU);
+        }
 
-   public String getTime(Document doc){
-    //获取新闻发布的时间
-    String time=null;
-    Elements element=doc.select("strong.timeSummary");//此处是根据百度新闻的网页形式解析的新闻时间
-           String rex="^(((20\\d{2})-(\\d{2})-(\\d{2}))) ((\\d{2}):(\\d{2}):(\\d{2}))$";//正则表达式用于匹配时间
-           Pattern pattern=Pattern.compile(rex);
-           for(Element el: element){
-             String content = el.text();
-             Matcher matcher=pattern.matcher(content);
-             if(matcher.matches()){
-             time=content;
-             System.out.println("新闻发布时间为："+content);
-             }
-           }
-           return time;
-   }
+        System.out.println("*****************************************************************");
+        System.out.println("url链接");
+        for (Object LU : newCl.linkurls) {
+            System.out.println(LU);
+        }
+    }
 
-   public static void downloadPage(String str){
-    //下载网页
-    String filestr="D:/test";//设置网页的保存地址
-    try {
+    public static void downloadPage(String str) {
+        //下载网页
+        String filestr = "D:/test";//设置网页的保存地址
+        try {
             URL pageUrl = new URL(str);
-            URLConnection uc =pageUrl.openConnection(); // 打开连接
+            URLConnection uc = pageUrl.openConnection(); // 打开连接
             String path = pageUrl.getPath();//获取网页的相对路径
-          //  System.out.println(path);
+            //  System.out.println(path);
             if (path.length() == 0) {//对网页的相对路径进行处理
                 path = "index.html";
             } else {
@@ -145,29 +69,108 @@ public class newCrawl {
                     }
                 }
             }
-            filestr=filestr+path;//网页保存路径
-            System.out.println("网页保存路径："+filestr);
+            filestr = filestr + path;//网页保存路径
+            System.out.println("网页保存路径：" + filestr);
             //设置网页保存目录，当保存网页的文件夹不存在时，需要先创建文件夹，然后在保存网页
             int lastSlash2 = filestr.lastIndexOf("/");
-            String filestrr=filestr.substring(0,lastSlash2);
-           // System.out.println(filestrr);
-     File file2=new File(filestrr); //创建文件目录
-     file2.mkdirs();
-   File file=new File(filestr); //创建文件
-   InputStream is=uc.getInputStream(); // 输入流
-   FileOutputStream out=new FileOutputStream(file);  // 输出的文件流
-    byte[] bs = new byte[1024];
-      // 读取到的数据长度
-      int len;
-      // 开始读取
-      while ((len = is.read(bs)) != -1) {
+            String filestrr = filestr.substring(0, lastSlash2);
+            // System.out.println(filestrr);
+            File file2 = new File(filestrr); //创建文件目录
+            file2.mkdirs();
+            File file = new File(filestr); //创建文件
+            InputStream is = uc.getInputStream(); // 输入流
+            FileOutputStream out = new FileOutputStream(file);  // 输出的文件流
+            byte[] bs = new byte[1024];
+            // 读取到的数据长度
+            int len;
+            // 开始读取
+            while ((len = is.read(bs)) != -1) {
 
-out.write(bs, 0, len);
-      }
-      // 完毕，关闭所有链接
-      out.close();
-      is.close();
+                out.write(bs, 0, len);
+            }
+            // 完毕，关闭所有链接
+            out.close();
+            is.close();
         } catch (Exception ex) {
         }
-   }
+    }
+
+    public String getnewTitle(Document doc) {
+        //获取网页的标题
+        String title = doc.title();
+        return title;
+    }
+
+    public LinkedList getlinkurl(Document doc) throws IOException {
+        //获取网页中的所有url地址，并保存在linkurls链表中
+        Elements href = doc.select("a[href]");
+        for (Element hre : href) {
+            String linkUrl = hre.attr("abs:href");//获取网页的绝对地址
+            if (!linkurls.contains(linkUrl)) {
+                linkurls.add(linkUrl);
+                // System.out.println(linkUrl);
+            }
+        }
+        return linkurls;
+    }
+
+    public LinkedList getImgurl(Document doc) throws IOException {
+        //获取图片地址，并保存在ImgUrls链表中
+        int count = 0;
+        Elements pngs = doc.select("img[src]");
+        for (Element img : pngs) {
+            count++;
+            String imgUrl = img.attr("abs:src");//获取图片的绝对路径
+            // imgUrl = img.absUrl("src");
+            ImgUrls.add(imgUrl);
+            //System.out.println(imgUrl);
+            //  downloadImg(imgUrl,count);
+        }
+        return ImgUrls;
+    }
+
+    public void downloadImg(String ImgUrl, int count) throws IOException {
+        //下载图片
+        String str = "D:\\Img\\";//保存下载图片文件夹
+        String ss = str + count + ".png";//保存图片路径
+        URL url = new URL(ImgUrl);  // 构造URL
+        URLConnection uc = url.openConnection(); // 打开连接
+        InputStream is = uc.getInputStream(); // 输入流
+        File file = new File(ss); //创建文件
+        FileOutputStream out = new FileOutputStream(file);  // 输出的文件流
+        byte[] bs = new byte[1024];
+        // 读取到的数据长度
+        int len;
+        // 开始读取
+        while ((len = is.read(bs)) != -1) {
+            out.write(bs, 0, len);
+        }
+        // 完毕，关闭所有链接
+        out.close();
+        is.close();
+    }
+
+    public String getNewtext(Document doc) {
+        //获取新闻内容
+        String text = doc.select("div.text").text();
+        text = text.replace(Jsoup.parse("   ").text(), "");
+        return text;
+    }
+
+    public String getTime(Document doc) {
+        //获取新闻发布的时间
+        String time = null;
+        Elements element = doc.select("strong.timeSummary");//此处是根据百度新闻的网页形式解析的新闻时间
+        String rex = "^(((20\\d{2})-(\\d{2})-(\\d{2}))) ((\\d{2}):(\\d{2}):(\\d{2}))$";//正则表达式用于匹配时间
+        Pattern pattern = Pattern.compile(rex);
+        for (Element el : element) {
+            String content = el.text();
+            Matcher matcher = pattern.matcher(content);
+            if (matcher.matches()) {
+                time = content;
+                System.out.println("新闻发布时间为：" + content);
+            }
+        }
+        return time;
+    }
 }
diff --git a/mallplus-admin/src/test/java/com/zscat/mallplus/tyPc/ZJNewsDetail.java b/mallplus-admin/src/test/java/com/zscat/mallplus/tyPc/ZJNewsDetail.java
index 3ab6b717a14a2465ca9d7159b7d06da06505b603..c4d8d2b50ffb1fbacaaedc4af367f047456f6efc 100644
--- a/mallplus-admin/src/test/java/com/zscat/mallplus/tyPc/ZJNewsDetail.java
+++ b/mallplus-admin/src/test/java/com/zscat/mallplus/tyPc/ZJNewsDetail.java
@@ -5,14 +5,14 @@ import com.geccocrawler.gecco.annotation.HtmlField;
 import com.geccocrawler.gecco.annotation.Text;
 import com.geccocrawler.gecco.spider.HtmlBean;
 
-@Gecco(matchUrl = "http://zj.zjol.com.cn/news/[code].html" ,pipelines = "zjNewsDetailPipeline")
+@Gecco(matchUrl = "http://zj.zjol.com.cn/news/[code].html", pipelines = "zjNewsDetailPipeline")
 public class ZJNewsDetail implements HtmlBean {
- 
-  @Text
-  @HtmlField(cssPath = "#headline")
-  private String title ;
- 
-  @Text
-  @HtmlField(cssPath = "#content > div > div.news_con > div.news-content > div:nth-child(1) > div > p.go-left.post-time.c-gray")
-  private String createTime;
-}
\ No newline at end of file
+
+    @Text
+    @HtmlField(cssPath = "#headline")
+    private String title;
+
+    @Text
+    @HtmlField(cssPath = "#content > div > div.news_con > div.news-content > div:nth-child(1) > div > p.go-left.post-time.c-gray")
+    private String createTime;
+}
diff --git a/mallplus-admin/src/test/java/com/zscat/mallplus/tyPc/ZJNewsGeccoList.java b/mallplus-admin/src/test/java/com/zscat/mallplus/tyPc/ZJNewsGeccoList.java
index cf599c8355f29cea99390c66e713ff0abb774f30..8fbdbd57470bafc7195f60df23d68b91a71fdc09 100644
--- a/mallplus-admin/src/test/java/com/zscat/mallplus/tyPc/ZJNewsGeccoList.java
+++ b/mallplus-admin/src/test/java/com/zscat/mallplus/tyPc/ZJNewsGeccoList.java
@@ -12,14 +12,14 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-@Gecco(matchUrl = "http://zj.zjol.com.cn/home.html?pageIndex={pageIndex}&pageSize={pageSize}",pipelines = "zJNewsListPipelines")
+@Gecco(matchUrl = "http://zj.zjol.com.cn/home.html?pageIndex={pageIndex}&pageSize={pageSize}", pipelines = "zJNewsListPipelines")
 public class ZJNewsGeccoList implements HtmlBean {
-  @Request
-  private HttpRequest request;
-  @RequestParameter
-  private int pageIndex;
-  @RequestParameter
-  private int pageSize;
-  @HtmlField(cssPath = "#content > div > div > div.con_index > div.r.main_mod > div > ul > li > dl > dt > a")
-  private List<HrefBean> newList;
-}
\ No newline at end of file
+    @Request
+    private HttpRequest request;
+    @RequestParameter
+    private int pageIndex;
+    @RequestParameter
+    private int pageSize;
+    @HtmlField(cssPath = "#content > div > div > div.con_index > div.r.main_mod > div > ul > li > dl > dt > a")
+    private List<HrefBean> newList;
+}
diff --git a/mallplus-admin/src/test/java/com/zscat/mallplus/tyPc/ZJNewsListPipelines.java b/mallplus-admin/src/test/java/com/zscat/mallplus/tyPc/ZJNewsListPipelines.java
index e419bc472a4b0c3bf50afb75087a8ab4a0048bdb..1e36cca270e31caa4305a5c232a96467ac2fd9ce 100644
--- a/mallplus-admin/src/test/java/com/zscat/mallplus/tyPc/ZJNewsListPipelines.java
+++ b/mallplus-admin/src/test/java/com/zscat/mallplus/tyPc/ZJNewsListPipelines.java
@@ -8,15 +8,15 @@ import com.geccocrawler.gecco.spider.HrefBean;
 
 @PipelineName("zJNewsListPipelines")
 public class ZJNewsListPipelines implements Pipeline<ZJNewsGeccoList> {
-  public void process(ZJNewsGeccoList zjNewsGeccoList) {
-    HttpRequest request=zjNewsGeccoList.getRequest();
-    for (HrefBean bean:zjNewsGeccoList.getNewList()){
-      //进入祥情页面抓取
-    SchedulerContext.into(request.subRequest("http://zj.zjol.com.cn"+bean.getUrl()));
+    public void process(ZJNewsGeccoList zjNewsGeccoList) {
+        HttpRequest request = zjNewsGeccoList.getRequest();
+        for (HrefBean bean : zjNewsGeccoList.getNewList()) {
+            //进入祥情页面抓取
+            SchedulerContext.into(request.subRequest("http://zj.zjol.com.cn" + bean.getUrl()));
+        }
+        int page = zjNewsGeccoList.getPageIndex() + 1;
+        String nextUrl = "http://zj.zjol.com.cn/home.html?pageIndex=" + page + "&pageSize=100";
+        //抓取下一页
+        SchedulerContext.into(request.subRequest(nextUrl));
     }
-    int page=zjNewsGeccoList.getPageIndex()+1;
-    String nextUrl = "http://zj.zjol.com.cn/home.html?pageIndex="+page+"&pageSize=100";
-    //抓取下一页
-    SchedulerContext.into(request.subRequest(nextUrl));
-  }
-}
\ No newline at end of file
+}
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ApiContext.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ApiContext.java
new file mode 100644
index 0000000000000000000000000000000000000000..1ff713ba2a3241d2f57d65b063f3fee1ad7e860f
--- /dev/null
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ApiContext.java
@@ -0,0 +1,55 @@
+package com.zscat.mallplus;
+
+import com.google.common.collect.Maps;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
+
+@Component
+public class ApiContext {
+
+    private static final String KEY_CURRENT_PROVIDER_ID = "KEY_CURRENT_PROVIDER_ID";
+    /* public Long getCurrentProviderId() {
+
+         return  threadLocal.get();
+     }
+
+     public void setCurrentProviderId(Long providerId) {
+         threadLocal.set(providerId);
+     }*/
+    private static final Map<String, Object> mContext = Maps.newConcurrentMap();
+    private static ThreadLocal<Long> threadLocal = new ThreadLocal<>();
+    // private static final Map<String, Object> mContext = Maps.newConcurrentMap();
+
+   /* public Long getCurrentProviderId() {
+        ConcurrentMap mContext=contextHolder.get();
+        System.out.println("1="+mContext);
+
+        if (mContext==null){
+            return 0l;
+        }
+        System.out.println("2="+mContext.get(KEY_CURRENT_PROVIDER_ID));
+        return (Long) mContext.get(KEY_CURRENT_PROVIDER_ID);
+    }
+
+    public void setCurrentProviderId(Long providerId) {
+        ConcurrentMap mContext=contextHolder.get();
+        if (mContext==null){
+            mContext= Maps.newConcurrentMap();
+        }
+        mContext.put(KEY_CURRENT_PROVIDER_ID,providerId);
+
+        System.out.println("3="+mContext);
+        contextHolder.set(mContext);
+    }*/
+    private static ThreadLocal<ConcurrentMap> contextHolder = new ThreadLocal<>();
+
+    public Long getCurrentProviderId() {
+        return (Long) mContext.get(KEY_CURRENT_PROVIDER_ID);
+    }
+
+    public void setCurrentProviderId(Long providerId) {
+        mContext.put(KEY_CURRENT_PROVIDER_ID, providerId);
+    }
+}
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BakGoods.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BakGoods.java
index e0e44dc65d191c564adadc0e9b4e2c74e325d586..ddd4877a0a61780cb848e0ab2c5c408df6db608f 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BakGoods.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BakGoods.java
@@ -304,27 +304,27 @@ public class BakGoods implements Serializable {
     @Override
     public String toString() {
         return "BakGoods{" +
-        ", id=" + id +
-        ", goodsSn=" + goodsSn +
-        ", name=" + name +
-        ", categoryId=" + categoryId +
-        ", brandId=" + brandId +
-        ", gallery=" + gallery +
-        ", keywords=" + keywords +
-        ", brief=" + brief +
-        ", isOnSale=" + isOnSale +
-        ", sortOrder=" + sortOrder +
-        ", picUrl=" + picUrl +
-        ", shareUrl=" + shareUrl +
-        ", isNew=" + isNew +
-        ", isHot=" + isHot +
-        ", unit=" + unit +
-        ", counterPrice=" + counterPrice +
-        ", retailPrice=" + retailPrice +
-        ", detail=" + detail +
-        ", addTime=" + addTime +
-        ", updateTime=" + updateTime +
-        ", deleted=" + deleted +
-        "}";
+                ", id=" + id +
+                ", goodsSn=" + goodsSn +
+                ", name=" + name +
+                ", categoryId=" + categoryId +
+                ", brandId=" + brandId +
+                ", gallery=" + gallery +
+                ", keywords=" + keywords +
+                ", brief=" + brief +
+                ", isOnSale=" + isOnSale +
+                ", sortOrder=" + sortOrder +
+                ", picUrl=" + picUrl +
+                ", shareUrl=" + shareUrl +
+                ", isNew=" + isNew +
+                ", isHot=" + isHot +
+                ", unit=" + unit +
+                ", counterPrice=" + counterPrice +
+                ", retailPrice=" + retailPrice +
+                ", detail=" + detail +
+                ", addTime=" + addTime +
+                ", updateTime=" + updateTime +
+                ", deleted=" + deleted +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillAftersales.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillAftersales.java
index 99c67d44348bad8d941edbd933ff394e2071a794..45569470c9d6cdbfb44818e65157d37615e8265e 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillAftersales.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillAftersales.java
@@ -22,62 +22,51 @@ import java.util.List;
 public class BillAftersales implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
+    @TableField(exist = false)
+    List<BillAftersalesItems> itemList;
     /**
      * 售后单id
      */
     @TableId("aftersales_id")
     private String aftersalesId;
-
     /**
      * 订单ID 关联order.id
      */
     @TableField("order_id")
     private String orderId;
-
     /**
      * 用户ID 关联user.id
      */
     @TableField("user_id")
     private Long userId;
-
     /**
      * 售后类型，1=只退款，2退款退货
      */
     private Boolean type;
-
     /**
      * 退款金额
      */
     private BigDecimal refund;
-
     /**
      * 状态 1=未审核 2=审核通过 3=审核拒绝
      */
     private Boolean status;
-
     /**
      * 退款原因
      */
     private String reason;
-
     /**
      * 卖家备注，如果审核失败了，会显示到前端
      */
     private String mark;
-
     /**
      * 创建时间
      */
     private Long ctime;
-
     /**
      * 更新时间
      */
     private Long utime;
 
-    @TableField(exist = false)
-    List<BillAftersalesItems> itemList ;
-
 
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillAftersalesItems.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillAftersalesItems.java
index 90c60280160ec1568618364af969cec8de3d170c..0d7945942fc7a4ffaa7c8c9ac5f579a717e564b9 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillAftersalesItems.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillAftersalesItems.java
@@ -183,18 +183,18 @@ public class BillAftersalesItems implements Serializable {
     @Override
     public String toString() {
         return "BillAftersalesItems{" +
-        ", id=" + id +
-        ", aftersalesId=" + aftersalesId +
-        ", orderItemsId=" + orderItemsId +
-        ", goodsId=" + goodsId +
-        ", productId=" + productId +
-        ", sn=" + sn +
-        ", bn=" + bn +
-        ", name=" + name +
-        ", imageUrl=" + imageUrl +
-        ", nums=" + nums +
-        ", addon=" + addon +
-        ", utime=" + utime +
-        "}";
+                ", id=" + id +
+                ", aftersalesId=" + aftersalesId +
+                ", orderItemsId=" + orderItemsId +
+                ", goodsId=" + goodsId +
+                ", productId=" + productId +
+                ", sn=" + sn +
+                ", bn=" + bn +
+                ", name=" + name +
+                ", imageUrl=" + imageUrl +
+                ", nums=" + nums +
+                ", addon=" + addon +
+                ", utime=" + utime +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillDelivery.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillDelivery.java
index 36ef52b6d2c633bc67da405f5d76df30f87ab1b0..84c8dd2f869c1420c6a7d3efc942f6068777ebc8 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillDelivery.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillDelivery.java
@@ -240,22 +240,22 @@ public class BillDelivery implements Serializable {
     @Override
     public String toString() {
         return "BillDelivery{" +
-        ", deliveryId=" + deliveryId +
-        ", orderId=" + orderId +
-        ", userId=" + userId +
-        ", logiCode=" + logiCode +
-        ", logiNo=" + logiNo +
-        ", logiInformation=" + logiInformation +
-        ", logiStatus=" + logiStatus +
-        ", shipAreaId=" + shipAreaId +
-        ", shipAddress=" + shipAddress +
-        ", shipName=" + shipName +
-        ", shipMobile=" + shipMobile +
-        ", confirmTime=" + confirmTime +
-        ", status=" + status +
-        ", memo=" + memo +
-        ", ctime=" + ctime +
-        ", utime=" + utime +
-        "}";
+                ", deliveryId=" + deliveryId +
+                ", orderId=" + orderId +
+                ", userId=" + userId +
+                ", logiCode=" + logiCode +
+                ", logiNo=" + logiNo +
+                ", logiInformation=" + logiInformation +
+                ", logiStatus=" + logiStatus +
+                ", shipAreaId=" + shipAreaId +
+                ", shipAddress=" + shipAddress +
+                ", shipName=" + shipName +
+                ", shipMobile=" + shipMobile +
+                ", confirmTime=" + confirmTime +
+                ", status=" + status +
+                ", memo=" + memo +
+                ", ctime=" + ctime +
+                ", utime=" + utime +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillDeliveryItems.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillDeliveryItems.java
index a507a3ed3702888f7e4c20cb309e5cb5f8ff9912..8806dfa66ee77c40a629a4ebb18a4c96abda40d5 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillDeliveryItems.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillDeliveryItems.java
@@ -76,10 +76,10 @@ public class BillDeliveryItems implements Serializable {
     @Override
     public String toString() {
         return "BillDeliveryItems{" +
-        ", id=" + id +
-        ", deliveryId=" + deliveryId +
-        ", orderItemsId=" + orderItemsId +
-        ", nums=" + nums +
-        "}";
+                ", id=" + id +
+                ", deliveryId=" + deliveryId +
+                ", orderItemsId=" + orderItemsId +
+                ", nums=" + nums +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillLading.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillLading.java
index 3d6b7569442bfe992a103fbe2a029dad196945ae..022cbe0abdcf1834816ea5d1c7a6cda8c494ba83 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillLading.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillLading.java
@@ -168,17 +168,17 @@ public class BillLading implements Serializable {
     @Override
     public String toString() {
         return "BillLading{" +
-        ", id=" + id +
-        ", orderId=" + orderId +
-        ", storeId=" + storeId +
-        ", name=" + name +
-        ", mobile=" + mobile +
-        ", clerkId=" + clerkId +
-        ", ptime=" + ptime +
-        ", status=" + status +
-        ", ctime=" + ctime +
-        ", utime=" + utime +
-        ", isdel=" + isdel +
-        "}";
+                ", id=" + id +
+                ", orderId=" + orderId +
+                ", storeId=" + storeId +
+                ", name=" + name +
+                ", mobile=" + mobile +
+                ", clerkId=" + clerkId +
+                ", ptime=" + ptime +
+                ", status=" + status +
+                ", ctime=" + ctime +
+                ", utime=" + utime +
+                ", isdel=" + isdel +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillPayments.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillPayments.java
index b2871762afae572ccbebae52d0212be66b3d8574..94359923802e4ffac3a1a1e43dc50ede7fdadb03 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillPayments.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillPayments.java
@@ -185,18 +185,18 @@ public class BillPayments implements Serializable {
     @Override
     public String toString() {
         return "BillPayments{" +
-        ", paymentId=" + paymentId +
-        ", money=" + money +
-        ", userId=" + userId +
-        ", type=" + type +
-        ", status=" + status +
-        ", paymentCode=" + paymentCode +
-        ", ip=" + ip +
-        ", params=" + params +
-        ", payedMsg=" + payedMsg +
-        ", tradeNo=" + tradeNo +
-        ", ctime=" + ctime +
-        ", utime=" + utime +
-        "}";
+                ", paymentId=" + paymentId +
+                ", money=" + money +
+                ", userId=" + userId +
+                ", type=" + type +
+                ", status=" + status +
+                ", paymentCode=" + paymentCode +
+                ", ip=" + ip +
+                ", params=" + params +
+                ", payedMsg=" + payedMsg +
+                ", tradeNo=" + tradeNo +
+                ", ctime=" + ctime +
+                ", utime=" + utime +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillPaymentsRel.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillPaymentsRel.java
index 4e60e363336f2e11e92b018062b8059d6713168c..08d982ae2ef7ab0a4a39c916194bb1b6483ab7e0 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillPaymentsRel.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillPaymentsRel.java
@@ -64,9 +64,9 @@ public class BillPaymentsRel implements Serializable {
     @Override
     public String toString() {
         return "BillPaymentsRel{" +
-        ", paymentId=" + paymentId +
-        ", sourceId=" + sourceId +
-        ", money=" + money +
-        "}";
+                ", paymentId=" + paymentId +
+                ", sourceId=" + sourceId +
+                ", money=" + money +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillRefund.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillRefund.java
index 8cbc9dd08849ec4cef00494ac2cee48c4dffb4a7..dd9c91e001e106024dcae087be058709abb6f57d 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillRefund.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillRefund.java
@@ -183,18 +183,18 @@ public class BillRefund implements Serializable {
     @Override
     public String toString() {
         return "BillRefund{" +
-        ", refundId=" + refundId +
-        ", aftersalesId=" + aftersalesId +
-        ", money=" + money +
-        ", userId=" + userId +
-        ", sourceId=" + sourceId +
-        ", type=" + type +
-        ", paymentCode=" + paymentCode +
-        ", tradeNo=" + tradeNo +
-        ", status=" + status +
-        ", memo=" + memo +
-        ", ctime=" + ctime +
-        ", utime=" + utime +
-        "}";
+                ", refundId=" + refundId +
+                ", aftersalesId=" + aftersalesId +
+                ", money=" + money +
+                ", userId=" + userId +
+                ", sourceId=" + sourceId +
+                ", type=" + type +
+                ", paymentCode=" + paymentCode +
+                ", tradeNo=" + tradeNo +
+                ", status=" + status +
+                ", memo=" + memo +
+                ", ctime=" + ctime +
+                ", utime=" + utime +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillReship.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillReship.java
index 1942c4485282b65b267cf903a404876c2f21d347..1db527c6ab578fda8d2cfac8943801d80de1ecd2 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillReship.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillReship.java
@@ -156,16 +156,16 @@ public class BillReship implements Serializable {
     @Override
     public String toString() {
         return "BillReship{" +
-        ", reshipId=" + reshipId +
-        ", orderId=" + orderId +
-        ", aftersalesId=" + aftersalesId +
-        ", userId=" + userId +
-        ", logiCode=" + logiCode +
-        ", logiNo=" + logiNo +
-        ", status=" + status +
-        ", memo=" + memo +
-        ", ctime=" + ctime +
-        ", utime=" + utime +
-        "}";
+                ", reshipId=" + reshipId +
+                ", orderId=" + orderId +
+                ", aftersalesId=" + aftersalesId +
+                ", userId=" + userId +
+                ", logiCode=" + logiCode +
+                ", logiNo=" + logiNo +
+                ", status=" + status +
+                ", memo=" + memo +
+                ", ctime=" + ctime +
+                ", utime=" + utime +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillReshipItems.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillReshipItems.java
index 39e16e38a100ca85624360eaf26b2a909a92d5de..bcb1dfb30c36d80bb43bfe2c06931b45f4f723cf 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillReshipItems.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/bill/entity/BillReshipItems.java
@@ -183,18 +183,18 @@ public class BillReshipItems implements Serializable {
     @Override
     public String toString() {
         return "BillReshipItems{" +
-        ", id=" + id +
-        ", reshipId=" + reshipId +
-        ", orderItemsId=" + orderItemsId +
-        ", goodsId=" + goodsId +
-        ", productId=" + productId +
-        ", sn=" + sn +
-        ", bn=" + bn +
-        ", name=" + name +
-        ", imageUrl=" + imageUrl +
-        ", nums=" + nums +
-        ", addon=" + addon +
-        ", utime=" + utime +
-        "}";
+                ", id=" + id +
+                ", reshipId=" + reshipId +
+                ", orderItemsId=" + orderItemsId +
+                ", goodsId=" + goodsId +
+                ", productId=" + productId +
+                ", sn=" + sn +
+                ", bn=" + bn +
+                ", name=" + name +
+                ", imageUrl=" + imageUrl +
+                ", nums=" + nums +
+                ", addon=" + addon +
+                ", utime=" + utime +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildAdv.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildAdv.java
index acdb5e2ffd35b4628832d499bb19163583f4b736..9ad39ae80339f61907fe868649e57c29df7da5bd 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildAdv.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildAdv.java
@@ -70,5 +70,4 @@ public class BuildAdv implements Serializable {
     private Integer communityId;
 
 
-
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildGroup.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildGroup.java
index 5d648a3b51f0adba42776a862258737e17c7fb7b..2c90ff89306a4b9edadfc95e54a80081937dbbd9 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildGroup.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildGroup.java
@@ -91,5 +91,4 @@ public class BuildGroup implements Serializable {
     private Long communityId;
 
 
-
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildNotice.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildNotice.java
index 2136d99167fd0ee93189653e1b23da2c627204b6..07b7b0c9c053c9e86b0770c85a90616805d7bac0 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildNotice.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildNotice.java
@@ -1,9 +1,9 @@
 package com.zscat.mallplus.build.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -63,5 +63,4 @@ public class BuildNotice implements Serializable {
     private Integer communityId;
 
 
-
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildTypePrice.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildTypePrice.java
index 60dba39ab1b6d60a0f17a2f2c0990efc6bce529b..9db82515923adcba6c911ec8e728ce4dfd48b900 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildTypePrice.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildTypePrice.java
@@ -57,5 +57,4 @@ public class BuildTypePrice implements Serializable {
     private Long communityId;
 
 
-
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildWuyeCompany.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildWuyeCompany.java
index 02cc16ae002f0fd7c10903435451aa1a9f01aac4..2f42fb3d60ea82e16c92d58dd7e1ec3884748b60 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildWuyeCompany.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildWuyeCompany.java
@@ -66,5 +66,4 @@ public class BuildWuyeCompany implements Serializable {
     private String phone;
 
 
-
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingCommunity.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingCommunity.java
index b5f0cb0710da9e81e0e61f37ff4ea5830f8edcb1..23b71f0835d16bf9befc183efb3126b173e6faa7 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingCommunity.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingCommunity.java
@@ -41,23 +41,23 @@ public class BuildingCommunity implements Serializable {
     /**
      * 小区名称
      */
-    @Excel(name = "名称",  orderNum = "1", width=30)
+    @Excel(name = "名称", orderNum = "1", width = 30)
     private String name;
 
-    @Excel(name = "物业编号",  orderNum = "1", width=30)
+    @Excel(name = "物业编号", orderNum = "1", width = 30)
     @TableField("company_id")
     private Long companyId;
 
     /**
      * 小区栋数
      */
-    @Excel(name = "小区栋数",  orderNum = "2", width=30)
+    @Excel(name = "小区栋数", orderNum = "2", width = 30)
     private String counts;
 
     /**
      * 小区地址
      */
-    @Excel(name = "小区地址",  orderNum = "3", width=30)
+    @Excel(name = "小区地址", orderNum = "3", width = 30)
     private String address;
 
     /**
@@ -70,34 +70,34 @@ public class BuildingCommunity implements Serializable {
      * 地标，如王府井北60米
      */
     @TableField("nearby_landmarks")
-    @Excel(name = "地标",  orderNum = "4", width=30)
+    @Excel(name = "地标", orderNum = "4", width = 30)
     private String nearbyLandmarks;
 
     /**
      * 地区 纬度
      */
-    @Excel(name = "纬度",  orderNum = "5", width=30)
+    @Excel(name = "纬度", orderNum = "5", width = 30)
     private String latitude;
 
     /**
      * 地区 经度
      */
-    @Excel(name = "经度",  orderNum = "6", width=30)
+    @Excel(name = "经度", orderNum = "6", width = 30)
     private String longitude;
 
     /**
      * 创建时间
      */
-    @Excel(name = "创建时间", exportFormat = "yyyy-MM-dd",  orderNum = "9", width=30)
+    @Excel(name = "创建时间", exportFormat = "yyyy-MM-dd", orderNum = "9", width = 30)
     @TableField("create_time")
     private Date createTime;
 
     /**
      * 1申请 2审核失败 3 审核成功
      */
-    @Excel(name = "状态",  orderNum = "8", width=30)
+    @Excel(name = "状态", orderNum = "8", width = 30)
     private Integer status;
-    @Excel(name = "电话",  orderNum = "7", width=30)
+    @Excel(name = "电话", orderNum = "7", width = 30)
     private String phone;
 
     @TableField("status_desc")
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingFloor.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingFloor.java
index 03ffebe351599062416b3d2212dd15a00719a0a6..d16dd71c9c24aad528a3ee719d3e24594c6a1e1c 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingFloor.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingFloor.java
@@ -33,41 +33,41 @@ public class BuildingFloor implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    @Excel(name = "社区编号",  orderNum = "1", width=30)
+    @Excel(name = "社区编号", orderNum = "1", width = 30)
     @TableField("community_id")
     private Long communityId;
     /**
      * 楼编号
      */
-    @Excel(name = "楼编号",  orderNum = "2", width=30)
+    @Excel(name = "楼编号", orderNum = "2", width = 30)
     @TableField("floor_num")
     private String floorNum;
 
     /**
      * 小区楼名称
      */
-    @Excel(name = "名称",  orderNum = "3", width=30)
+    @Excel(name = "名称", orderNum = "3", width = 30)
     private String name;
 
-    @Excel(name = "楼层",  orderNum = "4", width=30)
+    @Excel(name = "楼层", orderNum = "4", width = 30)
     @TableField("layer_count")
     private Integer layerCount;
 
     /**
      * 1 有电梯
      */
-    @Excel(name = "电梯",  orderNum = "5", width=30)
+    @Excel(name = "电梯", orderNum = "5", width = 30)
     private Integer lift;
     /**
      * 备注
      */
-    @Excel(name = "备注",  orderNum = "6", width=30)
+    @Excel(name = "备注", orderNum = "6", width = 30)
     private String remark;
 
     /**
      * 创建时间
      */
-    @Excel(name = "创建时间", exportFormat = "yyyy-MM-dd",  orderNum = "7", width=30)
+    @Excel(name = "创建时间", exportFormat = "yyyy-MM-dd", orderNum = "7", width = 30)
     @TableField("create_time")
     private Date createTime;
 
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingOwner.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingOwner.java
index 8b2ba806cfde56f67e986f92b30c372c7672ca5c..d8953fae0bfb32765cb7a3ba8b74c38c8ed5b8ec 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingOwner.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingOwner.java
@@ -35,46 +35,46 @@ public class BuildingOwner implements Serializable {
     /**
      * 业主ID
      */
-    @Excel(name = "业主ID",  orderNum = "1", width=30)
+    @Excel(name = "业主ID", orderNum = "1", width = 30)
     @TableField("owner_id")
     private Long ownerId;
-    @Excel(name = "房屋编号",  orderNum = "2", width=30)
+    @Excel(name = "房屋编号", orderNum = "2", width = 30)
     @TableField("room_id")
     private Long roomId;
     /**
      * 业主名称
      */
-    @Excel(name = "名称",  orderNum = "3", width=30)
+    @Excel(name = "名称", orderNum = "3", width = 30)
     private String name;
 
     /**
      * 性别
      */
-    @Excel(name = "性别",  orderNum = "4", width=30)
+    @Excel(name = "性别", orderNum = "4", width = 30)
     private String sex;
 
     /**
      * 年龄
      */
-    @Excel(name = "年龄",  orderNum = "5", width=30)
+    @Excel(name = "年龄", orderNum = "5", width = 30)
     private Integer age;
 
     /**
      * 联系人手机号
      */
-    @Excel(name = "联系人手机号",  orderNum = "6", width=30)
+    @Excel(name = "联系人手机号", orderNum = "6", width = 30)
     private String phone;
 
     /**
      * 备注
      */
-    @Excel(name = "备注",  orderNum = "7", width=30)
+    @Excel(name = "备注", orderNum = "7", width = 30)
     private String remark;
 
     /**
      * 创建时间
      */
-    @Excel(name = "创建时间", exportFormat = "yyyy-MM-dd",  orderNum = "8", width=30)
+    @Excel(name = "创建时间", exportFormat = "yyyy-MM-dd", orderNum = "8", width = 30)
     @TableField("create_time")
     private Date createTime;
 
@@ -86,7 +86,7 @@ public class BuildingOwner implements Serializable {
     /**
      * 1 业主本人 2 家庭成员 3 租户
      */
-    @Excel(name = "名称",  orderNum = "3", width=30)
+    @Excel(name = "名称", orderNum = "3", width = 30)
     private Integer type;
 
     @TableField("status_desc")
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingRoom.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingRoom.java
index efdc59f2aec78526eb3506da0988f9da519e4e2d..02d988a74106759043d8f1047695c95f9d491068 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingRoom.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingRoom.java
@@ -36,7 +36,7 @@ public class BuildingRoom implements Serializable {
     /**
      * 房屋编号
      */
-    @Excel(name = "房屋编号",  orderNum = "1", width=30)
+    @Excel(name = "房屋编号", orderNum = "1", width = 30)
     @TableField("room_num")
     private String roomNum;
 
@@ -44,62 +44,62 @@ public class BuildingRoom implements Serializable {
     private String roomDesc;
 
 
-    @Excel(name = "小区编号",  orderNum = "2", width=30)
+    @Excel(name = "小区编号", orderNum = "2", width = 30)
     @TableField("community_id")
     private Long communityId;
 
-    @Excel(name = "楼编号",  orderNum = "3", width=30)
+    @Excel(name = "楼编号", orderNum = "3", width = 30)
     @TableField("floor_id")
     private Long floorId;
     /**
      * 单元ID
      */
-    @Excel(name = "单元编号",  orderNum = "4", width=30)
+    @Excel(name = "单元编号", orderNum = "4", width = 30)
     @TableField("unit_id")
     private String unitId;
 
     /**
      * 层数
      */
-    @Excel(name = "层数",  orderNum = "5", width=30)
+    @Excel(name = "层数", orderNum = "5", width = 30)
     private Integer layer;
 
     /**
      * 室
      */
-    @Excel(name = "室",  orderNum = "6", width=30)
+    @Excel(name = "室", orderNum = "6", width = 30)
     private String section;
 
     /**
      * 户型
      */
-    @Excel(name = "户型",  orderNum = "7", width=30)
+    @Excel(name = "户型", orderNum = "7", width = 30)
     private String apartment;
 
     /**
      * 建筑面积
      */
-    @Excel(name = "建筑面积",  orderNum = "8", width=30)
+    @Excel(name = "建筑面积", orderNum = "8", width = 30)
     @TableField("built_up_area")
     private BigDecimal builtUpArea;
 
     /**
      * 每平米单价
      */
-    @Excel(name = "每平米单价",  orderNum = "9", width=30)
+    @Excel(name = "每平米单价", orderNum = "9", width = 30)
     @TableField("unit_price")
     private BigDecimal unitPrice;
 
     /**
      * 备注
      */
-    @Excel(name = "备注",  orderNum = "10", width=30)
+    @Excel(name = "备注", orderNum = "10", width = 30)
     private String remark;
 
     /**
      * 创建时间
      */
-    @Excel(name = "创建时间", exportFormat = "yyyy-MM-dd",  orderNum = "11", width=30)
+    @Excel(name = "创建时间", exportFormat = "yyyy-MM-dd", orderNum = "11", width = 30)
     @TableField("create_time")
     private Date createTime;
 
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingUnit.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingUnit.java
index 0602e21b59cf0adf7342f95b3fa0d6ee1fee876f..3ca7cbf6c8f005008848fe4c50e79bc13f2b78c6 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingUnit.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingUnit.java
@@ -35,30 +35,29 @@ public class BuildingUnit implements Serializable {
     /**
      * 单元编号
      */
-    @Excel(name = " 单元编号",  orderNum = "1", width=30)
+    @Excel(name = " 单元编号", orderNum = "1", width = 30)
     @TableField("unit_num")
     private String unitNum;
 
     /**
      * 楼ID
      */
-    @Excel(name = " 楼编号",  orderNum = "2", width=30)
+    @Excel(name = " 楼编号", orderNum = "2", width = 30)
     @TableField("floor_id")
     private String floorId;
 
     /**
      * 备注
      */
-    @Excel(name = "备注",  orderNum = "3", width=30)
+    @Excel(name = "备注", orderNum = "3", width = 30)
     private String remark;
 
     /**
      * 创建时间
      */
-    @Excel(name = "创建时间", exportFormat = "yyyy-MM-dd",  orderNum = "4", width=30)
+    @Excel(name = "创建时间", exportFormat = "yyyy-MM-dd", orderNum = "4", width = 30)
     @TableField("create_time")
     private Date createTime;
 
 
-
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildAdvMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildAdvMapper.java
index f882a41df93cb91b08a99fbc05e4010f6749f150..2cf590268d40c7665e6b26fc1ddb0e77e2acf63d 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildAdvMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildAdvMapper.java
@@ -1,7 +1,7 @@
 package com.zscat.mallplus.build.mapper;
 
-import com.zscat.mallplus.build.entity.BuildAdv;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.build.entity.BuildAdv;
 
 /**
  * <p>
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildApplyRoomMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildApplyRoomMapper.java
index b0772124654f324dfa08488e79b4d5a90208e916..ff4fe8edcd5a2e96eabe2753b6e0ca4a256380f9 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildApplyRoomMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildApplyRoomMapper.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.build.mapper;
 
-import com.zscat.mallplus.build.entity.BuildApplyRoom;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.build.entity.BuildApplyRoom;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildGroupMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildGroupMapper.java
index 150f418f5c2f0fdff137dede777e01fe2fba7a2e..5555087f43017cf32ee222855820fc64b5fe85d6 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildGroupMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildGroupMapper.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.build.mapper;
 
-import com.zscat.mallplus.build.entity.BuildGroup;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.build.entity.BuildGroup;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildGroupMemberMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildGroupMemberMapper.java
index 26b2d0027a1012e20f1a886e0acf462ce66be625..53e7c08c2c7efbaef7c5da7dfc8b914c8ec7ca26 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildGroupMemberMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildGroupMemberMapper.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.build.mapper;
 
-import com.zscat.mallplus.build.entity.BuildGroupMember;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.build.entity.BuildGroupMember;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildNoticeMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildNoticeMapper.java
index 3caed9d5284a3851cff7717162496b37a3753c00..f63d5fe713b429ed9c6fa79b8907f83cd22a43f2 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildNoticeMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildNoticeMapper.java
@@ -1,7 +1,7 @@
 package com.zscat.mallplus.build.mapper;
 
-import com.zscat.mallplus.build.entity.BuildNotice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.build.entity.BuildNotice;
 
 /**
  * <p>
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildRepairMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildRepairMapper.java
index 41ad43879833f2cf838d640eb7c2993e6c04dfb6..a08d95d88b21397e886e0d1fbd3718e1a6d037d4 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildRepairMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildRepairMapper.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.build.mapper;
 
-import com.zscat.mallplus.build.entity.BuildRepair;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.build.entity.BuildRepair;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildTypePriceMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildTypePriceMapper.java
index 75bc4a1d619323cfb25187adb84fd4ec8e18e7fe..229a726f1bd376579d7a1fdf9a7a1a4419536c9c 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildTypePriceMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildTypePriceMapper.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.build.mapper;
 
-import com.zscat.mallplus.build.entity.BuildTypePrice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.build.entity.BuildTypePrice;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildWuyeCompanyMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildWuyeCompanyMapper.java
index e4a86c082d45263e4522fbe9a734e1ff1ae36484..6a394d8fc30be7c25143fa7103aab7feb1782401 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildWuyeCompanyMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildWuyeCompanyMapper.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.build.mapper;
 
-import com.zscat.mallplus.build.entity.BuildWuyeCompany;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.build.entity.BuildWuyeCompany;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildWuyePriceMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildWuyePriceMapper.java
index d3c5e1e494899c5afb137978a4772ecfcb9f9847..02e5bb3fa7fa9a62e16e54548eda41f7640b3153 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildWuyePriceMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildWuyePriceMapper.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.build.mapper;
 
-import com.zscat.mallplus.build.entity.BuildWuyePrice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.build.entity.BuildWuyePrice;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingCommunityMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingCommunityMapper.java
index ec5e0e2b0182e143d2f6c6be46accdcde114a077..524a1ab5526e3f9e557e4150fa4ebd22265c757d 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingCommunityMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingCommunityMapper.java
@@ -1,7 +1,7 @@
 package com.zscat.mallplus.build.mapper;
 
-import com.zscat.mallplus.build.entity.BuildingCommunity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.build.entity.BuildingCommunity;
 
 /**
  * <p>
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingFloorMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingFloorMapper.java
index c6cede2adc753cc7a68439f3940ea1e2317adb5f..d3df1e291331b9c800d153751bbfb3faf318a20d 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingFloorMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingFloorMapper.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.build.mapper;
 
-import com.zscat.mallplus.build.entity.BuildingFloor;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.build.entity.BuildingFloor;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingOwnerMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingOwnerMapper.java
index 897858b247ef320b4ed06d06698609c3a7447926..1676676ce4cd237670dee56fb3ec5b65c2b6dded 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingOwnerMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingOwnerMapper.java
@@ -1,7 +1,7 @@
 package com.zscat.mallplus.build.mapper;
 
-import com.zscat.mallplus.build.entity.BuildingOwner;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.build.entity.BuildingOwner;
 
 /**
  * <p>
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingRoomMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingRoomMapper.java
index 8de32813c634ebf5ae31486ade34403c6dc4b4dd..911d9c51e58d4d1754865bba855c7aaa031714a6 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingRoomMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingRoomMapper.java
@@ -1,7 +1,7 @@
 package com.zscat.mallplus.build.mapper;
 
-import com.zscat.mallplus.build.entity.BuildingRoom;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.build.entity.BuildingRoom;
 
 /**
  * <p>
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingUnitMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingUnitMapper.java
index 110743a1968596e987f638b9a3b92f44d4062890..4f21a0620b3bb558696320233f3b9a86cb525df4 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingUnitMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingUnitMapper.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.build.mapper;
 
-import com.zscat.mallplus.build.entity.BuildingUnit;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.build.entity.BuildingUnit;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/cms/entity/CmsFavorite.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/cms/entity/CmsFavorite.java
index 723b90f580c21fc404734a4c7b1e8d0baf245c71..374daf6e66f7d05edb7f3a493ebb98a16032086f 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/cms/entity/CmsFavorite.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/cms/entity/CmsFavorite.java
@@ -12,7 +12,7 @@ import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author zscat
@@ -50,5 +50,4 @@ public class CmsFavorite extends BaseEntity implements Serializable {
     private String meno3;
 
 
-
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/cms/entity/CmsSubject.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/cms/entity/CmsSubject.java
index a973b2ff16780bc01eeeba81f0fcd4d94cf4c105..7e127f84bbba1f98cbde9b2d28196a6099bd044b 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/cms/entity/CmsSubject.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/cms/entity/CmsSubject.java
@@ -27,105 +27,87 @@ import java.util.List;
 public class CmsSubject extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
+    @TableField(exist = false)
+    List<PmsProduct> products;
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-
     /**
      * 分类
      */
     @TableField("category_id")
     private Long categoryId;
-
     /**
      * 标题
      */
     private String title;
-
     /**
      * 专题主图
      */
     private String pic;
-
     /**
      * 关联产品数量
      */
     @TableField("product_count")
     private Integer productCount;
-
     /**
      * 推荐
      */
     @TableField("recommend_status")
     private Integer recommendStatus;
-
     /**
      * 创建时间
      */
     @TableField("create_time")
     private Date createTime;
-
     /**
      * 收藏量
      */
     @TableField("collect_count")
     private Integer collectCount;
-
     /**
      * 点击量
      */
     @TableField("read_count")
     private Integer readCount;
-
     /**
      * 评论量
      */
     @TableField("comment_count")
     private Integer commentCount;
-
     /**
      * 画册图片用逗号分割
      */
     @TableField("album_pics")
     private String albumPics;
-
     /**
      * 描述
      */
     private String description;
-
     /**
      * 显示状态：0->不显示；1->显示
      */
     @TableField("show_status")
     private Integer showStatus;
-
     /**
      * 内容
      */
     private String content;
-
     /**
      * 点赞
      */
     @TableField("forward_count")
     private Integer forwardCount;
-
     /**
      * 专题分类名称
      */
     @TableField("category_name")
     private String categoryName;
-
     @TableField("area_id")
     private Long areaId;
-
     @TableField("school_id")
     private Long schoolId;
-
     @TableField("member_id")
     private Long memberId;
-
     @TableField("area_name")
     private String areaName;
     @TableField("school_name")
@@ -134,32 +116,28 @@ public class CmsSubject extends BaseEntity implements Serializable {
      * 打赏
      */
     private Integer reward;
-
     /**
      * 1 學校 2 區域
      */
     @TableField(exist = false)
     private int qsType;
-
     @TableField("member_name")
     private String memberName;
-
     @TableField("video_src")
     private String videoSrc;
     private Integer type;
     @TableField(exist = false)
     private List pics;
-    @TableField(exist = false)
-    List<PmsProduct> products ;
+
     public List getPics() {
-        if (ValidatorUtils.notEmpty(albumPics)){
+        if (ValidatorUtils.notEmpty(albumPics)) {
             this.pics = Arrays.asList(albumPics.split(","));
         }
         return pics;
     }
 
     public void setPics(List pics) {
-        if (ValidatorUtils.notEmpty(albumPics)){
+        if (ValidatorUtils.notEmpty(albumPics)) {
             this.pics = Arrays.asList(albumPics.split(","));
         }
     }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/cms/mapper/CmsFavoriteMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/cms/mapper/CmsFavoriteMapper.java
index d4f409044b1b332aaa6c1dc694ec9e507e32844d..52be145165e79fbe523bfb25ad07dc5189563e99 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/cms/mapper/CmsFavoriteMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/cms/mapper/CmsFavoriteMapper.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.cms.entity.CmsFavorite;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/AllEnum.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/AllEnum.java
index 722ec3bfe9613fa3bbd97aab76cb45db399818b0..2ed842290304620b161fa7ebaeb7a9367d6f442d 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/AllEnum.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/AllEnum.java
@@ -13,7 +13,6 @@ import lombok.NoArgsConstructor;
 public class AllEnum {
 
 
-
     /**
      * 改变类型：1->增加；2->减少
      *
@@ -50,6 +49,7 @@ public class AllEnum {
             return value;
         }
     }
+
     /**
      * 积分来源
      *
@@ -203,8 +203,7 @@ public class AllEnum {
         /**
          * 积分兑换
          */
-        jifenPay(5, "jifenPay")
-        ;
+        jifenPay(5, "jifenPay");
 
         private int code;
         private String value;
@@ -224,6 +223,7 @@ public class AllEnum {
             return value;
         }
     }
+
     /**
      * 评论类型：1->商品；2->赠品
      *
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/BaseEnum.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/BaseEnum.java
index 3a4f0744eddf0c59ce7d6423349d850626ef4a92..a18ba3e79421a3dd967b2ce0f9e7ee63b2a7090b 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/BaseEnum.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/BaseEnum.java
@@ -1,4 +1,3 @@
-
 package com.zscat.mallplus.enums;
 
 public interface BaseEnum<K> {
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/ConstansValue.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/ConstansValue.java
index eaea3c933f43b2c8d27f2cbf3bbff0f807a4ef03..3cd6ef3f6c41ded0f1e1d3fa512b84c2649c89ac 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/ConstansValue.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/ConstansValue.java
@@ -9,8 +9,8 @@ import java.util.List;
  */
 public class ConstansValue {
     public static final List<String> IGNORE_TENANT_TABLES = Lists.newArrayList("sys_admin_log", "sys_web_log", "sys_permission_category", "columns", "tables", "information_schema.columns",
-            "information_schema.tables","oms_payments",  "sys_store", "sys_permission","pms_product_attribute","pms_product_category_attribute_relation","pms_product_attribute_value",
-            "pms_product_category_attribute_relation","bak_category","bak_goods","bak_brand","ums_member_level","building_user_community");
+            "information_schema.tables", "oms_payments", "sys_store", "sys_permission", "pms_product_attribute", "pms_product_category_attribute_relation", "pms_product_attribute_value",
+            "pms_product_category_attribute_relation", "bak_category", "bak_goods", "bak_brand", "ums_member_level", "building_user_community");
 
     public static final String sampleGoodsList = "id, brand_id, product_category_id, feight_template_id, product_attribute_category_id, name, pic, product_sn,\n" +
             "        delete_status, publish_status, new_status, recommand_status, verify_status, sort, sale, price, promotion_price,\n" +
@@ -18,8 +18,8 @@ public class ConstansValue {
             "        weight, preview_status, service_ids,  brand_name,\n" +
             "        product_category_name, supply_id, create_time, school_id";
 
-    public static final String sampleOrderList = "id,member_id, order_sn, create_time, member_username, total_amount, pay_amount,status, order_type,pay_type,source_type,goods_id,goods_name" ;
+    public static final String sampleOrderList = "id,member_id, order_sn, create_time, member_username, total_amount, pay_amount,status, order_type,pay_type,source_type,goods_id,goods_name";
 
-    public static final String sampleSubjectList = "id,member_id, create_time,title,pic ,album_pics" ;
+    public static final String sampleSubjectList = "id,member_id, create_time,title,pic ,album_pics";
 
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/OrderStatus.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/OrderStatus.java
index 7ae587b4faf008f97102ad6363e0f35ea0492b05..2b1064cbd4cc4b7bbfe47b01a183ce128a34c61a 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/OrderStatus.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/OrderStatus.java
@@ -27,7 +27,6 @@ public enum OrderStatus {
     DELETED(17);//已删除
 
 
-
     private int value;
 
     private OrderStatus(int value) {
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/exception/JwtTokenExpiredException.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/exception/JwtTokenExpiredException.java
index 7a9506d89a9536c8d7ba965d7581280e0d80120c..43f8052f05a5c8cb8f9e7a49bedbe341f8be0ebe 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/exception/JwtTokenExpiredException.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/exception/JwtTokenExpiredException.java
@@ -16,7 +16,7 @@ public class JwtTokenExpiredException extends RuntimeException {
     public JwtTokenExpiredException(String errmsg) {
         super(errmsg);
         this.errmsg = errmsg;
-        this.errno=errno;
+        this.errno = errno;
     }
 
     public JwtTokenExpiredException(String errmsg, Throwable e) {
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsCompanyAddress.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsCompanyAddress.java
index 177129f20e9a4bf7447dc41a1ebeb4ac293aad83..9afbdb28d07badb8fcda068084fd70204414cc75 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsCompanyAddress.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsCompanyAddress.java
@@ -1,172 +1,52 @@
 package com.zscat.mallplus.oms.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.zscat.mallplus.utils.BaseEntity;
+import lombok.Data;
 
 import java.io.Serializable;
 
 /**
- * <p>
- * 公司收发货地址表
- * </p>
- *
- * @author zscat
- * @since 2019-04-17
+ * @author mallplus
+ * @date 2019-12-07
+ * 发货地址
  */
+@Data
 @TableName("oms_company_address")
-public class OmsCompanyAddress extends BaseEntity implements Serializable {
+public class OmsCompanyAddress implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableField("id")
     private Long id;
 
-    /**
-     * 地址名称
-     */
     @TableField("address_name")
     private String addressName;
 
-    /**
-     * 默认发货地址：0->否；1->是
-     */
     @TableField("send_status")
     private Integer sendStatus;
 
-    /**
-     * 是否默认收货地址：0->否；1->是
-     */
     @TableField("receive_status")
     private Integer receiveStatus;
 
-    /**
-     * 收发货人姓名
-     */
+    @TableField("name")
     private String name;
 
-    /**
-     * 收货人电话
-     */
+    @TableField("phone")
     private String phone;
 
-    /**
-     * 省/直辖市
-     */
+    @TableField("province")
     private String province;
 
-    /**
-     * 市
-     */
+    @TableField("city")
     private String city;
 
-    /**
-     * 区
-     */
+    @TableField("region")
     private String region;
 
-    /**
-     * 详细地址
-     */
     @TableField("detail_address")
     private String detailAddress;
 
+    @TableField("store_id")
+    private Integer storeId;
+
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getAddressName() {
-        return addressName;
-    }
-
-    public void setAddressName(String addressName) {
-        this.addressName = addressName;
-    }
-
-    public Integer getSendStatus() {
-        return sendStatus;
-    }
-
-    public void setSendStatus(Integer sendStatus) {
-        this.sendStatus = sendStatus;
-    }
-
-    public Integer getReceiveStatus() {
-        return receiveStatus;
-    }
-
-    public void setReceiveStatus(Integer receiveStatus) {
-        this.receiveStatus = receiveStatus;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getProvince() {
-        return province;
-    }
-
-    public void setProvince(String province) {
-        this.province = province;
-    }
-
-    public String getCity() {
-        return city;
-    }
-
-    public void setCity(String city) {
-        this.city = city;
-    }
-
-    public String getRegion() {
-        return region;
-    }
-
-    public void setRegion(String region) {
-        this.region = region;
-    }
-
-    public String getDetailAddress() {
-        return detailAddress;
-    }
-
-    public void setDetailAddress(String detailAddress) {
-        this.detailAddress = detailAddress;
-    }
-
-    @Override
-    public String toString() {
-        return "OmsCompanyAddress{" +
-                ", id=" + id +
-                ", addressName=" + addressName +
-                ", sendStatus=" + sendStatus +
-                ", receiveStatus=" + receiveStatus +
-                ", name=" + name +
-                ", phone=" + phone +
-                ", province=" + province +
-                ", city=" + city +
-                ", region=" + region +
-                ", detailAddress=" + detailAddress +
-                "}";
-    }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrder.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrder.java
index 4b225fed903b406cc01abf3598cc4190ce6edd38..5cc8ec8f26d330705d62b915aa3d8af10fc5c1f1 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrder.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrder.java
@@ -110,7 +110,7 @@ public class OmsOrder extends BaseEntity implements Serializable {
     private BigDecimal discountAmount;
 
     /**
-     * 支付方式：0->未支付；1->支付宝；2->微信 3余额支付
+     * 支付方式：0->未支付；2->支付宝；1->微信 3余额支付
      */
     @TableField("pay_type")
     private Integer payType;
@@ -311,17 +311,17 @@ public class OmsOrder extends BaseEntity implements Serializable {
     @TableField("group_id")
     private Long groupId;
     @TableField("tax_type")
-    private Integer taxType;	//	是否开发票 1=不发票 2=个人发票 3=公司发票
+    private Integer taxType;    //	是否开发票 1=不发票 2=个人发票 3=公司发票
     @TableField("tax_content")
-    private String taxContent;	//	0	发票内容
+    private String taxContent;    //	0	发票内容
     @TableField("tax_code")
-    private String taxCode;	//	税号
+    private String taxCode;    //	税号
     @TableField("tax_title")
-    private String  taxTitle;	//	发票抬头
+    private String taxTitle;    //	发票抬头
     @TableField("is_comment")
-    private Integer  isComment;	//是否评论，1未评论，2已评论
+    private Integer isComment;    //是否评论，1未评论，2已评论
 
     @TableField("store_name")
-    private String storeName;	//	税号
+    private String storeName;    //	税号
 
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrderOperateHistory.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrderOperateHistory.java
index ec4ef156890339787ec9e60f20142e0a2cd90279..8fed78dff37ff77e975b7eeed67f9c48ed4ec37e 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrderOperateHistory.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrderOperateHistory.java
@@ -62,5 +62,4 @@ public class OmsOrderOperateHistory extends BaseEntity implements Serializable {
     private String note;
 
 
-
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsPayments.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsPayments.java
index 986df177b307f45b06b4504d9b0b002b9e5c3083..f4e2fb561a563b7fb34b865b6d589c75c3f5d92b 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsPayments.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsPayments.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.io.Serializable;
 
@@ -15,6 +17,8 @@ import java.io.Serializable;
  * @author zscat
  * @since 2019-09-14
  */
+@Setter
+@Getter
 @TableName("oms_payments")
 public class OmsPayments implements Serializable {
 
@@ -37,7 +41,7 @@ public class OmsPayments implements Serializable {
      * 是否线上支付 1=线上支付 2=线下支付
      */
     @TableField("is_online")
-    private Boolean isOnline;
+    private Integer isOnline;
 
     /**
      * 参数
@@ -60,81 +64,4 @@ public class OmsPayments implements Serializable {
     private Integer status;
 
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Boolean getOnline() {
-        return isOnline;
-    }
-
-    public void setOnline(Boolean isOnline) {
-        this.isOnline = isOnline;
-    }
-
-    public String getParams() {
-        return params;
-    }
-
-    public void setParams(String params) {
-        this.params = params;
-    }
-
-    public Integer getSort() {
-        return sort;
-    }
-
-    public void setSort(Integer sort) {
-        this.sort = sort;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    @Override
-    public String toString() {
-        return "OmsPayments{" +
-        ", id=" + id +
-        ", code=" + code +
-        ", name=" + name +
-        ", isOnline=" + isOnline +
-        ", params=" + params +
-        ", sort=" + sort +
-        ", memo=" + memo +
-        ", status=" + status +
-        "}";
-    }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/mapper/OmsCompanyAddressMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/mapper/OmsCompanyAddressMapper.java
index 8fcd7c1c34bc38169862d863bf5c7408c4863760..23efc4372dfbe89b148bc3fddf67fc46118cd387 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/mapper/OmsCompanyAddressMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/mapper/OmsCompanyAddressMapper.java
@@ -1,16 +1,12 @@
 package com.zscat.mallplus.oms.mapper;
 
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zscat.mallplus.oms.entity.OmsCompanyAddress;
 
 /**
- * <p>
- * 公司收发货地址表 Mapper 接口
- * </p>
- *
- * @author zscat
- * @since 2019-04-17
+ * @author mallplus
+ * @date 2019-12-07
  */
 public interface OmsCompanyAddressMapper extends BaseMapper<OmsCompanyAddress> {
-
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/mapper/OmsOrderMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/mapper/OmsOrderMapper.java
index 1321664d0625b2009ec59f9b8eb321e53c34eab4..860c7996a3789ec1231d9fa1a97a89172e4e29c2 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/mapper/OmsOrderMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/mapper/OmsOrderMapper.java
@@ -50,12 +50,14 @@ public interface OmsOrderMapper extends BaseMapper<OmsOrder> {
 
     /**
      * 根据会员分组订单
+     *
      * @return
      */
     List<OrderStstic> listOrderGroupByMemberId();
 
     /**
      * 订单日统计
+     *
      * @param date
      * @return
      */
@@ -63,10 +65,11 @@ public interface OmsOrderMapper extends BaseMapper<OmsOrder> {
 
     /**
      * 订单 月统计
+     *
      * @param date
      * @return
      */
     Map orderMonthStatic(String date);
 
-    List<OmsOrder> listByDate(@Param("date") String date,@Param("type") Integer type);
+    List<OmsOrder> listByDate(@Param("date") String date, @Param("type") Integer type);
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/ActivityVo.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/ActivityVo.java
index c5b110f0531a1e18aeafa63a369faa612acd22b7..37b082eb854281b3edbae9cc9dda0c41006ecd2b 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/ActivityVo.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/ActivityVo.java
@@ -8,17 +8,20 @@ import lombok.Data;
  */
 @Data
 public class ActivityVo {
-    private  String info;
-    private  String link;
-    private String pic ;
-    private String title ;
+    private String info;
+    private String link;
+    private String pic;
+    private String title;
     private String wap_link;
-    public ActivityVo(){}
-    public ActivityVo(String info, String link, String pic,String title, String wap_link) {
+
+    public ActivityVo() {
+    }
+
+    public ActivityVo(String info, String link, String pic, String title, String wap_link) {
         this.info = info;
         this.link = link;
         this.pic = pic;
-        this.title= title;
+        this.title = title;
         this.wap_link = wap_link;
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/AllPayParam.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/AllPayParam.java
new file mode 100644
index 0000000000000000000000000000000000000000..dc2417c20f650a566f00f0fe26662495add0de08
--- /dev/null
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/AllPayParam.java
@@ -0,0 +1,25 @@
+package com.zscat.mallplus.oms.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 生成订单时传入的参数
+ * https://github.com/shenzhuan/mallplus on 2018/8/30.
+ */
+@Data
+public class AllPayParam {
+
+    //"balancepay"
+    String payment_code;
+    //
+    PaymentParam params;
+    private BigDecimal payAmount;
+    private BigDecimal balance;
+    private Integer payment_type;
+    //
+    private Long orderId;
+
+
+}
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/CartMarkingVo.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/CartMarkingVo.java
index 1665254cc01a1e5cc1dcf6bcfd3137a4b812c98a..955c3b83ff8a393b207e61644c018f6805268dcd 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/CartMarkingVo.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/CartMarkingVo.java
@@ -15,28 +15,28 @@ import java.util.List;
  * @Description:
  */
 @Data
-public class CartMarkingVo implements Serializable{
-    private List<OmsCartItem> cartList ;
-    private List<OmsOrderItem> shopOrderGoodsList ;
+public class CartMarkingVo implements Serializable {
+    private List<OmsCartItem> cartList;
+    private List<OmsOrderItem> shopOrderGoodsList;
     /**
      * 首购礼 1第一单获取 2所有订单获取 ；
      * 满购礼1选赠礼 获取规则 2满赠礼；
      * 单品礼赠 1 仅送一件  2 按购买件数送  3 指定件数送
      */
-    private int type ;
+    private int type;
     /**
      * 新人券 1首次进入 2首次下单 3 首次支付
      * 满额发券 1 订单完成 2 支付完成
      * g购物发券  1 订单完成 2 支付完成
      * 手工改发券  1 订单完成 2 支付完成
      */
-    private int scope ;
-    private Long  ruleId ;
-    private String  ruleIds ;
-    private Long  memberId ;
-    private String  code ;
-    private String  marketingId ;
-    private Long  memberCouponId;
+    private int scope;
+    private Long ruleId;
+    private String ruleIds;
+    private Long memberId;
+    private String code;
+    private String marketingId;
+    private Long memberCouponId;
     private BigDecimal payAmount;
-    private String  openId ;
+    private String openId;
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/CartPromotionItem.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/CartPromotionItem.java
index 682246c621c64165713fa8b70f3d7a30e34932ed..a4cd60bb1865857530f68295e5e58276d6e61744 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/CartPromotionItem.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/CartPromotionItem.java
@@ -14,7 +14,7 @@ public class CartPromotionItem extends OmsCartItem {
     //促销活动减去的金额，针对每个商品
     private BigDecimal reduceAmount = BigDecimal.ZERO;
     //商品的真实库存（剩余库存-锁定库存）
-    private Integer realStock =0;
+    private Integer realStock = 0;
     //购买商品赠送积分
     private Integer integration;
     //购买商品赠送成长值
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/ConfirmListOrderResult.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/ConfirmListOrderResult.java
index 331b04f8fde848bad3e312b28393daf7faa2c404..193c41bf26ad7cb1e19cd861ceb403e6d2302a84 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/ConfirmListOrderResult.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/ConfirmListOrderResult.java
@@ -1,12 +1,6 @@
 package com.zscat.mallplus.oms.vo;
 
 
-import com.zscat.mallplus.oms.entity.OmsCartItem;
-import com.zscat.mallplus.pms.entity.PmsProduct;
-import com.zscat.mallplus.sms.entity.SmsBasicGifts;
-import com.zscat.mallplus.sms.entity.SmsGroupActivity;
-import com.zscat.mallplus.sms.vo.SmsCouponHistoryDetail;
-import com.zscat.mallplus.ums.entity.UmsIntegrationConsumeSetting;
 import com.zscat.mallplus.ums.entity.UmsMemberReceiveAddress;
 import lombok.Data;
 
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/ConfirmOrderResult.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/ConfirmOrderResult.java
index 3958c9d6b8474501aa929f070a546b56d11e022e..2a53bbe82d3d88e31c43ba646fd23eac211c0408 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/ConfirmOrderResult.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/ConfirmOrderResult.java
@@ -20,6 +20,9 @@ import java.util.List;
 @Data
 public class ConfirmOrderResult {
 
+    // 赠品营销
+    List<SmsBasicGifts> basicGiftsList;
+    SmsGroupActivity groupActivity;
     private UmsMemberReceiveAddress address;
     //包含优惠信息的购物车信息
     private List<OmsCartItem> cartPromotionItemList;
@@ -31,7 +34,7 @@ public class ConfirmOrderResult {
     private UmsIntegrationConsumeSetting integrationConsumeSetting;
     //会员此次订单可以使用的积分
     private Integer memberIntegration;
-    private BigDecimal integrationAmount ;
+    private BigDecimal integrationAmount;
     /**
      * 余额
      */
@@ -40,11 +43,6 @@ public class ConfirmOrderResult {
     private CalcAmount calcAmount;
     private PmsProduct goods;
     private GroupAndOrderVo groupAndOrderVo;
-    // 赠品营销
-    List<SmsBasicGifts> basicGiftsList;
-
-    SmsGroupActivity groupActivity;
-
     private String storeName;
 
     public static class CalcAmount {
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/HomeContentResult.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/HomeContentResult.java
index 57e1733fa9b9880e2b60f9a2476427b275c3bf98..837de4b12476f021574dadeb5d35f3e87903411a 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/HomeContentResult.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/HomeContentResult.java
@@ -22,6 +22,8 @@ import java.util.List;
 @Getter
 @Setter
 public class HomeContentResult {
+    List<PmsSmallNaviconCategory> navList;
+    List<ActivityVo> activityList;
     //轮播广告
     private List<SmsHomeAdvertise> advertiseList;
     //推荐品牌
@@ -38,13 +40,7 @@ public class HomeContentResult {
     private List<PmsProduct> saleProductList;
     //推荐专题
     private List<CmsSubject> subjectList;
-
     private List<PmsProductAttributeCategory> cat_list;
-
     private List<SmsCoupon> couponList;
 
-    List<PmsSmallNaviconCategory> navList;
-
-    List<ActivityVo> activityList;
-
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/OrderParam.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/OrderParam.java
index 73c1dfc5d16ee5a841da75f1c897c0994df91708..b5764cc0e8ec3c3be1e94e9506585f7eea2cbc79 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/OrderParam.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/OrderParam.java
@@ -10,34 +10,34 @@ import lombok.Data;
 public class OrderParam {
     String page;
     String formId;
-    private Integer total;
     String platform = "2";
+    String basicGiftsVar;
+    private Integer total;
     //收货地址id
     private Long addressId;
     //优惠券id
     private Long couponId;
-    private Long  memberCouponId;
+    private Long memberCouponId;
     private Long memberId;
     //使用的积分数
     private Integer useIntegration;
     //支付方式
-    private Integer payType =1;
+    private Integer payType = 1;
     private Integer offline;// 0 送货 1 自取
     private String content;
     private String cartId;
     private String cartIds;
     private String type; // 1 商品详情 2 勾选购物车 3全部购物车的商品
-    private Integer source =1; ////订单来源：0->PC订单；5->app订单 2 h5 3微信小程序 4 支付宝小程序
-    private Integer orderType=1; // 1 普通订单 2 秒杀订单 3 团购订单 4 拼团订单 5 积分订单
+    private Integer source = 1; ////订单来源：0->PC订单；5->app订单 2 h5 3微信小程序 4 支付宝小程序
+    private Integer orderType = 1; // 1 普通订单 2 秒杀订单 3 团购订单 4 拼团订单 5 积分订单
     private Long skuId;
     private Long goodsId;
     private Long groupId;
     private Long groupActivityId;
     // 1 发起拼团 2 参与拼团
     private Integer groupType;
-    private Long mgId =0l;
-    private Long skillId =0l; // 秒杀ID
-    String basicGiftsVar;
+    private Long mgId = 0l;
+    private Long skillId = 0l; // 秒杀ID
 
 
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/OrderStstic.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/OrderStstic.java
index 3213da79fdfbbf5f367f52f9156160be0a8ea4e4..38dd40594ca5bfa31483ba41d13940d58ae4d75d 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/OrderStstic.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/OrderStstic.java
@@ -13,7 +13,7 @@ import java.math.BigDecimal;
 public class OrderStstic {
     private Long memberId;
     private int totalCount;
-    private BigDecimal totalPayAmount ;
+    private BigDecimal totalPayAmount;
     private int memberCount;
     private Long objId;
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/PayParam.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/PayParam.java
index 6eb11def499d53ec5f58aca1cd1c8e5939143e89..e0b88827e000375ad07cafbeffdd4db86525fe8d 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/PayParam.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/PayParam.java
@@ -11,17 +11,15 @@ import java.math.BigDecimal;
 @Data
 public class PayParam {
 
-    private BigDecimal payAmount;
-    private BigDecimal balance;
     //"balancepay"
     String payment_code;
-
+    //
+    PaymentParam params;
+    private BigDecimal payAmount;
+    private BigDecimal balance;
     private Integer payment_type;
-//
+    //
     private Long orderId;
-//
-    PaymentParam params;
-
-
+    private Long memberGroupId;
 
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/PaymentParam.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/PaymentParam.java
index bc852e93bb9d609b535d32724b34bdf2fb36a8fd..f018247f4843864e498808e49b043dd992703b8d 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/PaymentParam.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/PaymentParam.java
@@ -12,15 +12,12 @@ import java.math.BigDecimal;
 public class PaymentParam {
     //"balancepay"
     String trade_type;
-
-    private BigDecimal money;
-//
-    private Long orderId;
-//
+    //
     String return_url;
-
     String url;
-
+    private BigDecimal money;
+    //
+    private Long orderId;
 
 
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/StoreCart.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/StoreCart.java
index 42b352e124d72daa7758de5eb7943f3732a3eae5..4b7ba08a8fe398ee64fddf203e9b9bd245a27c3a 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/StoreCart.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/vo/StoreCart.java
@@ -2,9 +2,6 @@ package com.zscat.mallplus.oms.vo;
 
 
 import com.zscat.mallplus.oms.entity.OmsCartItem;
-import com.zscat.mallplus.pms.entity.PmsProduct;
-import com.zscat.mallplus.pms.entity.PmsProductAttribute;
-import com.zscat.mallplus.pms.entity.PmsSkuStock;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,7 +13,7 @@ import java.util.List;
  */
 @Setter
 @Getter
-public class StoreCart  {
+public class StoreCart {
     private List<OmsCartItem> list;
     private String storeName;
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/entity/PmsFavorite.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/entity/PmsFavorite.java
index a8a2d07c57737bd1e3cd3d1f3dcb8ee96d5add6d..cb1114fbc214d8a2a0c1e2a4a4ffd0299f727d81 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/entity/PmsFavorite.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/entity/PmsFavorite.java
@@ -12,7 +12,7 @@ import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author zscat
@@ -50,5 +50,4 @@ public class PmsFavorite extends BaseEntity implements Serializable {
     private String meno3;
 
 
-
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/entity/PmsProductAttributeValue.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/entity/PmsProductAttributeValue.java
index c27e23a296690322acabaf43544b3f6e193eb5e6..c3ed04cd1eced3a2b6de0817e4841313c4d25407 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/entity/PmsProductAttributeValue.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/entity/PmsProductAttributeValue.java
@@ -41,19 +41,19 @@ public class PmsProductAttributeValue extends BaseEntity implements Serializable
     private String value;
     private String name;
     // 1 规格 2 参数
-    private Integer type ;
+    private Integer type;
     @TableField(exist = false)
     private List pics;
 
     public List getPics() {
-        if (ValidatorUtils.notEmpty(value)){
+        if (ValidatorUtils.notEmpty(value)) {
             this.pics = Arrays.asList(value.split(","));
         }
         return pics;
     }
 
     public void setPics(List pics) {
-        if (ValidatorUtils.notEmpty(value)){
+        if (ValidatorUtils.notEmpty(value)) {
             this.pics = Arrays.asList(value.split(","));
         }
     }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/mapper/PmsFavoriteMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/mapper/PmsFavoriteMapper.java
index 66ccf6e12d6bedfed0c0f3c53feb507366169516..ffe9d668223e46dbfd2e7a8d3935e57327aad25c 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/mapper/PmsFavoriteMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/mapper/PmsFavoriteMapper.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.pms.entity.PmsFavorite;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/mapper/PmsProductMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/mapper/PmsProductMapper.java
index 166d860e90fc313bd48b57d2533657dc0c71b98b..6888c3d3ca2ec66a0ce12b40279e8aa3a1964743 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/mapper/PmsProductMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/mapper/PmsProductMapper.java
@@ -27,5 +27,5 @@ public interface PmsProductMapper extends BaseMapper<PmsProduct> {
 
     Integer countGoodsByToday(@Param("id") Long id);
 
-    List<PmsProduct> listByDate(@Param("date") String date,@Param("type") Integer type);
+    List<PmsProduct> listByDate(@Param("date") String date, @Param("type") Integer type);
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/vo/GoodsDetailResult.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/vo/GoodsDetailResult.java
index 259a3d1e901ca3d1b18f5158be1d92af32a308e1..96fa2429d74bba8624c861047755492fc11ee3c1 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/vo/GoodsDetailResult.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/vo/GoodsDetailResult.java
@@ -30,9 +30,9 @@ public class GoodsDetailResult implements Serializable {
     @ApiModelProperty("优选专区和商品的关系")
     private List<CmsPrefrenceAreaProductRelation> prefrenceAreaProductRelationList;
 
-    private List<PmsProductAttributeValue>  productCanShuValueList ;
+    private List<PmsProductAttributeValue> productCanShuValueList;
     private List<PmsProduct> typeGoodsList;
 
-    private  PmsProduct goods;
+    private PmsProduct goods;
     private SysStore storeInfo;
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/vo/GoodsUtils.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/vo/GoodsUtils.java
index a16683efea9f41cd414fb5b12917b32894862b41..202562d14ddf7b3072328c9fe4b47b83dc72e892 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/vo/GoodsUtils.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/vo/GoodsUtils.java
@@ -1,7 +1,6 @@
-
 package com.zscat.mallplus.pms.vo;
 
 
-public class GoodsUtils  {
+public class GoodsUtils {
 
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/vo/PmsProductParam.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/vo/PmsProductParam.java
index ba29c1713fb8920623c95394c1d4f88cc90ae2da..2bad6b22b3f1ad610d57dd6f72737feaad07e2ac 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/vo/PmsProductParam.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/vo/PmsProductParam.java
@@ -12,7 +12,7 @@ import java.util.List;
  * https://github.com/shenzhuan/mallplus on 2018/4/26.
  */
 @Data
-public class PmsProductParam  extends PmsProduct {
+public class PmsProductParam extends PmsProduct {
     @ApiModelProperty("商品阶梯价格设置")
     private List<PmsProductLadder> productLadderList;
     @ApiModelProperty("商品满减价格设置")
@@ -28,8 +28,8 @@ public class PmsProductParam  extends PmsProduct {
     @ApiModelProperty("优选专区和商品的关系")
     private List<CmsPrefrenceAreaProductRelation> prefrenceAreaProductRelationList;
 
-    private List<PmsProductAttributeValue>  productCanShuValueList ;
+    private List<PmsProductAttributeValue> productCanShuValueList;
     private List<PmsProduct> typeGoodsList;
 
-    private  PmsProduct goods;
+    private PmsProduct goods;
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/vo/ProductConsultParam.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/vo/ProductConsultParam.java
index e578b40789d060ef1731ca83ed765f9bbc906e2f..3d2bd57555c6346cf79948a33ce4cd407ca85b3a 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/vo/ProductConsultParam.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/pms/vo/ProductConsultParam.java
@@ -8,10 +8,10 @@ import java.io.Serializable;
  * Created by Administrator on 2019/9/15.
  */
 @Data
-public class ProductConsultParam  implements Serializable{
-    private  Long goodsId;
-    private  Integer score;
+public class ProductConsultParam implements Serializable {
+    private Long goodsId;
+    private Integer score;
 
-    private  String []images;
-    private  String textarea;
+    private String[] images;
+    private String textarea;
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsBargainConfig.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsBargainConfig.java
index e42019a872cfd61dfbb2328864ad078eaa59c0c8..773cb9357cc32f39e27b6dcb0314da35c8b56522 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsBargainConfig.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsBargainConfig.java
@@ -119,13 +119,13 @@ public class SmsBargainConfig implements Serializable {
     @Override
     public String toString() {
         return "SmsBargainConfig{" +
-        ", id=" + id +
-        ", plugInsId=" + plugInsId +
-        ", canNum=" + canNum +
-        ", helpNum=" + helpNum +
-        ", parameter=" + parameter +
-        ", invalidTime=" + invalidTime +
-        ", addTime=" + addTime +
-        "}";
+                ", id=" + id +
+                ", plugInsId=" + plugInsId +
+                ", canNum=" + canNum +
+                ", helpNum=" + helpNum +
+                ", parameter=" + parameter +
+                ", invalidTime=" + invalidTime +
+                ", addTime=" + addTime +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsBargainRecord.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsBargainRecord.java
index a16a0d6d793d1d174f07f72038a157c4a297ff8d..d4af95ef319a438f0cd1bc1a7805fdc0a6821430 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsBargainRecord.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsBargainRecord.java
@@ -196,19 +196,19 @@ public class SmsBargainRecord implements Serializable {
     @Override
     public String toString() {
         return "SmsBargainRecord{" +
-        ", id=" + id +
-        ", sId=" + sId +
-        ", userId=" + userId +
-        ", money=" + money +
-        ", addTime=" + addTime +
-        ", event=" + event +
-        ", name=" + name +
-        ", tel=" + tel +
-        ", sheng=" + sheng +
-        ", city=" + city +
-        ", quyu=" + quyu +
-        ", address=" + address +
-        ", status=" + status +
-        "}";
+                ", id=" + id +
+                ", sId=" + sId +
+                ", userId=" + userId +
+                ", money=" + money +
+                ", addTime=" + addTime +
+                ", event=" + event +
+                ", name=" + name +
+                ", tel=" + tel +
+                ", sheng=" + sheng +
+                ", city=" + city +
+                ", quyu=" + quyu +
+                ", address=" + address +
+                ", status=" + status +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsBasicGifts.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsBasicGifts.java
index 9e88dcb64a6f9986d0a5750f4738b85563baf259..a3c11cee7760a9022d3540feea67ba49d8250bcf 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsBasicGifts.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsBasicGifts.java
@@ -59,7 +59,6 @@ public class SmsBasicGifts extends BaseEntity implements Serializable {
      * 首购礼 1第一单获取 2所有订单获取 ；
      * 满购礼1选赠礼 获取规则 2满赠礼；
      * 单品礼赠 1 仅送一件  2 按购买件数送  3 指定件数送
-     *
      */
     @TableField("small_type")
     private Integer smallType;
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsBasicMarking.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsBasicMarking.java
index 13addb23875610f571b07d7a60f2ed43d072a25b..4bb5a7844c3472ed7663fbeb3160f4d668e601f3 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsBasicMarking.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsBasicMarking.java
@@ -19,6 +19,7 @@ import java.util.List;
  *
  * </p>
  * 基本营销
+ *
  * @author zscat
  * @since 2019-07-07
  */
@@ -115,6 +116,4 @@ public class SmsBasicMarking extends BaseEntity implements Serializable {
     private BasicRuls selectRule;
 
 
-
-
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsConfigure.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsConfigure.java
index 41723725883e8b7e1fbb33bdfb91ea5f5823d221..048120138124de908b67fe2a6727798c658d467d 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsConfigure.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsConfigure.java
@@ -236,22 +236,22 @@ public class SmsConfigure implements Serializable {
     @Override
     public String toString() {
         return "SmsConfigure{" +
-        ", id=" + id +
-        ", name=" + name +
-        ", color=" + color +
-        ", size=" + size +
-        ", costprice=" + costprice +
-        ", price=" + price +
-        ", yprice=" + yprice +
-        ", img=" + img +
-        ", pid=" + pid +
-        ", num=" + num +
-        ", unit=" + unit +
-        ", bargainPrice=" + bargainPrice +
-        ", status=" + status +
-        ", attribute=" + attribute +
-        ", recycle=" + recycle +
-        ", totalNum=" + totalNum +
-        "}";
+                ", id=" + id +
+                ", name=" + name +
+                ", color=" + color +
+                ", size=" + size +
+                ", costprice=" + costprice +
+                ", price=" + price +
+                ", yprice=" + yprice +
+                ", img=" + img +
+                ", pid=" + pid +
+                ", num=" + num +
+                ", unit=" + unit +
+                ", bargainPrice=" + bargainPrice +
+                ", status=" + status +
+                ", attribute=" + attribute +
+                ", recycle=" + recycle +
+                ", totalNum=" + totalNum +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsContent.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsContent.java
new file mode 100644
index 0000000000000000000000000000000000000000..bc2660ecf4bf50022505e236980f57518d146bf0
--- /dev/null
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsContent.java
@@ -0,0 +1,43 @@
+package com.zscat.mallplus.sms.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author mallplus
+ * @date 2019-12-07
+ * 短信模版
+ */
+@Data
+@TableName("sms_content")
+public class SmsContent implements Serializable {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @TableField("name")
+    private String name;
+
+    @TableField("type")
+    private String type;
+
+    @TableField("meno")
+    private String meno;
+
+    @TableField("code")
+    private String code;
+
+    @TableField("remark")
+    private String remark;
+
+    @TableField("create_time")
+    private Date createTime;
+
+
+}
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsDetailedCommission.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsDetailedCommission.java
index b959b4af054099487d16ee1dca091c03669097fd..bc5ddc7615f663dffa55c47bf460c2b6de69a1c9 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsDetailedCommission.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsDetailedCommission.java
@@ -154,16 +154,16 @@ public class SmsDetailedCommission implements Serializable {
     @Override
     public String toString() {
         return "SmsDetailedCommission{" +
-        ", id=" + id +
-        ", userid=" + userid +
-        ", sNo=" + sNo +
-        ", money=" + money +
-        ", sMoney=" + sMoney +
-        ", status=" + status +
-        ", addtime=" + addtime +
-        ", type=" + type +
-        ", Referee=" + Referee +
-        ", recycle=" + recycle +
-        "}";
+                ", id=" + id +
+                ", userid=" + userid +
+                ", sNo=" + sNo +
+                ", money=" + money +
+                ", sMoney=" + sMoney +
+                ", status=" + status +
+                ", addtime=" + addtime +
+                ", type=" + type +
+                ", Referee=" + Referee +
+                ", recycle=" + recycle +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsDiyPage.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsDiyPage.java
index bb5c4ce71850a70b1d73b7f7fe739a84200d2655..1c889fb2850509e57d831ce26bba445db4a66849 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsDiyPage.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsDiyPage.java
@@ -52,5 +52,4 @@ public class SmsDiyPage implements Serializable {
     private String keyword;
 
 
-
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsDiypageTemplateCategory.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsDiypageTemplateCategory.java
index 293cad447b9a4c98e3a6a41e04390825087f5a94..a25a46564836862e4faf8062d6525bff3f505b09 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsDiypageTemplateCategory.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsDiypageTemplateCategory.java
@@ -9,10 +9,10 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
-* @author mallplus
-* @date 2019-12-04
-        页面模版
-*/
+ * @author mallplus
+ * @date 2019-12-04
+ * 页面模版
+ */
 @Data
 @TableName("sms_diypage_template_category")
 public class SmsDiypageTemplateCategory implements Serializable {
@@ -20,10 +20,10 @@ public class SmsDiypageTemplateCategory implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    @TableField( "name")
+    @TableField("name")
     private String name;
 
-    @TableField( "store_id")
+    @TableField("store_id")
     private Integer storeId;
 
 
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsDraw.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsDraw.java
index 68964f886e2da1c34f5143f7aaf25322c22f68f2..68fdf0af2e3943f2469d39428281506a9917a1f5 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsDraw.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsDraw.java
@@ -101,5 +101,4 @@ public class SmsDraw implements Serializable {
     private String type;
 
 
-
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsExperience.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsExperience.java
index 2a57f52e751f3c61698dd290e0e713f2529e2cde..54ad7adaefe845d98e43e6a30ba61c8ae6a613be 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsExperience.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsExperience.java
@@ -156,16 +156,16 @@ public class SmsExperience implements Serializable {
     @Override
     public String toString() {
         return "SmsExperience{" +
-        ", id=" + id +
-        ", userId=" + userId +
-        ", sellerId=" + sellerId +
-        ", name=" + name +
-        ", mobile=" + mobile +
-        ", address=" + address +
-        ", num=" + num +
-        ", content=" + content +
-        ", addDate=" + addDate +
-        ", status=" + status +
-        "}";
+                ", id=" + id +
+                ", userId=" + userId +
+                ", sellerId=" + sellerId +
+                ", name=" + name +
+                ", mobile=" + mobile +
+                ", address=" + address +
+                ", num=" + num +
+                ", content=" + content +
+                ", addDate=" + addDate +
+                ", status=" + status +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsFlashPromotionProductRelation.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsFlashPromotionProductRelation.java
index ed1933bd7cfd479e344902b38844d58a7510fe27..6826309ea435613d7bf1d2715a88a717aac33c0f 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsFlashPromotionProductRelation.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsFlashPromotionProductRelation.java
@@ -73,5 +73,5 @@ public class SmsFlashPromotionProductRelation extends BaseEntity implements Seri
     @TableField(exist = false)
     private BigDecimal productPrice;
     @TableField(exist = false)
-    private Double percent ;
+    private Double percent;
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsGroup.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsGroup.java
index 6994200adefde0ca04c99a60c4a6dba63ed80fb7..cb920c06f521ac1107639c4c9d2714a88f6cfcb3 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsGroup.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsGroup.java
@@ -40,6 +40,7 @@ public class SmsGroup extends BaseEntity implements Serializable {
      */
     @TableField("goods_name")
     private String goodsName;
+    private String pic;
 
     /**
      * 商品价格
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsGroupActivity.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsGroupActivity.java
index 0b5e3a8fe964d369e6e4d4be6fc079d079b52240..bac44a409a7dffc9f3b810c7f45a816ee8290feb 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsGroupActivity.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsGroupActivity.java
@@ -26,16 +26,15 @@ import java.util.List;
 public class SmsGroupActivity implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
+    @TableField(exist = false)
+    List<PmsProduct> productList;
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-
     /**
      * 活动名称
      */
     private String name;
     private String pic;
-
     /**
      * 活动价格
      */
@@ -44,36 +43,25 @@ public class SmsGroupActivity implements Serializable {
      * 原格
      */
     private BigDecimal originprice;
-
     /**
      * 运费
      */
     private BigDecimal transfee;
-
     /**
      * 活动状态 1 开启 2 关闭
      */
     private Integer status;
-
     /**
      * 1 买家承担 2 卖家承担
      */
     private Integer feestatus;
-
     /**
      * 创建时间
      */
     @TableField("create_time")
     private LocalDateTime createTime;
-
-
-
     @TableField("goods_ids")
     private String goodsIds;
 
 
-    @TableField(exist = false)
-    List<PmsProduct> productList;
-
-
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsGroupMember.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsGroupMember.java
index fe00d0564863af345b66217d22ec482bcaa18e01..4bb06b074f4db73101f6b3738a9ac786ef75b9af 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsGroupMember.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsGroupMember.java
@@ -4,15 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.zscat.mallplus.ums.entity.UmsMember;
 import com.zscat.mallplus.utils.BaseEntity;
-import com.zscat.mallplus.utils.ValidatorUtils;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Arrays;
 import java.util.Date;
-import java.util.List;
 
 /**
  * <p>
@@ -31,18 +27,17 @@ public class SmsGroupMember extends BaseEntity implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    @TableField("group_id")
-    private Long groupId;
+    @TableField("group_record_id")
+    private Long groupRecordId;
 
     @TableField("member_id")
-    private String memberId;
+    private Long memberId;
 
     @TableField("create_time")
     private Date createTime;
     @TableField("exipre_time")
     private Long exipreTime;
-    @TableField("main_id")
-    private Long mainId;
+
 
     private String name;
 
@@ -56,102 +51,7 @@ public class SmsGroupMember extends BaseEntity implements Serializable {
 
     @TableField("order_id")
     private String orderId;
-    @TableField(exist = false)
-    private List pics;
-
-    @TableField(exist = false)
-    private List<UmsMember> list;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(Long groupId) {
-        this.groupId = groupId;
-    }
-
-    public Long getExipreTime() {
-        return exipreTime;
-    }
-
-    public void setExipreTime(Long exipreTime) {
-        this.exipreTime = exipreTime;
-    }
-
-    public String getMemberId() {
-        return memberId;
-    }
-
-    public void setMemberId(String memberId) {
-        this.memberId = memberId;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getMainId() {
-        return mainId;
-    }
-
-    public void setMainId(Long mainId) {
-        this.mainId = mainId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Long getGoodsId() {
-        return goodsId;
-    }
-
-    public void setGoodsId(Long goodsId) {
-        this.goodsId = goodsId;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(String orderId) {
-        this.orderId = orderId;
-    }
 
-    public List getPics() {
-        if (ValidatorUtils.notEmpty(name)){
-            this.pics = Arrays.asList(name.split(","));
-        }
-        return pics;
-    }
+    private String pic;
 
-    public void setPics(List pics) {
-        if (ValidatorUtils.notEmpty(name)){
-            this.pics = Arrays.asList(name.split(","));
-        }
-    }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsGroupRecord.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsGroupRecord.java
new file mode 100644
index 0000000000000000000000000000000000000000..d418511bb1d242f08d349e1e74736584714fefe9
--- /dev/null
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsGroupRecord.java
@@ -0,0 +1,57 @@
+package com.zscat.mallplus.sms.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zscat
+ * @since 2019-12-20
+ */
+@Setter
+@Getter
+@TableName("sms_group_record")
+public class SmsGroupRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 拼团
+     */
+    @TableField("group_id")
+    private Long groupId;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("store_id")
+    private Integer storeId;
+
+    @TableField(exist = false)
+    private List<SmsGroupMember> list;
+}
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsPaimaiLog.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsPaimaiLog.java
index 79ab62f7f7869fbd7e2e92cd6f6af8abcc5818a9..027a9c9e90a68d377b0e14f0847d6997722ad830 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsPaimaiLog.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsPaimaiLog.java
@@ -46,5 +46,4 @@ public class SmsPaimaiLog implements Serializable {
     private Long goodsId;
 
 
-
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsShare.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsShare.java
index 4c81a0c06ed170ddf3a32f99e9e52f39dc8eff15..85b85c55d4df7b178a0da44e575cce903623c6a7 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsShare.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsShare.java
@@ -146,15 +146,15 @@ public class SmsShare implements Serializable {
     @Override
     public String toString() {
         return "SmsShare{" +
-        ", id=" + id +
-        ", userId=" + userId +
-        ", wxId=" + wxId +
-        ", wxName=" + wxName +
-        ", sex=" + sex +
-        ", type=" + type +
-        ", articleId=" + articleId +
-        ", shareAdd=" + shareAdd +
-        ", coupon=" + coupon +
-        "}";
+                ", id=" + id +
+                ", userId=" + userId +
+                ", wxId=" + wxId +
+                ", wxName=" + wxName +
+                ", sex=" + sex +
+                ", type=" + type +
+                ", articleId=" + articleId +
+                ", shareAdd=" + shareAdd +
+                ", coupon=" + coupon +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsSignActivity.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsSignActivity.java
index d7536f38afd50fc7563ec36122607c60991ad329..370e755e7861010a9f1cd57accdfcfbe66952f50 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsSignActivity.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsSignActivity.java
@@ -118,13 +118,13 @@ public class SmsSignActivity implements Serializable {
     @Override
     public String toString() {
         return "SmsSignActivity{" +
-        ", id=" + id +
-        ", image=" + image +
-        ", starttime=" + starttime +
-        ", endtime=" + endtime +
-        ", detail=" + detail +
-        ", addTime=" + addTime +
-        ", status=" + status +
-        "}";
+                ", id=" + id +
+                ", image=" + image +
+                ", starttime=" + starttime +
+                ", endtime=" + endtime +
+                ", detail=" + detail +
+                ", addTime=" + addTime +
+                ", status=" + status +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsSignConfig.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsSignConfig.java
index 20dfee911ad01f6d7955292a44bf3db30a32e08d..1e4c2d1e7cb0c1fe2bbb289dd770e40c114fec12 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsSignConfig.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsSignConfig.java
@@ -164,16 +164,16 @@ public class SmsSignConfig implements Serializable {
     @Override
     public String toString() {
         return "SmsSignConfig{" +
-        ", id=" + id +
-        ", plugInsId=" + plugInsId +
-        ", imgurl=" + imgurl +
-        ", minScore=" + minScore +
-        ", maxScore=" + maxScore +
-        ", continuityThree=" + continuityThree +
-        ", continuityTwenty=" + continuityTwenty +
-        ", continuityThirty=" + continuityThirty +
-        ", activityOverdue=" + activityOverdue +
-        ", modifyDate=" + modifyDate +
-        "}";
+                ", id=" + id +
+                ", plugInsId=" + plugInsId +
+                ", imgurl=" + imgurl +
+                ", minScore=" + minScore +
+                ", maxScore=" + maxScore +
+                ", continuityThree=" + continuityThree +
+                ", continuityTwenty=" + continuityTwenty +
+                ", continuityThirty=" + continuityThirty +
+                ", activityOverdue=" + activityOverdue +
+                ", modifyDate=" + modifyDate +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsSignRecord.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsSignRecord.java
index caf971a456c7e443b87179cd57a07eed2a5ba51b..c07a1cb84d8296b5d9e95cc597e54c05549f5b18 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsSignRecord.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/entity/SmsSignRecord.java
@@ -107,12 +107,12 @@ public class SmsSignRecord implements Serializable {
     @Override
     public String toString() {
         return "SmsSignRecord{" +
-        ", id=" + id +
-        ", userId=" + userId +
-        ", signScore=" + signScore +
-        ", record=" + record +
-        ", signTime=" + signTime +
-        ", type=" + type +
-        "}";
+                ", id=" + id +
+                ", userId=" + userId +
+                ", signScore=" + signScore +
+                ", record=" + record +
+                ", signTime=" + signTime +
+                ", type=" + type +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsBasicGiftsMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsBasicGiftsMapper.java
index 62d612353881f841b6b18af88db1d0cda2da1d5c..704765aac73af345aa3478e1b7ce3a006782ffc9 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsBasicGiftsMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsBasicGiftsMapper.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.sms.entity.SmsBasicGifts;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsBasicMarkingMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsBasicMarkingMapper.java
index 5f8624b4d957fd011ee961d113037b9176576892..29f01e6d65c50b43bff375d6f87349c246ae9c6d 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsBasicMarkingMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsBasicMarkingMapper.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.sms.entity.SmsBasicMarking;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsContentMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsContentMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..8ce590973dc91ce5101d55b0bd389029c61ba2b2
--- /dev/null
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsContentMapper.java
@@ -0,0 +1,12 @@
+package com.zscat.mallplus.sms.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.sms.entity.SmsContent;
+
+/**
+ * @author mallplus
+ * @date 2019-12-07
+ */
+public interface SmsContentMapper extends BaseMapper<SmsContent> {
+}
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsDiyPageMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsDiyPageMapper.java
index 62a0289385138010d2acbdad6050b6bdde75c891..06a2a993edae063dc37993e5038e65104bc0a260 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsDiyPageMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsDiyPageMapper.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.sms.mapper;
 
-import com.zscat.mallplus.sms.entity.SmsDiyPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.sms.entity.SmsDiyPage;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsDiypageTemplateCategoryMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsDiypageTemplateCategoryMapper.java
index 5d8a6db21381920d2fcb457efaa20d743398dbbf..5ba2900451e47e33cdcc6a2f8606a5427bb0199a 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsDiypageTemplateCategoryMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsDiypageTemplateCategoryMapper.java
@@ -1,12 +1,12 @@
 package com.zscat.mallplus.sms.mapper;
 
 
-import com.zscat.mallplus.sms.entity.SmsDiypageTemplateCategory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.sms.entity.SmsDiypageTemplateCategory;
 
 /**
-* @author mallplus
-* @date 2019-12-04
-*/
+ * @author mallplus
+ * @date 2019-12-04
+ */
 public interface SmsDiypageTemplateCategoryMapper extends BaseMapper<SmsDiypageTemplateCategory> {
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsGroupActivityMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsGroupActivityMapper.java
index 989715cd2a6c73bdd2be278ec789cad2c054dd8f..c4302383a79d3428b83f88d6604465fc2a4eb116 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsGroupActivityMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsGroupActivityMapper.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.sms.entity.SmsGroupActivity;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsGroupRecordMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsGroupRecordMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..32a9d998ff21c488600eeb4cde2e0fb1e810af5d
--- /dev/null
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsGroupRecordMapper.java
@@ -0,0 +1,16 @@
+package com.zscat.mallplus.sms.mapper;
+
+import com.zscat.mallplus.sms.entity.SmsGroupRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zscat
+ * @since 2019-12-20
+ */
+public interface SmsGroupRecordMapper extends BaseMapper<SmsGroupRecord> {
+
+}
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsPaimaiLogMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsPaimaiLogMapper.java
index 4321d5f19deb87f0fbdcc606e2adde950b342a35..3ac6acacb4d2ea568a34957e8bc7a9ffef978d5b 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsPaimaiLogMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsPaimaiLogMapper.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.sms.entity.SmsPaimaiLog;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/vo/BeanKv.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/vo/BeanKv.java
index 7a50e09a0fd78b1e869d9ef2d15c8923ebcd58a7..d72b4252258baf249a659720d9722f400901ae0f 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/vo/BeanKv.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/vo/BeanKv.java
@@ -8,8 +8,8 @@ import lombok.Data;
 @Data
 public class BeanKv {
     private Long id;
-            private String  name;
-    private String  name1;
-            private String price;
+    private String name;
+    private String name1;
+    private String price;
     private String pic;
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/vo/GiftisRuls.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/vo/GiftisRuls.java
index 87bacd138cd88ed526114cdb4830e13aeb761540..a145f71f19c422f712330ae3fae8d76553eba9e7 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/vo/GiftisRuls.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/vo/GiftisRuls.java
@@ -9,7 +9,7 @@ import java.math.BigDecimal;
  * Created by Administrator on 2019/7/7.
  */
 @Data
-public class GiftisRuls implements Serializable{
+public class GiftisRuls implements Serializable {
     private BigDecimal fullPrice;
     private BigDecimal reducePrice;
 
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/vo/HomeFlashPromotion.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/vo/HomeFlashPromotion.java
index 622190793b58208c78272913cfbff2f002c585ab..88fb5a3a0ac4e85fb6cf95a89478703778ff595e 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/vo/HomeFlashPromotion.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/vo/HomeFlashPromotion.java
@@ -13,12 +13,12 @@ import java.util.List;
 @Getter
 @Setter
 public class HomeFlashPromotion {
+    //属于该秒杀活动的商品
+    List<SmsFlashSessionInfo> flashSessionInfoList;
     private Long id;
     private String startTime;
     private String endTime;
     private Date nextStartTime;
     private Date nextEndTime;
     private String flashName;
-    //属于该秒杀活动的商品
-    List<SmsFlashSessionInfo> flashSessionInfoList;
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/vo/SmsFlashPromotionSessionVo.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/vo/SmsFlashPromotionSessionVo.java
index e1158e159b5e2f7bb1a3096dde3b7ec3a02839bf..d07fa232396ec7b82fcb027be3ed2d88297bec41 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/vo/SmsFlashPromotionSessionVo.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/vo/SmsFlashPromotionSessionVo.java
@@ -1,15 +1,9 @@
 package com.zscat.mallplus.sms.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.zscat.mallplus.sms.entity.SmsFlashPromotionSession;
-import com.zscat.mallplus.utils.BaseEntity;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -21,10 +15,10 @@ import java.util.List;
  * @since 2019-04-19
  */
 @Data
-public class SmsFlashPromotionSessionVo  implements Serializable {
+public class SmsFlashPromotionSessionVo implements Serializable {
 
-   private String lovely;
-   private Integer seckillTimeIndex;
+    private String lovely;
+    private Integer seckillTimeIndex;
     private List<SmsFlashPromotionSession> seckillTime;
 
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/AdminSysJobLog.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/AdminSysJobLog.java
index e69b7fe1b191fd64ecfb8493fffcb8faec7611a6..009f31e3bd9ba875f75997575b472d62df6e6d4d 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/AdminSysJobLog.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/AdminSysJobLog.java
@@ -73,11 +73,15 @@ public class AdminSysJobLog implements Serializable {
     private Date createTime;
 
 
-    /** 开始时间 */
+    /**
+     * 开始时间
+     */
     @TableField(exist = false)
     private Date startTime;
 
-    /** 结束时间 */
+    /**
+     * 结束时间
+     */
     @TableField(exist = false)
     private Date endTime;
 
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/GenConfig.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/GenConfig.java
index 61aaeb0b932c6ba63d6827f4c6156ef208cf9436..c8a9023b3be5b2f6ba12087638474345c5454211 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/GenConfig.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/GenConfig.java
@@ -6,11 +6,12 @@ import lombok.Data;
 
 /**
  * 代码生成配置
+ *
  * @author mallplus
  * @date 2019-01-03
  */
 @Data
-@TableName( "gen_config")
+@TableName("gen_config")
 public class GenConfig {
 
 
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysAlipayConfig.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysAlipayConfig.java
index 28f401cf1c1dd067282700ae85234e760271220a..1990cb34b10bd035ec6780a4f4c3b3998b07bcef 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysAlipayConfig.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysAlipayConfig.java
@@ -1,14 +1,15 @@
 package com.zscat.mallplus.sys.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author zscat
@@ -175,17 +176,17 @@ public class SysAlipayConfig implements Serializable {
     @Override
     public String toString() {
         return "SysAlipayConfig{" +
-        ", id=" + id +
-        ", appId=" + appId +
-        ", charset=" + charset +
-        ", format=" + format +
-        ", gatewayUrl=" + gatewayUrl +
-        ", notifyUrl=" + notifyUrl +
-        ", privateKey=" + privateKey +
-        ", publicKey=" + publicKey +
-        ", returnUrl=" + returnUrl +
-        ", signType=" + signType +
-        ", sysServiceProviderId=" + sysServiceProviderId +
-        "}";
+                ", id=" + id +
+                ", appId=" + appId +
+                ", charset=" + charset +
+                ", format=" + format +
+                ", gatewayUrl=" + gatewayUrl +
+                ", notifyUrl=" + notifyUrl +
+                ", privateKey=" + privateKey +
+                ", publicKey=" + publicKey +
+                ", returnUrl=" + returnUrl +
+                ", signType=" + signType +
+                ", sysServiceProviderId=" + sysServiceProviderId +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysEmailConfig.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysEmailConfig.java
index b5804dda37484aa23a03ac4d7f104a0908e80067..f6f9ec75f9431a9f512a91e2d0b036460e20b38a 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysEmailConfig.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysEmailConfig.java
@@ -1,14 +1,15 @@
 package com.zscat.mallplus.sys.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author zscat
@@ -103,12 +104,12 @@ public class SysEmailConfig implements Serializable {
     @Override
     public String toString() {
         return "SysEmailConfig{" +
-        ", id=" + id +
-        ", fromUser=" + fromUser +
-        ", host=" + host +
-        ", pass=" + pass +
-        ", port=" + port +
-        ", user=" + user +
-        "}";
+                ", id=" + id +
+                ", fromUser=" + fromUser +
+                ", host=" + host +
+                ", pass=" + pass +
+                ", port=" + port +
+                ", user=" + user +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysQiniuConfig.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysQiniuConfig.java
index 895a80e3057d4859571f5a078c3bccba50a9f7b0..e3118d296745bfcc765b733b825881238da3bc89 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysQiniuConfig.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysQiniuConfig.java
@@ -1,14 +1,15 @@
 package com.zscat.mallplus.sys.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author zscat
@@ -117,13 +118,13 @@ public class SysQiniuConfig implements Serializable {
     @Override
     public String toString() {
         return "SysQiniuConfig{" +
-        ", id=" + id +
-        ", accessKey=" + accessKey +
-        ", bucket=" + bucket +
-        ", host=" + host +
-        ", secretKey=" + secretKey +
-        ", type=" + type +
-        ", zone=" + zone +
-        "}";
+                ", id=" + id +
+                ", accessKey=" + accessKey +
+                ", bucket=" + bucket +
+                ", host=" + host +
+                ", secretKey=" + secretKey +
+                ", type=" + type +
+                ", zone=" + zone +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysQiniuContent.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysQiniuContent.java
index 394859df7eaa0ee61d1fee56f0f1524101d0e7cd..58a455b5bc4ccc494b67a2898c0a688e3cbc42b3 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysQiniuContent.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysQiniuContent.java
@@ -1,15 +1,16 @@
 package com.zscat.mallplus.sys.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author zscat
@@ -127,14 +128,14 @@ public class SysQiniuContent implements Serializable {
     @Override
     public String toString() {
         return "SysQiniuContent{" +
-        ", id=" + id +
-        ", bucket=" + bucket +
-        ", name=" + name +
-        ", size=" + size +
-        ", type=" + type +
-        ", updateTime=" + updateTime +
-        ", url=" + url +
-        ", suffix=" + suffix +
-        "}";
+                ", id=" + id +
+                ", bucket=" + bucket +
+                ", name=" + name +
+                ", size=" + size +
+                ", type=" + type +
+                ", updateTime=" + updateTime +
+                ", url=" + url +
+                ", suffix=" + suffix +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysSchool.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysSchool.java
index 7b0fb8c1f5e742289c62c5d1cf1c4c38f94a1795..6beb78ff18c3789480b0e54533d7863ab6da29b9 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysSchool.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysSchool.java
@@ -84,5 +84,5 @@ public class SysSchool extends BaseEntity implements Serializable {
     private List<PmsProduct> goodsList;
 
     @TableField(exist = false)
-    private Integer  goodsCount;
+    private Integer goodsCount;
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysStore.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysStore.java
index 3aca7cc9b5df0b03ed3fa01a35018bdacc098c65..bc8753599a76862fdde5e087630a636c3f387d7d 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysStore.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysStore.java
@@ -105,9 +105,6 @@ public class SysStore implements Serializable {
     private Integer isTry;
 
 
-
-
-
     @TableField("plan_id")
     private Long planId;
     /**
@@ -117,7 +114,6 @@ public class SysStore implements Serializable {
     private String supportName;
 
 
-
     @TableField("last_login_time")
     private Date lastLoginTime;
 
@@ -135,18 +131,18 @@ public class SysStore implements Serializable {
 
     private String description;
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     @TableField("industry_one")
     private Long industryOne;
 
     @TableField(exist = false)
-    private List<PmsProductAttributeCategory> list ;
+    private List<PmsProductAttributeCategory> list;
 
     private Integer hit;
 
     private Integer collect;
     @TableField(exist = false)
-    private Integer  goodsCount;
+    private Integer goodsCount;
 
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysTest.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysTest.java
index 9bbe90991a5063bded455738496574afe863cb61..9140852868a9262d7242e9ab52eac73308114fcf 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysTest.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysTest.java
@@ -8,22 +8,22 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
-* @author mallplus
-* @date 2019-12-02
-        测试
-*/
+ * @author mallplus
+ * @date 2019-12-02
+ * 测试
+ */
 
 @Data
 @TableName("sys_test")
 public class SysTest implements Serializable {
 
-    @TableField( "id")
+    @TableField("id")
     private Long id;
 
-    @TableField( "name")
+    @TableField("name")
     private String name;
 
-    @TableField( "create_time")
+    @TableField("create_time")
     private Date createTime;
 
 
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysUser.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysUser.java
index 552c5a9f52fcdcce98860e197a98ed58e9b49722..59c7674b956628d30769aa0e7967deb1fd55d71f 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysUser.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysUser.java
@@ -76,6 +76,9 @@ public class SysUser extends BaseEntity implements Serializable {
     private Long supplyId;
 
 
+    @TableField("store_id")
+    private Long storeId;
+
     //角色
     @TableField(exist = false)
     private String roleIds;
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysUserVo.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysUserVo.java
index 3f0f86f25bcf209105b08e155e0205ddb8feb1d5..f125eb4ad544ffba9d61099fb282a2a5c7737453 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysUserVo.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/entity/SysUserVo.java
@@ -11,7 +11,7 @@ import lombok.Data;
  * @since 2019-04-14
  */
 @Data
-public class SysUserVo extends SysUser  {
+public class SysUserVo extends SysUser {
 
 
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/AdminSysJobLogMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/AdminSysJobLogMapper.java
index 5af9ae6a827ab5cc5609c9fd25d4638f857df1b9..9dbdccf77bcb33a89ed5f96fba847e8a17e41785 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/AdminSysJobLogMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/AdminSysJobLogMapper.java
@@ -1,7 +1,7 @@
 package com.zscat.mallplus.sys.mapper;
 
-import com.zscat.mallplus.sys.entity.AdminSysJobLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.sys.entity.AdminSysJobLog;
 
 /**
  * <p>
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/AdminSysJobMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/AdminSysJobMapper.java
index a0616373b9b586455205d477a89f017387f9ddf9..33cbd8338f87b1f3a07f980c7c3cdf3720f0db01 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/AdminSysJobMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/AdminSysJobMapper.java
@@ -1,7 +1,7 @@
 package com.zscat.mallplus.sys.mapper;
 
-import com.zscat.mallplus.sys.entity.AdminSysJob;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.sys.entity.AdminSysJob;
 
 /**
  * <p>
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/GeneratorMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/GeneratorMapper.java
index 2057da0bd26ab59fef55400462f313b6199ea6dc..300bff1736c1679f99de226314abaffccba535ed 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/GeneratorMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/GeneratorMapper.java
@@ -9,7 +9,7 @@ public interface GeneratorMapper {
 
     @Select("select table_name tableName,create_time createTime , engine, table_collation, table_comment from information_schema.tables"
             + " where table_schema = (select database()) and table_name like '%${arg0}%' limit #{arg1},#{arg2}")
-    List<Map<String, Object>> list( String name, int page, int limit);
+    List<Map<String, Object>> list(String name, int page, int limit);
 
     @Select("select table_name tableName, engine, table_comment tableComment, create_time createTime from information_schema.tables"
             + " where table_schema = (select database()) ")
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysAdminLogMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysAdminLogMapper.java
index e714ec7bbf3775f2830ae0f7d80a56014c37a8e1..b1bac83a1286f68dfb2550066a32ef2674f6b909 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysAdminLogMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysAdminLogMapper.java
@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface SysAdminLogMapper extends BaseMapper<SysAdminLog> {
 
-   List<LogStatisc> getLogStatisc(LogParam entity);
+    List<LogStatisc> getLogStatisc(LogParam entity);
 
 
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysAlipayConfigMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysAlipayConfigMapper.java
index 0822d6cce2e1e2e3e35dc08580e1ed746cabf5ff..6f830131cdabf5c414d3ecf2e17921801124f5a2 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysAlipayConfigMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysAlipayConfigMapper.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.sys.mapper;
 
-import com.zscat.mallplus.sys.entity.SysAlipayConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.sys.entity.SysAlipayConfig;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysEmailConfigMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysEmailConfigMapper.java
index d21b1270a81f758bb08d8eed365da90166dd22fd..cdf246e4fcbc0ebacae46cfc3f76769ed2c65846 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysEmailConfigMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysEmailConfigMapper.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.sys.mapper;
 
-import com.zscat.mallplus.sys.entity.SysEmailConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.sys.entity.SysEmailConfig;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysQiniuConfigMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysQiniuConfigMapper.java
index 230780c34e817bbe917b45714d441ab7a3389b89..6ed822827e2ff17639bb107ce9135249f1c9c62d 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysQiniuConfigMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysQiniuConfigMapper.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.sys.mapper;
 
-import com.zscat.mallplus.sys.entity.SysQiniuConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.sys.entity.SysQiniuConfig;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysQiniuContentMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysQiniuContentMapper.java
index 7084c88e492960bc16116dfe647c67306a07bf10..937d51f8eee7bfcaa8418a442743423673c9e0e2 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysQiniuContentMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysQiniuContentMapper.java
@@ -1,11 +1,11 @@
 package com.zscat.mallplus.sys.mapper;
 
-import com.zscat.mallplus.sys.entity.SysQiniuContent;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.sys.entity.SysQiniuContent;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysTestMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysTestMapper.java
index 384ddc0727f23e4016a6d9cda565b786da8a089b..97240095c23b48045e9de757691ca5f0bd5e1495 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysTestMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/mapper/SysTestMapper.java
@@ -1,12 +1,12 @@
 package com.zscat.mallplus.sys.mapper;
 
 
-import com.zscat.mallplus.sys.entity.SysTest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zscat.mallplus.sys.entity.SysTest;
 
 /**
-* @author mallplus
-* @date 2019-12-02
-*/
+ * @author mallplus
+ * @date 2019-12-02
+ */
 public interface SysTestMapper extends BaseMapper<SysTest> {
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/vo/EmailVo.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/vo/EmailVo.java
index 05f91d31f917ef0b0ae6432f8a9b0579ab2a1f7a..4a79ab479be7db878730fec5c5d821114757c5ae 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/vo/EmailVo.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/vo/EmailVo.java
@@ -9,6 +9,7 @@ import java.util.List;
 
 /**
  * 发送邮件时，接收参数的类
+ *
  * @author 郑杰
  * @date 2018/09/28 12:02:14
  */
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/vo/TradeVo.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/vo/TradeVo.java
index 79639329ca23af1b4f1c6c3f50ae7182e93a73b8..4fd3ca9ed9c848d746dfd930df0b3a7eb5006d48 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/vo/TradeVo.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sys/vo/TradeVo.java
@@ -9,6 +9,7 @@ import java.sql.Timestamp;
 
 /**
  * 交易详情，按需应该存入数据库，这里存入数据库，仅供临时测试
+ *
  * @author mallplus
  * @date 2018-12-31
  */
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/Sms.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/Sms.java
index b08268626f5c928898b12d20e66c77cd6a7aead3..56d2e4a32fbc30e7af7c1f16492d3cd981830214 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/Sms.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/Sms.java
@@ -19,19 +19,19 @@ import java.util.Date;
 @Data
 public class Sms implements Serializable {
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -4648169168575518593L;
-	private Long id;
-	private String phone;
-	private String signName;
-	private String templateCode;
-	private String params;
-	private String bizId;
-	private String code;
-	private String message;
-	private Date day;
-	private Date createTime;
-	private Date updateTime;
+    /**
+     *
+     */
+    private static final long serialVersionUID = -4648169168575518593L;
+    private Long id;
+    private String phone;
+    private String signName;
+    private String templateCode;
+    private String params;
+    private String bizId;
+    private String code;
+    private String message;
+    private Date day;
+    private Date createTime;
+    private Date updateTime;
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/SysAppletSet.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/SysAppletSet.java
index 7af3b11ee1ab3792529ceda24cc8226bcf5d9818..05e30e279207c7a30ff20744d6d4ac70280e7637 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/SysAppletSet.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/SysAppletSet.java
@@ -9,7 +9,7 @@ import java.io.Serializable;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author zscat
@@ -53,5 +53,4 @@ public class SysAppletSet extends BaseEntity implements Serializable {
     private String templateid6;
 
 
-
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/SysMessage.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/SysMessage.java
index efaa21c91b90618f15400b62369e453c34a6f1f6..61eb8528200722871c4523e5e5142bc2b910b38f 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/SysMessage.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/SysMessage.java
@@ -127,14 +127,14 @@ public class SysMessage implements Serializable {
     @Override
     public String toString() {
         return "SysMessage{" +
-        ", id=" + id +
-        ", userId=" + userId +
-        ", code=" + code +
-        ", params=" + params +
-        ", content=" + content +
-        ", ctime=" + ctime +
-        ", utime=" + utime +
-        ", status=" + status +
-        "}";
+                ", id=" + id +
+                ", userId=" + userId +
+                ", code=" + code +
+                ", params=" + params +
+                ", content=" + content +
+                ", ctime=" + ctime +
+                ", utime=" + utime +
+                ", status=" + status +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/SysNotice.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/SysNotice.java
index ce4af339167ae729576400a018b817d546b4d83f..edc16a77057a853ca2f11b8b50126dec2050c352 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/SysNotice.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/SysNotice.java
@@ -112,13 +112,13 @@ public class SysNotice implements Serializable {
     @Override
     public String toString() {
         return "SysNotice{" +
-        ", id=" + id +
-        ", title=" + title +
-        ", content=" + content +
-        ", type=" + type +
-        ", ctime=" + ctime +
-        ", sort=" + sort +
-        ", isdel=" + isdel +
-        "}";
+                ", id=" + id +
+                ", title=" + title +
+                ", content=" + content +
+                ", type=" + type +
+                ", ctime=" + ctime +
+                ", sort=" + sort +
+                ", isdel=" + isdel +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/TbUserFromId.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/TbUserFromId.java
index c4d697e767938fe5e9ac27c3ebba019b0d77f3bd..1690418206d0fad0f16b342be58aa84e22737052 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/TbUserFromId.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/TbUserFromId.java
@@ -132,14 +132,14 @@ public class TbUserFromId implements Serializable {
     @Override
     public String toString() {
         return "TbUserFromId{" +
-        ", id=" + id +
-        ", userId=" + userId +
-        ", formId=" + formId +
-        ", source=" + source +
-        ", status=" + status +
-        ", createTime=" + createTime +
-        ", updateTime=" + updateTime +
-        ", storeId=" + storeId +
-        "}";
+                ", id=" + id +
+                ", userId=" + userId +
+                ", formId=" + formId +
+                ", source=" + source +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", storeId=" + storeId +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsEmployInfo.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsEmployInfo.java
index 5e79835c4299083c5fe96bcaf19c146f02fee6d4..11988ed1f2b637605d58dd8876c6f725060f94f5 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsEmployInfo.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsEmployInfo.java
@@ -168,20 +168,20 @@ public class UmsEmployInfo implements Serializable {
     @Override
     public String toString() {
         return "UmsEmployInfo{" +
-        ", id=" + id +
-        ", name=" + name +
-        ", age=" + age +
-        ", gender=" + gender +
-        ", hobby=" + hobby +
-        ", peoplenote=" + peoplenote +
-        ", phone=" + phone +
-        ", address=" + address +
-        ", guide1=" + guide1 +
-        ", guide=" + guide +
-        ", suggestion=" + suggestion +
-        ", guide2=" + guide2 +
-        ", createTime=" + createTime +
-        ", storeId=" + storeId +
-        "}";
+                ", id=" + id +
+                ", name=" + name +
+                ", age=" + age +
+                ", gender=" + gender +
+                ", hobby=" + hobby +
+                ", peoplenote=" + peoplenote +
+                ", phone=" + phone +
+                ", address=" + address +
+                ", guide1=" + guide1 +
+                ", guide=" + guide +
+                ", suggestion=" + suggestion +
+                ", guide2=" + guide2 +
+                ", createTime=" + createTime +
+                ", storeId=" + storeId +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsIntegrationChangeHistory.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsIntegrationChangeHistory.java
index 4fbb5683ecbdd212f914d6d7c2db4eafb0567584..f40ac4eb22275200e028e5bc7cc1fa19805758a6 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsIntegrationChangeHistory.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsIntegrationChangeHistory.java
@@ -62,7 +62,9 @@ public class UmsIntegrationChangeHistory extends BaseEntity implements Serializa
      */
     @TableField("source_type")
     private Integer sourceType;
-    public UmsIntegrationChangeHistory(){}
+
+    public UmsIntegrationChangeHistory() {
+    }
 
     public UmsIntegrationChangeHistory(Long memberId, Date createTime, Integer changeType, Integer changeCount, String operateMan, String operateNote, Integer sourceType) {
         this.memberId = memberId;
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsIntegrationConsumeSetting.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsIntegrationConsumeSetting.java
index a2719b7e1a43d362a925fd3b4912b748ec66ad4d..572598c753c16e91d899d3af779887b92fd6fdf0 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsIntegrationConsumeSetting.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsIntegrationConsumeSetting.java
@@ -55,7 +55,7 @@ public class UmsIntegrationConsumeSetting extends BaseEntity implements Serializ
     /**
      * 登录送积分
      */
-    private Integer login ;
+    private Integer login;
 
     /**
      * 注册送积分
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsMemberBlanceLog.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsMemberBlanceLog.java
index b504e1d68b23a87d11298bb048378eafd964734d..b4c7fcb9b80fbada7293dd9df7eff97e2f3ec0a4 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsMemberBlanceLog.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsMemberBlanceLog.java
@@ -31,7 +31,7 @@ public class UmsMemberBlanceLog extends BaseEntity implements Serializable {
 
     private BigDecimal price;
     //0, 1, 2, 3, 4, 5, 7
- // '全部', '消费', '退款', '充值', '提现', '佣金', '平台调整'
+    // '全部', '消费', '退款', '充值', '提现', '佣金', '平台调整'
     private Integer type;
 
     private String note;
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsMemberLocation.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsMemberLocation.java
index 896410673fdb3a5806b4a4a1bd9db4125d37c669..a4c09b63c75c213629da102d61e67a9d24590185 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsMemberLocation.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsMemberLocation.java
@@ -99,13 +99,13 @@ public class UmsMemberLocation implements Serializable {
     @Override
     public String toString() {
         return "UmsMemberLocation{" +
-        ", id=" + id +
-        ", memberId=" + memberId +
-        ", longitude=" + longitude +
-        ", latitude=" + latitude +
-        ", userName=" + userName +
-        ", pic=" + pic +
-        ", createTime=" + createTime +
-        "}";
+                ", id=" + id +
+                ", memberId=" + memberId +
+                ", longitude=" + longitude +
+                ", latitude=" + latitude +
+                ", userName=" + userName +
+                ", pic=" + pic +
+                ", createTime=" + createTime +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UserBankcards.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UserBankcards.java
index c2c596edea2d22e87663233aef8c346340b5f508..f051f4d1b8cd9210d0ad6d1371be4dcff52f978f 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UserBankcards.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UserBankcards.java
@@ -93,5 +93,4 @@ public class UserBankcards implements Serializable {
     private Long utime;
 
 
-
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UserTocash.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UserTocash.java
index b13189d138961a8379d158226b4812bfd83826ef..e40ae6ee183709623c18f2ea1099364884e90ed3 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UserTocash.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UserTocash.java
@@ -202,19 +202,19 @@ public class UserTocash implements Serializable {
     @Override
     public String toString() {
         return "UserTocash{" +
-        ", id=" + id +
-        ", userId=" + userId +
-        ", money=" + money +
-        ", bankName=" + bankName +
-        ", bankCode=" + bankCode +
-        ", bankAreaId=" + bankAreaId +
-        ", accountBank=" + accountBank +
-        ", accountName=" + accountName +
-        ", cardNumber=" + cardNumber +
-        ", withdrawals=" + withdrawals +
-        ", type=" + type +
-        ", ctime=" + ctime +
-        ", utime=" + utime +
-        "}";
+                ", id=" + id +
+                ", userId=" + userId +
+                ", money=" + money +
+                ", bankName=" + bankName +
+                ", bankCode=" + bankCode +
+                ", bankAreaId=" + bankAreaId +
+                ", accountBank=" + accountBank +
+                ", accountName=" + accountName +
+                ", cardNumber=" + cardNumber +
+                ", withdrawals=" + withdrawals +
+                ", type=" + type +
+                ", ctime=" + ctime +
+                ", utime=" + utime +
+                "}";
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/SmsDao.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/SmsDao.java
index df29133c1cdca93cc11803dc3ff9c2e60ea6edfc..8f7064b0f112b7b03adefa7162fc9c8792ab128c 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/SmsDao.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/SmsDao.java
@@ -24,17 +24,17 @@ import java.util.Map;
 @Mapper
 public interface SmsDao {
 
-	@Options(useGeneratedKeys = true, keyProperty = "id")
-	@Insert("insert into sys_sms(phone, signName, templateCode, params, day, createTime, updateTime) "
-			+ "values(#{phone}, #{signName}, #{templateCode}, #{params}, #{day}, #{createTime}, #{updateTime})")
-	int save(Sms sms);
+    @Options(useGeneratedKeys = true, keyProperty = "id")
+    @Insert("insert into sys_sms(phone, signName, templateCode, params, day, createTime, updateTime) "
+            + "values(#{phone}, #{signName}, #{templateCode}, #{params}, #{day}, #{createTime}, #{updateTime})")
+    int save(Sms sms);
 
-	@Select("select * from sys_sms t where t.id = #{id}")
-	Sms findById(Long id);
+    @Select("select * from sys_sms t where t.id = #{id}")
+    Sms findById(Long id);
 
-	int update(Sms sms);
+    int update(Sms sms);
 
-	int count(Map<String, Object> params);
+    int count(Map<String, Object> params);
 
-	List<Sms> findList(Map<String, Object> params);
+    List<Sms> findList(Map<String, Object> params);
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/SysAppletSetMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/SysAppletSetMapper.java
index 8a4c1f9b63b80ab2a515e6115ac65adce6eb96c3..c1bf508033f0e8accbc4e111c2a86b7766de271d 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/SysAppletSetMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/SysAppletSetMapper.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.ums.entity.SysAppletSet;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/TbUserFromIdMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/TbUserFromIdMapper.java
index 0acc7529c5934b912c047569f92ed99516a710d1..ea7e970263529e7a59c35c089c43b1dbf4176315 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/TbUserFromIdMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/TbUserFromIdMapper.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.ums.entity.TbUserFromId;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/UmsEmployInfoMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/UmsEmployInfoMapper.java
index fe6952b3e5194d444477dfb2a8a760cb8ea13d53..808e0128b935ab2e9968be7162f638273b158c05 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/UmsEmployInfoMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/UmsEmployInfoMapper.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.ums.entity.UmsEmployInfo;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/UmsMemberLocationMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/UmsMemberLocationMapper.java
index feca3e22bc2d7975129ca91219899d6523ac7c05..af4b326bbfdbcd21eb2eb85040b0efba68e066aa 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/UmsMemberLocationMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/UmsMemberLocationMapper.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.ums.entity.UmsMemberLocation;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/UmsRewardLogMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/UmsRewardLogMapper.java
index 172b18a2e3fb6c1744dc25e1d972f4975f39d5c7..ae2280647c479384c0093f0e775a63916f41b465 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/UmsRewardLogMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/UmsRewardLogMapper.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.ums.entity.UmsRewardLog;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/UserBankcardsMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/UserBankcardsMapper.java
index e6ce8f53d75eaaca0d0681a0cbb837db4cb1f657..07daf331799cc80a1ead345a3c53ce732f306094 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/UserBankcardsMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/UserBankcardsMapper.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.ums.entity.UserBankcards;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/UserTocashMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/UserTocashMapper.java
index 0b90217d441c02c7e0d00b4d77588b02d61ff269..25757432702c32cbd80daf4e1712a20dc9564c63 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/UserTocashMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/mapper/UserTocashMapper.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.ums.entity.UserTocash;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author zscat
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/BaseEntity.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/BaseEntity.java
index ffac7b6e182c66a36f4b41449e242d50f38160bc..31f80058ffbe53b39abe4b34bf2db3e943db3a57 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/BaseEntity.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/BaseEntity.java
@@ -1,6 +1,5 @@
 package com.zscat.mallplus.utils;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -14,6 +13,6 @@ import java.io.Serializable;
 @Setter
 @Getter
 public class BaseEntity implements Serializable {
-    @TableField("store_id")
-    private Long storeId;
+   /* @TableField("store_id")
+    private Long storeId;*/
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/CommonResult.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/CommonResult.java
index ce7ca4dbf52a8db8c44d2a0cc7e32ef4d4f74612..0893bed3fe6e58741d2ad5a519e7d218edf7eb42 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/CommonResult.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/CommonResult.java
@@ -52,6 +52,7 @@ public class CommonResult {
         this.data = data;
         return this;
     }
+
     /**
      * 普通成功返回
      */
@@ -75,11 +76,13 @@ public class CommonResult {
         this.data = msg;
         return this;
     }
-    public CommonResult failed(Integer code,String message) {
+
+    public CommonResult failed(Integer code, String message) {
         this.code = code;
         this.msg = message;
         return this;
     }
+
     /**
      * 参数验证失败使用
      *
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/EncryptUtils.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/EncryptUtils.java
index fd37e664090afa4e8cf794dfb493a700775dcecd..f02eb969c67022bed2e96b087a2fe4d2b4226592 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/EncryptUtils.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/EncryptUtils.java
@@ -11,6 +11,7 @@ import java.nio.charset.StandardCharsets;
 
 /**
  * 加密
+ *
  * @author mallplus
  * @date 2018-11-23
  */
@@ -22,7 +23,7 @@ public class EncryptUtils {
      * 对称加密
      */
     public static String desEncrypt(String source) throws Exception {
-        if (source == null || source.length() == 0){
+        if (source == null || source.length() == 0) {
             return null;
         }
         Cipher cipher = Cipher.getInstance("DES/CBC/PKCS5Padding");
@@ -51,7 +52,7 @@ public class EncryptUtils {
     }
 
     private static byte[] hex2byte(byte[] b) {
-        if ((b.length % 2) != 0){
+        if ((b.length % 2) != 0) {
             throw new IllegalArgumentException("长度不是偶数");
         }
         byte[] b2 = new byte[b.length / 2];
@@ -66,7 +67,7 @@ public class EncryptUtils {
      * 对称解密
      */
     public static String desDecrypt(String source) throws Exception {
-        if (source == null || source.length() == 0){
+        if (source == null || source.length() == 0) {
             return null;
         }
         byte[] src = hex2byte(source.getBytes());
@@ -83,7 +84,7 @@ public class EncryptUtils {
     /**
      * 密码加密
      */
-    public static String encryptPassword(String password){
-        return  DigestUtils.md5DigestAsHex(password.getBytes());
+    public static String encryptPassword(String password) {
+        return DigestUtils.md5DigestAsHex(password.getBytes());
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/HttpUtils.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/HttpUtils.java
index 1ea53fa05e11d0caa3f14a8a344d7c986d435e74..f09f1ab405003ec98edd4e34e7a4e202f14dbb85 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/HttpUtils.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/HttpUtils.java
@@ -31,53 +31,53 @@ import java.util.Map;
 
 public class HttpUtils {
 
-	/**
-	 * get
-	 *
-	 * @param host
-	 * @param path
-	 * @param method
-	 * @param headers
-	 * @param querys
-	 * @return
-	 * @throws Exception
-	 */
-	public static HttpResponse doGet(String host, String path, String method,
-			Map<String, String> headers,
-			Map<String, String> querys)
+    /**
+     * get
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doGet(String host, String path, String method,
+                                     Map<String, String> headers,
+                                     Map<String, String> querys)
             throws Exception {
-    	HttpClient httpClient = wrapClient(host);
+        HttpClient httpClient = wrapClient(host);
 
-    	HttpGet request = new HttpGet(buildUrl(host, path, querys));
+        HttpGet request = new HttpGet(buildUrl(host, path, querys));
         for (Map.Entry<String, String> e : headers.entrySet()) {
-        	request.addHeader(e.getKey(), e.getValue());
+            request.addHeader(e.getKey(), e.getValue());
         }
 
         return httpClient.execute(request);
     }
 
-	/**
-	 * post form
-	 *
-	 * @param host
-	 * @param path
-	 * @param method
-	 * @param headers
-	 * @param querys
-	 * @param bodys
-	 * @return
-	 * @throws Exception
-	 */
-	public static HttpResponse doPost(String host, String path, String method,
-			Map<String, String> headers,
-			Map<String, String> querys,
-			Map<String, String> bodys)
+    /**
+     * post form
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @param bodys
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doPost(String host, String path, String method,
+                                      Map<String, String> headers,
+                                      Map<String, String> querys,
+                                      Map<String, String> bodys)
             throws Exception {
-    	HttpClient httpClient = wrapClient(host);
+        HttpClient httpClient = wrapClient(host);
 
-    	HttpPost request = new HttpPost(buildUrl(host, path, querys));
+        HttpPost request = new HttpPost(buildUrl(host, path, querys));
         for (Map.Entry<String, String> e : headers.entrySet()) {
-        	request.addHeader(e.getKey(), e.getValue());
+            request.addHeader(e.getKey(), e.getValue());
         }
 
         if (bodys != null) {
@@ -94,208 +94,212 @@ public class HttpUtils {
         return httpClient.execute(request);
     }
 
-	/**
-	 * Post String
-	 *
-	 * @param host
-	 * @param path
-	 * @param method
-	 * @param headers
-	 * @param querys
-	 * @param body
-	 * @return
-	 * @throws Exception
-	 */
-	public static HttpResponse doPost(String host, String path, String method,
-			Map<String, String> headers,
-			Map<String, String> querys,
-			String body)
+    /**
+     * Post String
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @param body
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doPost(String host, String path, String method,
+                                      Map<String, String> headers,
+                                      Map<String, String> querys,
+                                      String body)
             throws Exception {
-    	HttpClient httpClient = wrapClient(host);
+        HttpClient httpClient = wrapClient(host);
 
-    	HttpPost request = new HttpPost(buildUrl(host, path, querys));
+        HttpPost request = new HttpPost(buildUrl(host, path, querys));
         for (Map.Entry<String, String> e : headers.entrySet()) {
-        	request.addHeader(e.getKey(), e.getValue());
+            request.addHeader(e.getKey(), e.getValue());
         }
 
         if (ValidatorUtils.notEmpty(body)) {
-        	request.setEntity(new StringEntity(body, "utf-8"));
+            request.setEntity(new StringEntity(body, "utf-8"));
         }
 
         return httpClient.execute(request);
     }
 
-	/**
-	 * Post stream
-	 *
-	 * @param host
-	 * @param path
-	 * @param method
-	 * @param headers
-	 * @param querys
-	 * @param body
-	 * @return
-	 * @throws Exception
-	 */
-	public static HttpResponse doPost(String host, String path, String method,
-			Map<String, String> headers,
-			Map<String, String> querys,
-			byte[] body)
+    /**
+     * Post stream
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @param body
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doPost(String host, String path, String method,
+                                      Map<String, String> headers,
+                                      Map<String, String> querys,
+                                      byte[] body)
             throws Exception {
-    	HttpClient httpClient = wrapClient(host);
+        HttpClient httpClient = wrapClient(host);
 
-    	HttpPost request = new HttpPost(buildUrl(host, path, querys));
+        HttpPost request = new HttpPost(buildUrl(host, path, querys));
         for (Map.Entry<String, String> e : headers.entrySet()) {
-        	request.addHeader(e.getKey(), e.getValue());
+            request.addHeader(e.getKey(), e.getValue());
         }
 
         if (body != null) {
-        	request.setEntity(new ByteArrayEntity(body));
+            request.setEntity(new ByteArrayEntity(body));
         }
 
         return httpClient.execute(request);
     }
 
-	/**
-	 * Put String
-	 * @param host
-	 * @param path
-	 * @param method
-	 * @param headers
-	 * @param querys
-	 * @param body
-	 * @return
-	 * @throws Exception
-	 */
-	public static HttpResponse doPut(String host, String path, String method,
-			Map<String, String> headers,
-			Map<String, String> querys,
-			String body)
+    /**
+     * Put String
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @param body
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doPut(String host, String path, String method,
+                                     Map<String, String> headers,
+                                     Map<String, String> querys,
+                                     String body)
             throws Exception {
-    	HttpClient httpClient = wrapClient(host);
+        HttpClient httpClient = wrapClient(host);
 
-    	HttpPut request = new HttpPut(buildUrl(host, path, querys));
+        HttpPut request = new HttpPut(buildUrl(host, path, querys));
         for (Map.Entry<String, String> e : headers.entrySet()) {
-        	request.addHeader(e.getKey(), e.getValue());
+            request.addHeader(e.getKey(), e.getValue());
         }
 
         if (ValidatorUtils.notEmpty(body)) {
-        	request.setEntity(new StringEntity(body, "utf-8"));
+            request.setEntity(new StringEntity(body, "utf-8"));
         }
 
         return httpClient.execute(request);
     }
 
-	/**
-	 * Put stream
-	 * @param host
-	 * @param path
-	 * @param method
-	 * @param headers
-	 * @param querys
-	 * @param body
-	 * @return
-	 * @throws Exception
-	 */
-	public static HttpResponse doPut(String host, String path, String method,
-			Map<String, String> headers,
-			Map<String, String> querys,
-			byte[] body)
+    /**
+     * Put stream
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @param body
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doPut(String host, String path, String method,
+                                     Map<String, String> headers,
+                                     Map<String, String> querys,
+                                     byte[] body)
             throws Exception {
-    	HttpClient httpClient = wrapClient(host);
+        HttpClient httpClient = wrapClient(host);
 
-    	HttpPut request = new HttpPut(buildUrl(host, path, querys));
+        HttpPut request = new HttpPut(buildUrl(host, path, querys));
         for (Map.Entry<String, String> e : headers.entrySet()) {
-        	request.addHeader(e.getKey(), e.getValue());
+            request.addHeader(e.getKey(), e.getValue());
         }
 
         if (body != null) {
-        	request.setEntity(new ByteArrayEntity(body));
+            request.setEntity(new ByteArrayEntity(body));
         }
 
         return httpClient.execute(request);
     }
 
-	/**
-	 * Delete
-	 *
-	 * @param host
-	 * @param path
-	 * @param method
-	 * @param headers
-	 * @param querys
-	 * @return
-	 * @throws Exception
-	 */
-	public static HttpResponse doDelete(String host, String path, String method,
-			Map<String, String> headers,
-			Map<String, String> querys)
+    /**
+     * Delete
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doDelete(String host, String path, String method,
+                                        Map<String, String> headers,
+                                        Map<String, String> querys)
             throws Exception {
-    	HttpClient httpClient = wrapClient(host);
+        HttpClient httpClient = wrapClient(host);
 
-    	HttpDelete request = new HttpDelete(buildUrl(host, path, querys));
+        HttpDelete request = new HttpDelete(buildUrl(host, path, querys));
         for (Map.Entry<String, String> e : headers.entrySet()) {
-        	request.addHeader(e.getKey(), e.getValue());
+            request.addHeader(e.getKey(), e.getValue());
         }
 
         return httpClient.execute(request);
     }
 
-	private static String buildUrl(String host, String path, Map<String, String> querys) throws UnsupportedEncodingException {
-    	StringBuilder sbUrl = new StringBuilder();
-    	sbUrl.append(host);
-    	if (!ValidatorUtils.notEmpty(path)) {
-    		sbUrl.append(path);
+    private static String buildUrl(String host, String path, Map<String, String> querys) throws UnsupportedEncodingException {
+        StringBuilder sbUrl = new StringBuilder();
+        sbUrl.append(host);
+        if (!ValidatorUtils.notEmpty(path)) {
+            sbUrl.append(path);
         }
-    	if (null != querys) {
-    		StringBuilder sbQuery = new StringBuilder();
-        	for (Map.Entry<String, String> query : querys.entrySet()) {
-        		if (0 < sbQuery.length()) {
-        			sbQuery.append("&");
-        		}
-        		if (ValidatorUtils.notEmpty(query.getKey()) && !ValidatorUtils.notEmpty(query.getValue())) {
-        			sbQuery.append(query.getValue());
+        if (null != querys) {
+            StringBuilder sbQuery = new StringBuilder();
+            for (Map.Entry<String, String> query : querys.entrySet()) {
+                if (0 < sbQuery.length()) {
+                    sbQuery.append("&");
                 }
-        		if (!ValidatorUtils.notEmpty(query.getKey())) {
-        			sbQuery.append(query.getKey());
-        			if (!ValidatorUtils.notEmpty(query.getValue())) {
-        				sbQuery.append("=");
-        				sbQuery.append(URLEncoder.encode(query.getValue(), "utf-8"));
-        			}
+                if (ValidatorUtils.notEmpty(query.getKey()) && !ValidatorUtils.notEmpty(query.getValue())) {
+                    sbQuery.append(query.getValue());
                 }
-        	}
-        	if (0 < sbQuery.length()) {
-        		sbUrl.append("?").append(sbQuery);
-        	}
+                if (!ValidatorUtils.notEmpty(query.getKey())) {
+                    sbQuery.append(query.getKey());
+                    if (!ValidatorUtils.notEmpty(query.getValue())) {
+                        sbQuery.append("=");
+                        sbQuery.append(URLEncoder.encode(query.getValue(), "utf-8"));
+                    }
+                }
+            }
+            if (0 < sbQuery.length()) {
+                sbUrl.append("?").append(sbQuery);
+            }
         }
 
-    	return sbUrl.toString();
+        return sbUrl.toString();
     }
 
-	private static HttpClient wrapClient(String host) {
-		HttpClient httpClient = new DefaultHttpClient();
-		if (host.startsWith("https://")) {
-			sslClient(httpClient);
-		}
+    private static HttpClient wrapClient(String host) {
+        HttpClient httpClient = new DefaultHttpClient();
+        if (host.startsWith("https://")) {
+            sslClient(httpClient);
+        }
 
-		return httpClient;
-	}
+        return httpClient;
+    }
 
-	private static void sslClient(HttpClient httpClient) {
+    private static void sslClient(HttpClient httpClient) {
         try {
             SSLContext ctx = SSLContext.getInstance("TLS");
             X509TrustManager tm = new X509TrustManager() {
                 public X509Certificate[] getAcceptedIssuers() {
                     return null;
                 }
+
                 public void checkClientTrusted(X509Certificate[] xcs, String str) {
 
                 }
+
                 public void checkServerTrusted(X509Certificate[] xcs, String str) {
 
                 }
             };
-            ctx.init(null, new TrustManager[] { tm }, null);
+            ctx.init(null, new TrustManager[]{tm}, null);
             SSLSocketFactory ssf = new SSLSocketFactory(ctx);
             ssf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
             ClientConnectionManager ccm = httpClient.getConnectionManager();
@@ -304,7 +308,7 @@ public class HttpUtils {
         } catch (KeyManagementException ex) {
             throw new RuntimeException(ex);
         } catch (NoSuchAlgorithmException ex) {
-        	throw new RuntimeException(ex);
+            throw new RuntimeException(ex);
         }
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/IdWorker.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/IdWorker.java
index 2ec863ab99ec3249f0cb4181d3ffa886385d585e..410b0b7bd9d931720175a28ceb73eb4dbd828e40 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/IdWorker.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/IdWorker.java
@@ -1,5 +1,3 @@
-
-
 package com.zscat.mallplus.utils;
 
 import java.util.UUID;
@@ -15,9 +13,9 @@ public class IdWorker {
     public static void main(String[] args) {
         ExecutorService executorService = Executors.newFixedThreadPool(5);
 
-        for(int j = 0; j < 5; ++j) {
+        for (int j = 0; j < 5; ++j) {
             executorService.submit(() -> {
-                for(int i = 0; i < 30000; ++i) {
+                for (int i = 0; i < 30000; ++i) {
                     System.out.println(Thread.currentThread().getId() + "--" + getId());
                 }
 
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/MatrixToImageWriter.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/MatrixToImageWriter.java
index d91fe604d17b46e32e17b2359111d940f94ceca6..d810b542d1cd9f2df4cb833633f311e4134085a6 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/MatrixToImageWriter.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/MatrixToImageWriter.java
@@ -48,9 +48,9 @@ public class MatrixToImageWriter {
         //文字长度
         int strWidth = outg.getFontMetrics().stringWidth(words);
         //总长度减去文字长度的一半  （居中显示）
-        int wordStartX=(width - strWidth) / 2;
+        int wordStartX = (width - strWidth) / 2;
         //height + (outImage.getHeight() - height) / 2 + 12
-        int wordStartY=height-20;
+        int wordStartY = height - 20;
         // 画文字
         outg.drawString(words, wordStartX, wordStartY);
         outg.dispose();
@@ -58,21 +58,21 @@ public class MatrixToImageWriter {
         return image;
     }
 
-    private static void setGraphics2D(Graphics2D graphics2D){
+    private static void setGraphics2D(Graphics2D graphics2D) {
         graphics2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         graphics2D.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_DEFAULT);
         Stroke s = new BasicStroke(1, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER);
         graphics2D.setStroke(s);
     }
 
-    static void writeToFile(BitMatrix matrix, String format, File file,String words) throws IOException {
+    static void writeToFile(BitMatrix matrix, String format, File file, String words) throws IOException {
         BufferedImage image = toBufferedImage(matrix, words);
         if (!ImageIO.write(image, format, file)) {
             throw new IOException("Could not write an image of format " + format + " to " + file);
         }
     }
 
-    static void writeToStream(BitMatrix matrix, String format, OutputStream stream,String words) throws IOException {
+    static void writeToStream(BitMatrix matrix, String format, OutputStream stream, String words) throws IOException {
         BufferedImage image = toBufferedImage(matrix, words);
         if (!ImageIO.write(image, format, stream)) {
             throw new IOException("Could not write an image of format " + format);
@@ -80,7 +80,7 @@ public class MatrixToImageWriter {
     }
 
 
-    public static ByteArrayResource createQrCode(String url,String words) {
+    public static ByteArrayResource createQrCode(String url, String words) {
         try {
             Map<EncodeHintType, String> hints = new HashMap<>();
             hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
@@ -93,13 +93,13 @@ public class MatrixToImageWriter {
             //}
             //=============此处生成流因为后面要上传到文件系统中，所以直接通过流上传===========
             ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-            writeToStream(bitMatrix, "jpg", outputStream,words);
+            writeToStream(bitMatrix, "jpg", outputStream, words);
             //==============生成输入流========================
             //ByteArrayInputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
-            ByteArrayResource arrayResource = new ByteArrayResource(outputStream.toByteArray()){
+            ByteArrayResource arrayResource = new ByteArrayResource(outputStream.toByteArray()) {
                 @Override
                 public String getFilename() throws IllegalStateException {
-                    return System.currentTimeMillis()+"";
+                    return System.currentTimeMillis() + "";
                 }
             };
             return arrayResource;
@@ -122,6 +122,6 @@ public class MatrixToImageWriter {
                 BarcodeFormat.QR_CODE, width, height, hints);
         // 生成二维码
         File outputFile = new File("d:" + File.separator + "new.jpg");
-        MatrixToImageWriter.writeToFile(bitMatrix, format, outputFile,"123");
+        MatrixToImageWriter.writeToFile(bitMatrix, format, outputFile, "123");
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/PhoneUtil.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/PhoneUtil.java
index 10d6a29de4c1ab4739cd0a7028e362bb34dd100b..2c037c593e5de8e25d4487498f1634dc307fbd8b 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/PhoneUtil.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/PhoneUtil.java
@@ -6,25 +6,25 @@ import java.util.regex.Pattern;
 /**
  * @author 作者 zscat E-mail: 951449465@qq.com
  * @version 创建时间：2017年11月12日 上午22:57:51
- * 正则表达式手机号码校验类 
+ * 正则表达式手机号码校验类
  */
 public class PhoneUtil {
 
-	private static String REGEX = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(17[013678])|(18[0,5-9]))\\d{8}$";
-	private static Pattern P = Pattern.compile(REGEX);
+    private static String REGEX = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(17[013678])|(18[0,5-9]))\\d{8}$";
+    private static Pattern P = Pattern.compile(REGEX);
 
-	/**
-	 * 校验手机号
-	 * 
-	 * @param phone
-	 * @return
-	 */
-	public static boolean checkPhone(String phone) {
-		if (phone == null || phone.length() != 11) {
-			return Boolean.FALSE;
-		}
+    /**
+     * 校验手机号
+     *
+     * @param phone
+     * @return
+     */
+    public static boolean checkPhone(String phone) {
+        if (phone == null || phone.length() != 11) {
+            return Boolean.FALSE;
+        }
 
-		Matcher m = P.matcher(phone);
-		return m.matches();
-	}
+        Matcher m = P.matcher(phone);
+        return m.matches();
+    }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/PluginUtils.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/PluginUtils.java
index 44a82a03ad00c4cded025b9a1c30966e55404dfc..f41c542b615e18413827df9c8d101106923e6ebd 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/PluginUtils.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/PluginUtils.java
@@ -22,14 +22,12 @@ public final class PluginUtils {
     }
 
 
-
-
     public static MappedStatement getMappedStatement(MetaObject metaObject) {
-        return (MappedStatement)metaObject.getValue("delegate.mappedStatement");
+        return (MappedStatement) metaObject.getValue("delegate.mappedStatement");
     }
 
     public static Object realTarget(Object target) {
-        if(Proxy.isProxyClass(target.getClass())) {
+        if (Proxy.isProxyClass(target.getClass())) {
             MetaObject metaObject = SystemMetaObject.forObject(target);
             return realTarget(metaObject.getValue("h.target"));
         } else {
@@ -39,6 +37,6 @@ public final class PluginUtils {
 
     public static String getProperty(Properties properties, String key) {
         String value = properties.getProperty(key);
-        return StringUtils.isEmpty(value)?null:value;
+        return StringUtils.isEmpty(value) ? null : value;
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/ReducePriceUtils.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/ReducePriceUtils.java
index 4acad744b0c4a0df6a5129b95888e94b7f97239e..3906bc7ab9797c78ac6406d92d9ec006ad365ffd 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/ReducePriceUtils.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/ReducePriceUtils.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- *
  * @author cc
  * @Decription 砍价
  */
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/Sequence.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/Sequence.java
index 3c026ccedd0b33d3f50ab25d0fd3a9a6cb50fb7f..741ff9e1ece823aae46516901e57107fbef7834d 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/Sequence.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/Sequence.java
@@ -57,7 +57,7 @@ class Sequence {
             mpid.append(name.split("@")[0]);
         }
 
-        return (long)(mpid.toString().hashCode() & '\uffff') % (maxWorkerId + 1L);
+        return (long) (mpid.toString().hashCode() & '\uffff') % (maxWorkerId + 1L);
     }
 
     protected static long getDatacenterId(long maxDatacenterId) {
@@ -71,7 +71,7 @@ class Sequence {
             } else {
                 byte[] mac = network.getHardwareAddress();
                 if (null != mac) {
-                    id = (255L & (long)mac[mac.length - 1] | 65280L & (long)mac[mac.length - 2] << 8) >> 6;
+                    id = (255L & (long) mac[mac.length - 1] | 65280L & (long) mac[mac.length - 2] << 8) >> 6;
                     id %= maxDatacenterId + 1L;
                 }
             }
@@ -116,7 +116,7 @@ class Sequence {
 
     protected long tilNextMillis(long lastTimestamp) {
         long timestamp;
-        for(timestamp = this.timeGen(); timestamp <= lastTimestamp; timestamp = this.timeGen()) {
+        for (timestamp = this.timeGen(); timestamp <= lastTimestamp; timestamp = this.timeGen()) {
         }
 
         return timestamp;
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/ValidatorUtils.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/ValidatorUtils.java
index ad708e0c06bc822c368c19b9272abe03e10a4075..a995666d3d0174ec8262d23a7c91359c54252fd8 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/ValidatorUtils.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/utils/ValidatorUtils.java
@@ -177,8 +177,10 @@ public class ValidatorUtils {
         }
         return String.valueOf(d);
     }
+
     /**
      * 获取结束时间与当前的时间差
+     *
      * @param endTime
      * @return
      */
@@ -190,10 +192,10 @@ public class ValidatorUtils {
 
         long hours = (diff - days * (1000 * 60 * 60 * 24))
                 / (1000 * 60 * 60);    //小时
-        long mins = (diff - days * (1000 * 60 * 60 * 24)-hours * (1000 * 60 * 60))/(1000 * 60 );    //小时
+        long mins = (diff - days * (1000 * 60 * 60 * 24) - hours * (1000 * 60 * 60)) / (1000 * 60);    //小时
         long sc = (diff - days * (1000 * 60 * 60 * 24) - hours
-                * (1000 * 60 * 60)-mins*(1000*60)) / (1000); // 秒
+                * (1000 * 60 * 60) - mins * (1000 * 60)) / (1000); // 秒
 
-        return new TimeSecound(days,  hours,  mins,  sc);
+        return new TimeSecound(days, hours, mins, sc);
     }
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/ApplyRefundVo.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/ApplyRefundVo.java
new file mode 100644
index 0000000000000000000000000000000000000000..447f2b11b861f65912103307eb66f1e05f50752a
--- /dev/null
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/ApplyRefundVo.java
@@ -0,0 +1,13 @@
+package com.zscat.mallplus.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class ApplyRefundVo {
+    private Long itemId;
+    private Integer type;
+    private String desc;
+    private String[] images;
+}
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/BlobUpload.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/BlobUpload.java
index cde41c702cdafad3b809053f92afd0dcb61a36fb..19dcbe03f21bc250efb63aeeb7c0fe3457eb7a7c 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/BlobUpload.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/BlobUpload.java
@@ -10,7 +10,7 @@ import lombok.Setter;
 @Getter
 public class BlobUpload {
 
-     String fileName;
+    String fileName;
     String fileUrl;
     String thumbnailUrl;
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/IdStatus.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/IdStatus.java
index c8739569cad1cd4da8c51367f88cea6ff02b99aa..474a937817fdeb02f41294df3887d9ced9664271 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/IdStatus.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/IdStatus.java
@@ -3,7 +3,8 @@ package com.zscat.mallplus.vo;
 import lombok.Getter;
 import lombok.Setter;
 
-@Getter@Setter
+@Getter
+@Setter
 public class IdStatus {
     private Long id;
     private Integer status;
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/MallThreadLocal.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/MallThreadLocal.java
index 916ca09905d920d27df3b9e1f862d23293d1be13..7a39509aac00702c2cb3bd1f1500a6de2090f501 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/MallThreadLocal.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/MallThreadLocal.java
@@ -3,35 +3,35 @@ package com.zscat.mallplus.vo;
 public class MallThreadLocal {
     private static final ThreadLocal<String> threadLocalUser = new ThreadLocal<>();
     private static final ThreadLocal<String> threadLocalB = new ThreadLocal<>();
- 
+
+    public static String getLocalUser() {
+        return threadLocalUser.get();
+    }
+
     /**
      * 在调用的线程的map中存入key为ThreadLocal本身，value为在该线程设置的值
+     *
      * @param value
      */
-    public static void setLocalUser(String value){
+    public static void setLocalUser(String value) {
         threadLocalUser.set(value);
     }
- 
-    public static String getLocalUser(){
-        return threadLocalUser.get();
-    }
- 
-    public static void clearLocalUser(){
+
+    public static void clearLocalUser() {
         threadLocalUser.remove();
     }
- 
-    public static void setValueB(String value){
-        threadLocalB.set(value);
-    }
- 
-    public static String getValueB(){
+
+    public static String getValueB() {
         return threadLocalB.get();
     }
- 
-    public static void clearValueB(){
+
+    public static void setValueB(String value) {
+        threadLocalB.set(value);
+    }
+
+    public static void clearValueB() {
         threadLocalB.remove();
     }
- 
- 
 
-}
\ No newline at end of file
+
+}
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/OrderStatusCount.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/OrderStatusCount.java
index 9ecaff464a09bc7b8a1406ff058025b8ffb9fca0..09d9f98225065a2a739a38865c7ca84649a6f357 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/OrderStatusCount.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/OrderStatusCount.java
@@ -12,6 +12,8 @@ import java.math.BigDecimal;
  */
 @Data
 public class OrderStatusCount implements Serializable {
+    int statusAll = 0;
+    BigDecimal payAmount = BigDecimal.ZERO;
     // 12->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单
     private int status0;
     private int status1;
@@ -20,6 +22,4 @@ public class OrderStatusCount implements Serializable {
     private int status4;
     private int status5;
     private int status14;
-    int statusAll = 0;
-    BigDecimal payAmount = BigDecimal.ZERO;
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/Rediskey.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/Rediskey.java
index 9450011bbdd96c70f2fb1a55f7185719d4ee5e36..4e541908821549f54afbfb128e08ef894f998013 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/Rediskey.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/Rediskey.java
@@ -15,7 +15,7 @@ public class Rediskey {
 
     public static final String GOODS_VIEWCOUNT_CODE = "GOODSVIEWCOUNTCODE_";
     public static final String GOODS_VIEWCOUNT_KEY = "GOODS_VIEWCOUNT_KEY";
-    public static final String KDWL_INFO_CACHE = "KDWL_INFO_CACHE" ;
+    public static final String KDWL_INFO_CACHE = "KDWL_INFO_CACHE";
 
     public static String appletBannerKey = "appletBannerKey";
     public static String appletCategoryKey = "appletCategoryKey";
@@ -26,8 +26,6 @@ public class Rediskey {
     public static String appletsmsFlashPromotionProductKey = "appletsmsFlashPromotionProductKey";
 
 
-
-
     public static String allTreesList = "allTreesList:%s";
     public static String menuTreesList = "menuTreesList:%s";
     public static String permissionTreesList = "permissionTreesList:%s";
@@ -35,7 +33,6 @@ public class Rediskey {
     public static String menuList = "menuList:%s";
 
 
-
     public static String HomeContentResult = "HomeContentResult";
     public static String PmsProductResult = "PmsProductResult";
     public static String orderDetailResult = "orderDetailResult";
@@ -54,49 +51,45 @@ public class Rediskey {
     public static String HOMEPAGEmallplus2 = "HomeMallplus2";
     public static String HOMEPAGE2 = "HomeCrmeb";
     public static String HOMEPAGEPC = "HomePc";
-    private static String SPLIT = ":";
-    private static String BIZ_LIKE = "LIKE";
-    private static String BIZ_DISLIKE = "DISLIKE";
-
     public static String categoryAndChilds = "categoryAndChilds";
     public static String goodsConsult = "goodsConsult";
     public static String categoryAndGoodsList = "categoryAndGoodsList";
-
     public static String specialcategoryAndGoodsList = "specialcategoryAndGoodsList";
-
-
-
+    public static String goodsCategorys = "goodsCategorys";
     public static String orderDetail = "orderDetail";
     public static String getorderstatusnum = "getorderstatusnum";
-
-
     /**
      * diypage.setStatus(1);
-     diypage.setType(2);
+     * diypage.setType(2);
      */
     public static String EsShopDiypage = "EsShopDiypage12:%s";
-
-
     /**
      * 会员
      */
     public static String MEMBER = "MEMBER:%s";
+    private static String SPLIT = ":";
+    private static String BIZ_LIKE = "LIKE";
+    private static String BIZ_DISLIKE = "DISLIKE";
+
     /**
      * 产生key:如在newsId为2上的咨询点赞后会产生key: LIKE:ENTITY_NEWS:2
+     *
      * @param entityId
      * @param entityType
      * @return
      */
-    public static String getLikeKey(int entityId, int entityType){
+    public static String getLikeKey(int entityId, int entityType) {
         return BIZ_LIKE + SPLIT + String.valueOf(entityType) + SPLIT + String.valueOf(entityId);
     }
+
     /**
      * 取消赞:如在newsId为2上的资讯取消点赞后会产生key: DISLIKE:ENTITY_NEWS:2
+     *
      * @param entityId
      * @param entityType
      * @return
      */
-    public static String getDisLikeKey(int entityId, int entityType){
+    public static String getDisLikeKey(int entityId, int entityType) {
         return BIZ_DISLIKE + SPLIT + String.valueOf(entityType) + SPLIT + String.valueOf(entityId);
     }
 
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/SmsCode.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/SmsCode.java
index 834dca79a1370b13148629d8608c46f27825e1b3..e9de67a44aa93e7f30710e057ad2f818efb29478 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/SmsCode.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/SmsCode.java
@@ -6,10 +6,10 @@ import java.io.Serializable;
 
 @Data
 public class SmsCode implements Serializable {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 7353129036120185186L;
-	//短信流水号
-	private String key;
+    /**
+     *
+     */
+    private static final long serialVersionUID = 7353129036120185186L;
+    //短信流水号
+    private String key;
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/UmsMemberInfoDetail.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/UmsMemberInfoDetail.java
index 7ae1b07a296c964517736c7d3616d37e396adec9..359c77af2b4410dc9767732440fc19e1dea26fd6 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/UmsMemberInfoDetail.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/UmsMemberInfoDetail.java
@@ -16,8 +16,8 @@ import java.util.List;
  * @since 2019-04-19
  */
 @Data
-public class UmsMemberInfoDetail  implements Serializable {
+public class UmsMemberInfoDetail implements Serializable {
 
-   private UmsMember member;
-    private List<SmsCouponHistory> histories ;
+    private UmsMember member;
+    private List<SmsCouponHistory> histories;
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/home/Configs.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/home/Configs.java
index 9b5dd1f3c4906739766038b3a59f3ef056681216..166ad9c5663f487e35d8cd0fb82487165dcaff97 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/home/Configs.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/home/Configs.java
@@ -6,30 +6,30 @@ import java.io.Serializable;
 
 @Data
 public class Configs implements Serializable {
-   private Integer about_article_id= 5;
-    private Integer cate_style= 3;
-    private Integer cate_type= 1;
-    private String  distribution_agreement= "分销商申请协议";
-    private String   distribution_notes= "       成为Jshop云商分销商后，可以获取佣金，用户只可被推荐一次，越早推荐越返利越多哦。";
-    private String distribution_store= "1";
-    private Integer ent_id= 10519;
-    private Integer goods_stocks_warn= 5;
-    private Integer  image_max= 5;
-    private Integer  invoice_switch= 1;
-    private Integer open_distribution= 1;
-    private Integer  point_switch= 1;
-    private String[]  recommend_keys= {"圆珠笔", "文件夹", "文件袋"};
-    private String  share_desc= "";
-    private String  share_image= "https=//demo.jihainet.com/static/poster/1/1-1b867dc28e4bd37e55eaf327b6722fea.jpg";
-    private String   share_title= "优质好店邀您共享";
-    private String  shop_default_image= "http=//demo.jihainet.com/static/uploads/images/d6/60/71/5cde803675475.png";
-    private String  shop_desc= "管易云";
-    private String  shop_logo= "http=//demo.jihainet.com/static/uploads/images/68/f6/1b/5cde803088e85.png";
-    private String  shop_mobile= "18530801653";
-    private String  shop_name= "管易云";
-    private String  show_inviter= "";
-    private String  statistics= "";
-    private Integer  store_switch= 1;
-    private Integer tocash_money_low= 1;
-    private Integer tocash_money_rate= 1;
+    private Integer about_article_id = 5;
+    private Integer cate_style = 3;
+    private Integer cate_type = 1;
+    private String distribution_agreement = "分销商申请协议";
+    private String distribution_notes = "       成为Jshop云商分销商后，可以获取佣金，用户只可被推荐一次，越早推荐越返利越多哦。";
+    private String distribution_store = "1";
+    private Integer ent_id = 10519;
+    private Integer goods_stocks_warn = 5;
+    private Integer image_max = 5;
+    private Integer invoice_switch = 1;
+    private Integer open_distribution = 1;
+    private Integer point_switch = 1;
+    private String[] recommend_keys = {"圆珠笔", "文件夹", "文件袋"};
+    private String share_desc = "";
+    private String share_image = "https=//demo.jihainet.com/static/poster/1/1-1b867dc28e4bd37e55eaf327b6722fea.jpg";
+    private String share_title = "优质好店邀您共享";
+    private String shop_default_image = "http=//demo.jihainet.com/static/uploads/images/d6/60/71/5cde803675475.png";
+    private String shop_desc = "管易云";
+    private String shop_logo = "http=//demo.jihainet.com/static/uploads/images/68/f6/1b/5cde803088e85.png";
+    private String shop_mobile = "18530801653";
+    private String shop_name = "管易云";
+    private String show_inviter = "";
+    private String statistics = "";
+    private Integer store_switch = 1;
+    private Integer tocash_money_low = 1;
+    private Integer tocash_money_rate = 1;
 }
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/home/Pages.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/home/Pages.java
index cbcba9d3a76a2461d4dc7e24e6602b5270d6045c..e73e52fe5ffe60fb91d11561aa0f2bd47d9457ba 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/home/Pages.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/home/Pages.java
@@ -8,15 +8,16 @@ import java.util.List;
 @Data
 public class Pages implements Serializable {
     private Integer id;
-    private String  code;
-    private String  name;
-    private String  desc;
-    private Integer  layout;
-    private Integer  type ;
+    private String code;
+    private String name;
+    private String desc;
+    private Integer layout;
+    private Integer type;
 
     private List<PagesItems> items;
 
-    public Pages(){}
+    public Pages() {
+    }
 
     public Pages(Integer id, String code, String name, String desc, Integer layout, Integer type, List<PagesItems> pagesItemsList) {
         this.id = id;
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/home/PagesItems.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/home/PagesItems.java
index 1e8c6244a614c4843350b499272ef42039cdc8ad..b556cfc104177fd6e1bbcecdd1de0665808e1736 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/home/PagesItems.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/home/PagesItems.java
@@ -5,18 +5,19 @@ import lombok.Data;
 import java.io.Serializable;
 
 @Data
-public class PagesItems  implements Serializable {
+public class PagesItems implements Serializable {
     private Integer id;
-    private String  widget_code;
-    private String  page_code;
-    private Integer  position_id;
-    private Integer  sort;
+    private String widget_code;
+    private String page_code;
+    private Integer position_id;
+    private Integer sort;
 
     private Params params;
 
-    public PagesItems(){
+    public PagesItems() {
 
     }
+
     public PagesItems(Integer id, String widget_code, String page_code, Integer position_id, Integer sort, Params params) {
         this.id = id;
         this.widget_code = widget_code;
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/home/Params.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/home/Params.java
index a38713757d193c55a5bd6e2ecf344e74180cb156..c3f20625389be029c7005b2ed8fc70087f5be150 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/home/Params.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/home/Params.java
@@ -7,33 +7,33 @@ import java.util.List;
 
 @Data
 public class Params implements Serializable {
- // 视频 video
-    private String  autoplay;
+    // 视频 video
+    private String autoplay;
 
     //搜索
-    private String  keywords;
-    private String  style; // imgWindow
+    private String keywords;
+    private String style; // imgWindow
 
     // goods
-    private String  title;
-    private Integer  limit ;
+    private String title;
+    private Integer limit;
 
-    private String  type;
-    private String  display; // 1 slide 2 list
-    private String  lookMore;
-    private Integer  classifyId ;
+    private String type;
+    private String display; // 1 slide 2 list
+    private String lookMore;
+    private Integer classifyId;
 
-    private Integer  brandId ;
-    private Integer  column ;
+    private Integer brandId;
+    private Integer column;
 
     // blank
-    private String  backgroundColor;
-    private Integer  height ;
+    private String backgroundColor;
+    private Integer height;
 
     // imgSlide
     private Integer duration;
     //imgWindow
-    private String  margin;
+    private String margin;
 
     //    articleClassify
     private Integer articleClassifyId;
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/home/ServiceMenu.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/home/ServiceMenu.java
index bd06d07969cf3b3f919b796e61bcb5c8424f85ce..7fad3c8ca0601a9b93b90b8f249987820f1decc3 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/home/ServiceMenu.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/home/ServiceMenu.java
@@ -12,7 +12,10 @@ public class ServiceMenu {
     private String pic;
     private String url;
     private String wapUrl;
-    public ServiceMenu(){}
+
+    public ServiceMenu() {
+    }
+
     public ServiceMenu(String name, String pic, String url, String wapUrl) {
         this.name = name;
         this.pic = pic;
diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/timeline/TimeSecound.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/timeline/TimeSecound.java
index bf89c713c3a14457297759a62d3ea9fc038a4dcd..89aa56b12822d261cb07e8079c99fb39c0572275 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/timeline/TimeSecound.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/vo/timeline/TimeSecound.java
@@ -10,7 +10,9 @@ public class TimeSecound implements Serializable {
     long hours;  //小时
     long mins;  //分钟
     long sc;  //秒
-    public TimeSecound(){}
+
+    public TimeSecound() {
+    }
 
     public TimeSecound(long days, long hours, long mins, long sc) {
         this.days = days;
diff --git a/mallplus-mbg/src/main/resources/mapper/oms/OmsOrderDao.xml b/mallplus-mbg/src/main/resources/mapper/oms/OmsOrderDao.xml
index 74b2a0077d9ef43c52ae23cba9627feb2342d970..477168288101023093b4d3c4ff7a1ab887fda1a6 100644
--- a/mallplus-mbg/src/main/resources/mapper/oms/OmsOrderDao.xml
+++ b/mallplus-mbg/src/main/resources/mapper/oms/OmsOrderDao.xml
@@ -206,12 +206,12 @@ WHERE MONTH(create_time) = MONTH(#{date})
         </foreach>
     </update>
 
-    <select id="listOrderGroupByMemberId"  resultType="com.zscat.mallplus.oms.vo.OrderStstic">
+    <select id="listOrderGroupByMemberId" resultType="com.zscat.mallplus.oms.vo.OrderStstic">
         select count(id) totalCount ,sum(pay_amount) totalPayAmount,member_id memberId from oms_order
         where  9>status group by member_id
     </select>
 
-    <select id="listByDate"  resultMap="BaseResultMap">
+    <select id="listByDate" resultMap="BaseResultMap">
         select pay_amount,status from oms_order where
         <if test="type==1">
             date_format(create_time,'%y%m%d') = date_format(#{date},'%y%m%d')
diff --git a/mallplus-mbg/src/main/resources/mapper/pms/PmsAlbumMapper.xml b/mallplus-mbg/src/main/resources/mapper/pms/PmsAlbumMapper.xml
index a108559ff9287fdaa95b2b72b8af1da62742e26c..6b8823f48234f0b8e4ad2931818436f19fb39e8a 100644
--- a/mallplus-mbg/src/main/resources/mapper/pms/PmsAlbumMapper.xml
+++ b/mallplus-mbg/src/main/resources/mapper/pms/PmsAlbumMapper.xml
@@ -14,5 +14,4 @@
     </resultMap>
 
 
-
 </mapper>
diff --git a/mallplus-mbg/src/main/resources/mapper/pms/PmsFavoriteMapper.xml b/mallplus-mbg/src/main/resources/mapper/pms/PmsFavoriteMapper.xml
index 0a10f78172f8ed3db723d7269ab84340f6cdb2e2..f7a80207321272d8b5a22c2a080392678dbfb518 100644
--- a/mallplus-mbg/src/main/resources/mapper/pms/PmsFavoriteMapper.xml
+++ b/mallplus-mbg/src/main/resources/mapper/pms/PmsFavoriteMapper.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zscat.mallplus.pms.mapper.PmsFavoriteMapper">
 
-        <!-- 通用查询映射结果 -->
-        <resultMap id="BaseResultMap" type="com.zscat.mallplus.pms.entity.PmsFavorite">
-                    <id column="id" property="id"/>
-                    <result column="addTime" property="addTime"/>
-                    <result column="type" property="type"/>
-                    <result column="obj_id" property="objId"/>
-                    <result column="store_id" property="storeId"/>
-                    <result column="user_id" property="userId"/>
-                    <result column="name" property="name"/>
-                    <result column="meno1" property="meno1"/>
-                    <result column="meno2" property="meno2"/>
-                    <result column="meno3" property="meno3"/>
-        </resultMap>
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.zscat.mallplus.pms.entity.PmsFavorite">
+        <id column="id" property="id"/>
+        <result column="addTime" property="addTime"/>
+        <result column="type" property="type"/>
+        <result column="obj_id" property="objId"/>
+        <result column="store_id" property="storeId"/>
+        <result column="user_id" property="userId"/>
+        <result column="name" property="name"/>
+        <result column="meno1" property="meno1"/>
+        <result column="meno2" property="meno2"/>
+        <result column="meno3" property="meno3"/>
+    </resultMap>
 
-        <!-- 通用查询结果列 -->
-        <sql id="Base_Column_List">
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
             id, addTime, type, obj_id, store_id, user_id, name, meno1, meno2, meno3
         </sql>
 
diff --git a/mallplus-mbg/src/main/resources/mapper/pms/PmsProductMapper.xml b/mallplus-mbg/src/main/resources/mapper/pms/PmsProductMapper.xml
index c4c1f3898cd8a64582bb9541af7588fb0db3f12b..4da3dee703f47122c76efdda44defef3e9bbb79f 100644
--- a/mallplus-mbg/src/main/resources/mapper/pms/PmsProductMapper.xml
+++ b/mallplus-mbg/src/main/resources/mapper/pms/PmsProductMapper.xml
@@ -131,7 +131,7 @@
         select * from cms_prefrence_area_product_relation where product_id=#{productId}
     </select>
 
-    <select id="listByDate"  resultMap="BaseResultMap">
+    <select id="listByDate" resultMap="BaseResultMap">
         select publish_status,stock from pms_product where
         <if test="type==1">
             date_format(create_time,'%y%m%d') = date_format(#{date},'%y%m%d')
@@ -209,7 +209,7 @@
         product_category_name, supply_id, create_time, school_id
     </sql>
 
-    <select id="countGoodsByToday"  resultType="java.lang.Integer">
+    <select id="countGoodsByToday" resultType="java.lang.Integer">
         select count(*) from pms_product where member_id = #{id}
         and DATE_FORMAT(create_time,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d')
 
diff --git a/mallplus-mbg/src/main/resources/mapper/sys/SysAdminLogMapper.xml b/mallplus-mbg/src/main/resources/mapper/sys/SysAdminLogMapper.xml
index 79ec5d26e3400955a28d6f97352c613f8068bdc5..8e3168930e475d58eb574d95bf068fd4f3b2314b 100644
--- a/mallplus-mbg/src/main/resources/mapper/sys/SysAdminLogMapper.xml
+++ b/mallplus-mbg/src/main/resources/mapper/sys/SysAdminLogMapper.xml
@@ -21,7 +21,7 @@
     </sql>
 
     <select id="getLogStatisc" resultType="com.zscat.mallplus.vo.LogStatisc">
-           SELECT method, count(1) count,
+        SELECT method, count(1) count,
         sum(time_min)/1000 as sum,
         sum(time_min)/count(1)/1000 avgMin ,
         sum(case when time_min>100 then time_min else 0 end)/1000 as sum1,
@@ -36,26 +36,26 @@
         sum(case when time_min>1000 then 1 else 0 end) as count4,
         sum(case when time_min>1500 then 1 else 0 end) as count5,
         sum(case when time_min>3000 then 1 else 0 end) as count6
-         from sys_admin_log  where 1=1
+        from sys_admin_log where 1=1
         <include refid="query_order_where"/>
-          group by method   order by avgMin desc
+        group by method order by avgMin desc
         limit 100
     </select>
 
 
     <sql id="query_order_where">
-            <if test="startTime != null and startTime !=''.toString()">
-                and  DATE_FORMAT(create_time,'%Y-%m-%d') >= DATE_FORMAT(#{startTime},'%Y-%m-%d')
+        <if test="startTime != null and startTime !=''.toString()">
+            and DATE_FORMAT(create_time,'%Y-%m-%d') >= DATE_FORMAT(#{startTime},'%Y-%m-%d')
 
-            </if>
-            <if test="endTime != null and endTime !=''.toString()">
-                and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(create_time,'%Y-%m-%d')
-            </if>
+        </if>
+        <if test="endTime != null and endTime !=''.toString()">
+            and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(create_time,'%Y-%m-%d')
+        </if>
 
 
-            <if test="keyword!=null and keyword !=''.toString()">
-                and method like concat('%',#{keyword},'%')
-            </if>
+        <if test="keyword!=null and keyword !=''.toString()">
+            and method like concat('%',#{keyword},'%')
+        </if>
 
     </sql>
 </mapper>
diff --git a/mallplus-mbg/src/main/resources/mapper/sys/SysDictMapper.xml b/mallplus-mbg/src/main/resources/mapper/sys/SysDictMapper.xml
index 0f18d070dc25266b59ee91cbe11f8351acc8cf7a..d23ff6e8a79452579d51a283ef4d2707cfb77419 100644
--- a/mallplus-mbg/src/main/resources/mapper/sys/SysDictMapper.xml
+++ b/mallplus-mbg/src/main/resources/mapper/sys/SysDictMapper.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zscat.mallplus.sys.mapper.SysDictMapper">
 
-        <!-- 通用查询映射结果 -->
-        <resultMap id="BaseResultMap" type="com.zscat.mallplus.sys.entity.SysDict">
-                    <id column="id" property="id"/>
-                    <result column="keyname" property="keyname"/>
-                    <result column="valuename" property="valuename"/>
-                    <result column="status" property="status"/>
-                    <result column="remark" property="remark"/>
-                    <result column="type" property="type"/>
-        </resultMap>
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.zscat.mallplus.sys.entity.SysDict">
+        <id column="id" property="id"/>
+        <result column="keyname" property="keyname"/>
+        <result column="valuename" property="valuename"/>
+        <result column="status" property="status"/>
+        <result column="remark" property="remark"/>
+        <result column="type" property="type"/>
+    </resultMap>
 
-        <!-- 通用查询结果列 -->
-        <sql id="Base_Column_List">
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
             id, keyname, valuename, status, remark, type
         </sql>
 
diff --git a/mallplus-mbg/src/main/resources/mapper/sys/SysWebLogMapper.xml b/mallplus-mbg/src/main/resources/mapper/sys/SysWebLogMapper.xml
index b4e896e624424f499aa61feb95186950fa34c9d4..a08228ba99c81b0152196089c657d38ac4dd2cb6 100644
--- a/mallplus-mbg/src/main/resources/mapper/sys/SysWebLogMapper.xml
+++ b/mallplus-mbg/src/main/resources/mapper/sys/SysWebLogMapper.xml
@@ -39,14 +39,14 @@
         from sys_web_log
         where 1=1
         <include refid="query_order_where"/>
-        group by method  order by avgMin desc
+        group by method order by avgMin desc
         limit 100
     </select>
 
 
     <sql id="query_order_where">
         <if test="startTime != null and startTime !=''.toString()">
-            and  DATE_FORMAT(create_time,'%Y-%m-%d') >= DATE_FORMAT(#{startTime},'%Y-%m-%d')
+            and DATE_FORMAT(create_time,'%Y-%m-%d') >= DATE_FORMAT(#{startTime},'%Y-%m-%d')
 
         </if>
         <if test="endTime != null and endTime !=''.toString()">
diff --git a/mallplus-mbg/src/main/resources/mapper/ums/SmsDao.xml b/mallplus-mbg/src/main/resources/mapper/ums/SmsDao.xml
index 86915274a0af662d0c4695af6366303966339870..6f2a2058b90a40a801617a02473331a5f703ebfb 100644
--- a/mallplus-mbg/src/main/resources/mapper/ums/SmsDao.xml
+++ b/mallplus-mbg/src/main/resources/mapper/ums/SmsDao.xml
@@ -40,12 +40,12 @@
     </sql>
     <select id="count" resultType="int">
         select count(*) from sys_sms t
-        <include refid="where" />
+        <include refid="where"/>
     </select>
 
     <select id="findList" resultType="com.zscat.mallplus.ums.entity.Sms">
         select * from sys_sms t
-        <include refid="where" />
+        <include refid="where"/>
         order by t.createTime desc
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/mallplus-mbg/src/main/resources/mapper/ums/SysAppletSetMapper.xml b/mallplus-mbg/src/main/resources/mapper/ums/SysAppletSetMapper.xml
index 426dbb2e5e2eef8ab856d26ee9a561eaca4053bb..6d435a639cd2f411c8f1b891f694203a62d5cb78 100644
--- a/mallplus-mbg/src/main/resources/mapper/ums/SysAppletSetMapper.xml
+++ b/mallplus-mbg/src/main/resources/mapper/ums/SysAppletSetMapper.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zscat.mallplus.ums.mapper.SysAppletSetMapper">
 
-        <!-- 通用查询映射结果 -->
-        <resultMap id="BaseResultMap" type="com.zscat.mallplus.ums.entity.SysAppletSet">
-                    <id column="store_id" property="storeId"/>
-                    <result column="appid" property="appid"/>
-                    <result column="appsecret" property="appsecret"/>
-                    <result column="mchid" property="mchid"/>
-                    <result column="paySignKey" property="paySignKey"/>
-                    <result column="certName" property="certName"/>
-                    <result column="notifyUrl" property="notifyUrl"/>
-                    <result column="templateId1" property="templateId1"/>
-                    <result column="templateId2" property="templateId2"/>
-                    <result column="templateId3" property="templateId3"/>
-                    <result column="templateId4" property="templateId4"/>
-                    <result column="templateId5" property="templateId5"/>
-                    <result column="templateId6" property="templateId6"/>
-        </resultMap>
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.zscat.mallplus.ums.entity.SysAppletSet">
+        <id column="store_id" property="storeId"/>
+        <result column="appid" property="appid"/>
+        <result column="appsecret" property="appsecret"/>
+        <result column="mchid" property="mchid"/>
+        <result column="paySignKey" property="paySignKey"/>
+        <result column="certName" property="certName"/>
+        <result column="notifyUrl" property="notifyUrl"/>
+        <result column="templateId1" property="templateId1"/>
+        <result column="templateId2" property="templateId2"/>
+        <result column="templateId3" property="templateId3"/>
+        <result column="templateId4" property="templateId4"/>
+        <result column="templateId5" property="templateId5"/>
+        <result column="templateId6" property="templateId6"/>
+    </resultMap>
 
-        <!-- 通用查询结果列 -->
-        <sql id="Base_Column_List">
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
             appid, appsecret, mchid, paySignKey, certName, notifyUrl, templateId1, templateId2, templateId3, templateId4, templateId5, templateId6, store_id
         </sql>
 
diff --git a/mallplus-mbg/src/main/resources/mapper/ums/UmsMemberMapper.xml b/mallplus-mbg/src/main/resources/mapper/ums/UmsMemberMapper.xml
index 4259f0600df6ce0faed5342eb0d213d5c9a04373..296002fa774139b17f33099981ccc20fbb11705a 100644
--- a/mallplus-mbg/src/main/resources/mapper/ums/UmsMemberMapper.xml
+++ b/mallplus-mbg/src/main/resources/mapper/ums/UmsMemberMapper.xml
@@ -37,7 +37,7 @@
         weixin_openid, invitecode, blance, school_id
     </sql>
 
-    <select id="listByDate"  resultMap="BaseResultMap">
+    <select id="listByDate" resultMap="BaseResultMap">
         select * from ums_member where
         <if test="type==1">
             date_format(create_time,'%y%m%d') = date_format(#{date},'%y%m%d')
diff --git a/mallplus-pay/.gitignore b/mallplus-pay/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..b00daed635f8aba6ffed7166123c73263a74aac8
--- /dev/null
+++ b/mallplus-pay/.gitignore
@@ -0,0 +1,2 @@
+# MyBatis generate files #
+src\main\resources\com\zscat\mall\mapper
\ No newline at end of file
diff --git a/mallplus-pay/libs/bcprov-jdk15on-1.54.jar b/mallplus-pay/libs/bcprov-jdk15on-1.54.jar
new file mode 100644
index 0000000000000000000000000000000000000000..bd95185ae8129aa3781f43bc09a194c7bd4121b1
Binary files /dev/null and b/mallplus-pay/libs/bcprov-jdk15on-1.54.jar differ
diff --git a/mallplus-pay/pom.xml b/mallplus-pay/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7127885947dfb755bdb0da15d71d5173f9fad9a8
--- /dev/null
+++ b/mallplus-pay/pom.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.zscat.mallplus</groupId>
+    <artifactId>mallplus-pay</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>mallplus-pay</name>
+    <description>mallplus-pay project for mall</description>
+    <properties>
+        <alipay.version>4.8.10.ALL</alipay.version>
+        <fastjson.version>1.2.62</fastjson.version>
+        <jdk.version>1.8</jdk.version>
+        <junit.version>4.12</junit.version>
+        <hutool.version>5.0.4</hutool.version>
+
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+    </properties>
+
+    <dependencies>
+
+        <!-- 全局单元测试 -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- huTool 工具包 -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-crypto</artifactId>
+            <version>${hutool.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-http</artifactId>
+            <version>${hutool.version}</version>
+        </dependency>
+        <!-- huTool 工具包 End -->
+        <dependency>
+            <groupId>com.alipay.sdk</groupId>
+            <artifactId>alipay-sdk-java</artifactId>
+            <version>${alipay.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>fastjson</artifactId>
+                    <groupId>com.alibaba</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>4.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>${fastjson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>4.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- 开源多维码生成工具 -->
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>3.4.0</version>
+        </dependency>
+        <!-- 开源多维码生成工具 -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.10</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.13</version>
+        </dependency>
+
+        <!-- 银联必须 -->
+        <dependency>
+            <groupId>com.unionpay</groupId>
+            <artifactId>unionpay-sdk-java</artifactId>
+            <version>1.54</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/libs/bcprov-jdk15on-1.54.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.13</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.28</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.28</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.9</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- 银联必须 -->
+    </dependencies>
+
+</project>
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/T.java b/mallplus-pay/src/main/java/com/zscat/mallplus/T.java
new file mode 100644
index 0000000000000000000000000000000000000000..ff4a1df7d766c0225c3ee85b717ab6790eb73e2f
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/T.java
@@ -0,0 +1,4 @@
+package com.zscat.mallplus;
+
+public class T {
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/alipay/AliPayApi.java b/mallplus-pay/src/main/java/com/zscat/mallplus/alipay/AliPayApi.java
new file mode 100644
index 0000000000000000000000000000000000000000..0dcc67778cf808fda29c4c3016d4002db96a530f
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/alipay/AliPayApi.java
@@ -0,0 +1,884 @@
+package com.zscat.mallplus.alipay;
+
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.domain.*;
+import com.alipay.api.request.*;
+import com.alipay.api.response.*;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>支付宝支付相关接口</p>
+ *
+ * @author Javen
+ */
+@Slf4j
+public class AliPayApi {
+
+    /**
+     * 支付宝提供给商户的服务接入网关URL(新)
+     */
+    private static final String GATEWAY_NEW = "https://mapi.alipay.com/gateway.do?";
+
+    /**
+     * APP支付
+     *
+     * @param model     {@link AlipayTradeAppPayModel}
+     * @param notifyUrl 异步通知 URL
+     * @return {@link AlipayTradeAppPayResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayTradeAppPayResponse appPayToResponse(AlipayTradeAppPayModel model, String notifyUrl,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
+        request.setBizModel(model);
+        request.setNotifyUrl(notifyUrl);
+        return aliPayApiConfig.getAliPayClient().sdkExecute(request);
+    }
+
+    /**
+     * WAP支付
+     *
+     * @param response  {@link HttpServletResponse}
+     * @param model     {@link AlipayTradeWapPayModel}
+     * @param returnUrl 异步通知URL
+     * @param notifyUrl 同步通知URL
+     * @throws AlipayApiException 支付宝 Api 异常
+     * @throws IOException        IO 异常
+     */
+    public static void wapPay(HttpServletResponse response, AlipayTradeWapPayModel model, String returnUrl, String notifyUrl,AliPayApiConfig aliPayApiConfig) throws AlipayApiException, IOException {
+        String form = wapPayStr(model, returnUrl, notifyUrl,aliPayApiConfig);
+        response.setContentType("text/html;charset=" + aliPayApiConfig.getCharset());
+        PrintWriter out = response.getWriter();
+        log.info(returnUrl);
+        log.info(form);
+        out.write(form);
+        out.flush();
+        out.close();
+    }
+
+    /**
+     * <p>WAP支付</p>
+     *
+     * <p>为了解决 Filter 中使用 OutputStream getOutputStream() 和 PrintWriter getWriter() 冲突异常问题</p>
+     *
+     * @param response  {@link HttpServletResponse}
+     * @param model     {@link AlipayTradeWapPayModel}
+     * @param returnUrl 异步通知URL
+     * @param notifyUrl 同步通知URL
+     * @throws AlipayApiException 支付宝 Api 异常
+     * @throws IOException        IO 异常
+     */
+    public static void wapPayByOutputStream(HttpServletResponse response, AlipayTradeWapPayModel model, String returnUrl, String notifyUrl,AliPayApiConfig aliPayApiConfig) throws AlipayApiException, IOException {
+        String form = wapPayStr(model, returnUrl, notifyUrl,aliPayApiConfig);
+        log.info(form);
+        response.setContentType("text/html;charset=" + aliPayApiConfig.getCharset());
+        OutputStream out = response.getOutputStream();
+        out.write(form.getBytes(aliPayApiConfig.getCharset()));
+        response.getOutputStream().flush();
+    }
+
+
+    /**
+     * WAP支付
+     *
+     * @param model     {@link AlipayTradeWapPayModel}
+     * @param returnUrl 异步通知URL
+     * @param notifyUrl 同步通知URL
+     * @return {String}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static String wapPayStr(AlipayTradeWapPayModel model, String returnUrl, String notifyUrl,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayTradeWapPayRequest aliPayRequest = new AlipayTradeWapPayRequest();
+        aliPayRequest.setReturnUrl(returnUrl);
+        aliPayRequest.setNotifyUrl(notifyUrl);
+        aliPayRequest.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().pageExecute(aliPayRequest).getBody();
+    }
+
+    /**
+     * 统一收单交易支付接口接口 <br>
+     * 适用于:条形码支付、声波支付等 <br>
+     *
+     * @param model     {@link AlipayTradePayModel}
+     * @param notifyUrl 异步通知URL
+     * @return {@link AlipayTradePayResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayTradePayResponse tradePayToResponse(AlipayTradePayModel model, String notifyUrl,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayTradePayRequest request = new AlipayTradePayRequest();
+        // 填充业务参数
+        request.setBizModel(model);
+        request.setNotifyUrl(notifyUrl);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 统一收单交易支付接口接口 <br>
+     * 适用于:条形码支付、声波支付等 <br>
+     *
+     * @param model        {AlipayTradePayModel}
+     * @param notifyUrl    异步通知URL
+     * @param appAuthToken 应用授权token
+     * @return {AlipayTradePayResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayTradePayResponse tradePayToResponse(AlipayTradePayModel model, String notifyUrl, String appAuthToken,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayTradePayRequest request = new AlipayTradePayRequest();
+        request.setBizModel(model);
+        request.setNotifyUrl(notifyUrl);
+        return aliPayApiConfig.getAliPayClient().execute(request, null, appAuthToken);
+    }
+
+    /**
+     * 统一收单线下交易预创建 <br>
+     * 适用于：扫码支付等 <br>
+     *
+     * @param model     {@link AlipayTradePrecreateModel}
+     * @param notifyUrl 异步通知URL
+     * @return {@link AlipayTradePrecreateResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayTradePrecreateResponse tradePrecreatePayToResponse(AlipayTradePrecreateModel model, String notifyUrl,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayTradePrecreateRequest request = new AlipayTradePrecreateRequest();
+        request.setBizModel(model);
+        request.setNotifyUrl(notifyUrl);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 统一收单线下交易预创建 <br>
+     * 适用于：扫码支付等 <br>
+     *
+     * @param model        {@link AlipayTradePrecreateModel}
+     * @param notifyUrl    异步通知URL
+     * @param appAuthToken 应用授权token
+     * @return {@link AlipayTradePrecreateResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayTradePrecreateResponse tradePrecreatePayToResponse(AlipayTradePrecreateModel model,
+                                                                           String notifyUrl, String appAuthToken,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayTradePrecreateRequest request = new AlipayTradePrecreateRequest();
+        request.setBizModel(model);
+        request.setNotifyUrl(notifyUrl);
+        return aliPayApiConfig.getAliPayClient().execute(request, null, appAuthToken);
+    }
+
+    /**
+     * 单笔转账到支付宝账户
+     *
+     * @param model {@link AlipayFundTransToaccountTransferModel}
+     * @return 转账是否成功
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static boolean transfer(AlipayFundTransToaccountTransferModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayFundTransToaccountTransferResponse response = transferToResponse(model,aliPayApiConfig);
+        String result = response.getBody();
+        if (response.isSuccess()) {
+            return true;
+        } else {
+            // 调用查询接口查询数据
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            String outBizNo = jsonObject.getJSONObject("alipay_fund_trans_toaccount_transfer_response").getString("out_biz_no");
+            AlipayFundTransOrderQueryModel queryModel = new AlipayFundTransOrderQueryModel();
+            model.setOutBizNo(outBizNo);
+            return transferQuery(queryModel,aliPayApiConfig);
+        }
+    }
+
+    /**
+     * 单笔转账到支付宝账户
+     *
+     * @param model {@link AlipayFundTransToaccountTransferModel}
+     * @return {@link AlipayFundTransToaccountTransferResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayFundTransToaccountTransferResponse transferToResponse(AlipayFundTransToaccountTransferModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayFundTransToaccountTransferRequest request = new AlipayFundTransToaccountTransferRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 转账查询接口
+     *
+     * @param model {@link AlipayFundTransOrderQueryModel}
+     * @return 是否存在此
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static boolean transferQuery(AlipayFundTransOrderQueryModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayFundTransOrderQueryResponse response = transferQueryToResponse(model,aliPayApiConfig);
+        return response.isSuccess();
+    }
+
+    /**
+     * 转账查询接口
+     *
+     * @param model {@link AlipayFundTransOrderQueryModel}
+     * @return {@link AlipayFundTransOrderQueryResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayFundTransOrderQueryResponse transferQueryToResponse(AlipayFundTransOrderQueryModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayFundTransOrderQueryRequest request = new AlipayFundTransOrderQueryRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 统一收单线下交易查询接口
+     *
+     * @param model {@link AlipayTradeQueryModel}
+     * @return {@link AlipayTradeQueryResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayTradeQueryResponse tradeQueryToResponse(AlipayTradeQueryModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 统一收单线下交易查询接口
+     *
+     * @param model        {@link AlipayTradeQueryModel}
+     * @param appAuthToken 应用授权token
+     * @return {@link AlipayTradeQueryResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayTradeQueryResponse tradeQueryToResponse(AlipayTradeQueryModel model, String appAuthToken,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request, null, appAuthToken);
+    }
+
+    /**
+     * 统一收单交易撤销接口
+     *
+     * @param model        {@link AlipayTradeCancelModel}
+     * @param appAuthToken 应用授权token
+     * @return {@link AlipayTradeCancelResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayTradeCancelResponse tradeCancelToResponse(AlipayTradeCancelModel model, String appAuthToken,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayTradeCancelRequest request = new AlipayTradeCancelRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request, null, appAuthToken);
+    }
+
+    /**
+     * 统一收单交易撤销接口
+     *
+     * @param model {@link AlipayTradeCancelModel}
+     * @return {@link AlipayTradeCancelResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayTradeCancelResponse tradeCancelToResponse(AlipayTradeCancelModel model,AliPayApiConfig aliPayApiConfig)
+            throws AlipayApiException {
+        AlipayTradeCancelRequest request = new AlipayTradeCancelRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 统一收单交易关闭接口
+     *
+     * @param model        {@link AlipayTradeCloseModel}
+     * @param appAuthToken 应用授权token
+     * @return {@link AlipayTradeCloseResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayTradeCloseResponse tradeCloseToResponse(AlipayTradeCloseModel model, String appAuthToken,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayTradeCloseRequest request = new AlipayTradeCloseRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request, null, appAuthToken);
+
+    }
+
+    /**
+     * 统一收单交易关闭接口
+     *
+     * @param model {@link AlipayTradeCloseModel}
+     * @return {@link AlipayTradeCloseResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayTradeCloseResponse tradeCloseToResponse(AlipayTradeCloseModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayTradeCloseRequest request = new AlipayTradeCloseRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 统一收单交易创建接口
+     *
+     * @param model     {@link AlipayTradeCreateModel}
+     * @param notifyUrl 异步通知URL
+     * @return {@link AlipayTradeCreateResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayTradeCreateResponse tradeCreateToResponse(AlipayTradeCreateModel model, String notifyUrl,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayTradeCreateRequest request = new AlipayTradeCreateRequest();
+        request.setBizModel(model);
+        request.setNotifyUrl(notifyUrl);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 统一收单交易创建接口
+     *
+     * @param model        {@link AlipayTradeCreateModel}
+     * @param notifyUrl    异步通知URL
+     * @param appAuthToken 应用授权token
+     * @return {@link AlipayTradeCreateResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayTradeCreateResponse tradeCreateToResponse(AlipayTradeCreateModel model, String notifyUrl, String appAuthToken,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayTradeCreateRequest request = new AlipayTradeCreateRequest();
+        request.setBizModel(model);
+        request.setNotifyUrl(notifyUrl);
+        return aliPayApiConfig.getAliPayClient().execute(request, null, appAuthToken);
+    }
+
+    /**
+     * 统一收单交易退款接口
+     *
+     * @param model {@link AlipayTradeRefundModel}
+     * @return {@link AlipayTradeRefundResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayTradeRefundResponse tradeRefundToResponse(AlipayTradeRefundModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayTradeRefundRequest request = new AlipayTradeRefundRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 统一收单交易退款接口
+     *
+     * @param model        {@link AlipayTradeRefundModel}
+     * @param appAuthToken 应用授权token
+     * @return {@link AlipayTradeRefundResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayTradeRefundResponse tradeRefundToResponse(AlipayTradeRefundModel model, String appAuthToken,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayTradeRefundRequest request = new AlipayTradeRefundRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request, null, appAuthToken);
+    }
+
+    /**
+     * 统一收单交易退款查询
+     *
+     * @param model {@link AlipayTradeFastpayRefundQueryModel}
+     * @return {@link AlipayTradeFastpayRefundQueryResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayTradeFastpayRefundQueryResponse tradeRefundQueryToResponse(AlipayTradeFastpayRefundQueryModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayTradeFastpayRefundQueryRequest request = new AlipayTradeFastpayRefundQueryRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 统一收单交易退款查询
+     *
+     * @param model        {@link AlipayTradeFastpayRefundQueryModel}
+     * @param appAuthToken 应用授权token
+     * @return {@link AlipayTradeFastpayRefundQueryResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayTradeFastpayRefundQueryResponse tradeRefundQueryToResponse(AlipayTradeFastpayRefundQueryModel model, String appAuthToken,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayTradeFastpayRefundQueryRequest request = new AlipayTradeFastpayRefundQueryRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request, null, appAuthToken);
+    }
+
+    /**
+     * 查询对账单下载地址
+     *
+     * @param model {@link AlipayDataDataserviceBillDownloadurlQueryModel}
+     * @return 对账单下载地址
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static String billDownloadurlQuery(AlipayDataDataserviceBillDownloadurlQueryModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayDataDataserviceBillDownloadurlQueryResponse response = billDownloadUrlQueryToResponse(model,aliPayApiConfig);
+        return response.getBillDownloadUrl();
+    }
+
+    /**
+     * 查询对账单下载地址
+     *
+     * @param model {@link AlipayDataDataserviceBillDownloadurlQueryModel}
+     * @return {@link AlipayDataDataserviceBillDownloadurlQueryResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayDataDataserviceBillDownloadurlQueryResponse billDownloadUrlQueryToResponse(AlipayDataDataserviceBillDownloadurlQueryModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayDataDataserviceBillDownloadurlQueryRequest request = new AlipayDataDataserviceBillDownloadurlQueryRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 统一收单交易结算接口
+     *
+     * @param model        {@link AlipayTradeOrderSettleModel}
+     * @param appAuthToken 应用授权token
+     * @return {@link AlipayTradeOrderSettleResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayTradeOrderSettleResponse tradeOrderSettleToResponse(AlipayTradeOrderSettleModel model, String appAuthToken,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayTradeOrderSettleRequest request = new AlipayTradeOrderSettleRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request, null, appAuthToken);
+    }
+
+    /**
+     * 统一收单交易结算接口
+     *
+     * @param model {@link AlipayTradeOrderSettleModel}
+     * @return {@link AlipayTradeOrderSettleResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayTradeOrderSettleResponse tradeOrderSettleToResponse(AlipayTradeOrderSettleModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayTradeOrderSettleRequest request = new AlipayTradeOrderSettleRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 电脑网站支付(PC支付)
+     *
+     * @param response  {@link HttpServletResponse}
+     * @param model     {@link AlipayTradePagePayModel}
+     * @param notifyUrl 异步通知URL
+     * @param returnUrl 同步通知URL
+     * @throws AlipayApiException 支付宝 Api 异常
+     * @throws IOException        IO 异常
+     */
+    public static void tradePage(HttpServletResponse response, AlipayTradePagePayModel model, String notifyUrl, String returnUrl,AliPayApiConfig aliPayApiConfig) throws AlipayApiException, IOException {
+        AlipayTradePagePayRequest request = new AlipayTradePagePayRequest();
+        request.setBizModel(model);
+        request.setNotifyUrl(notifyUrl);
+        request.setReturnUrl(returnUrl);
+        String form = aliPayApiConfig.getAliPayClient().pageExecute(request).getBody();// 调用SDK生成表单
+        log.info(returnUrl);
+        log.info(form);
+        response.setContentType("text/html;charset=" + aliPayApiConfig.getCharset());
+        PrintWriter out = response.getWriter();
+        out.write(form);
+        out.flush();
+        out.close();
+    }
+
+    /**
+     * 电脑网站支付(PC支付)
+     *
+     * @param response  {@link HttpServletResponse}
+     * @param model     {@link AlipayTradePagePayModel}
+     * @param notifyUrl 异步通知URL
+     * @param returnUrl 同步通知URL
+     * @throws AlipayApiException 支付宝 Api 异常
+     * @throws IOException        IO 异常
+     */
+    public static void tradePageByOutputStream(HttpServletResponse response, AlipayTradePagePayModel model, String notifyUrl, String returnUrl,AliPayApiConfig aliPayApiConfig) throws AlipayApiException, IOException {
+        AlipayTradePagePayRequest request = new AlipayTradePagePayRequest();
+        request.setBizModel(model);
+        request.setNotifyUrl(notifyUrl);
+        request.setReturnUrl(returnUrl);
+        String form = aliPayApiConfig.getAliPayClient().pageExecute(request).getBody();// 调用SDK生成表单
+        response.setContentType("text/html;charset=" + aliPayApiConfig.getCharset());
+        OutputStream out = response.getOutputStream();
+        out.write(form.getBytes(aliPayApiConfig.getCharset()));
+        response.getOutputStream().flush();
+    }
+
+    /**
+     * 资金预授权冻结接口
+     *
+     * @param model {@link AlipayFundAuthOrderFreezeModel}
+     * @return {@link AlipayFundAuthOrderFreezeResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayFundAuthOrderFreezeResponse authOrderFreezeToResponse(AlipayFundAuthOrderFreezeModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayFundAuthOrderFreezeRequest request = new AlipayFundAuthOrderFreezeRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 资金授权解冻接口
+     *
+     * @param model {@link AlipayFundAuthOrderUnfreezeModel}
+     * @return {@link AlipayFundAuthOrderUnfreezeResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayFundAuthOrderUnfreezeResponse authOrderUnfreezeToResponse(AlipayFundAuthOrderUnfreezeModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayFundAuthOrderUnfreezeRequest request = new AlipayFundAuthOrderUnfreezeRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 资金预授权冻结接口
+     *
+     * @param model {@link AlipayFundAuthOrderVoucherCreateModel}
+     * @return {@link AlipayFundAuthOrderVoucherCreateResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayFundAuthOrderVoucherCreateResponse authOrderVoucherCreateToResponse(AlipayFundAuthOrderVoucherCreateModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayFundAuthOrderVoucherCreateRequest request = new AlipayFundAuthOrderVoucherCreateRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 资金授权撤销接口
+     *
+     * @param model {@link AlipayFundAuthOperationCancelModel}
+     * @return {@link AlipayFundAuthOperationCancelResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayFundAuthOperationCancelResponse authOperationCancelToResponse(AlipayFundAuthOperationCancelModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayFundAuthOperationCancelRequest request = new AlipayFundAuthOperationCancelRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 资金授权操作查询接口
+     *
+     * @param model {@link AlipayFundAuthOperationDetailQueryModel}
+     * @return {@link AlipayFundAuthOperationDetailQueryResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayFundAuthOperationDetailQueryResponse authOperationDetailQueryToResponse(AlipayFundAuthOperationDetailQueryModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayFundAuthOperationDetailQueryRequest request = new AlipayFundAuthOperationDetailQueryRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 红包无线支付接口
+     *
+     * @param model {@link AlipayFundCouponOrderAppPayModel}
+     * @return {@link AlipayFundCouponOrderAppPayResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayFundCouponOrderAppPayResponse fundCouponOrderAppPayToResponse(AlipayFundCouponOrderAppPayModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayFundCouponOrderAppPayRequest request = new AlipayFundCouponOrderAppPayRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 红包页面支付接口
+     *
+     * @param model {@link AlipayFundCouponOrderPagePayModel}
+     * @return {@link AlipayFundCouponOrderPagePayResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayFundCouponOrderPagePayResponse fundCouponOrderPagePayToResponse(AlipayFundCouponOrderPagePayModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayFundCouponOrderPagePayRequest request = new AlipayFundCouponOrderPagePayRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 红包协议支付接口
+     *
+     * @param model {@link AlipayFundCouponOrderAgreementPayModel}
+     * @return {@link AlipayFundCouponOrderAgreementPayResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayFundCouponOrderAgreementPayResponse fundCouponOrderAgreementPayToResponse(AlipayFundCouponOrderAgreementPayModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayFundCouponOrderAgreementPayRequest request = new AlipayFundCouponOrderAgreementPayRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 红包打款接口
+     *
+     * @param model {@link AlipayFundCouponOrderDisburseModel}
+     * @return {@link AlipayFundCouponOrderDisburseResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayFundCouponOrderDisburseResponse fundCouponOrderDisburseToResponse(AlipayFundCouponOrderDisburseModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayFundCouponOrderDisburseRequest request = new AlipayFundCouponOrderDisburseRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 红包退回接口
+     *
+     * @param model {@link AlipayFundCouponOrderRefundModel}
+     * @return {@link AlipayFundCouponOrderRefundResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayFundCouponOrderRefundResponse fundCouponOrderRefundToResponse(AlipayFundCouponOrderRefundModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayFundCouponOrderRefundRequest request = new AlipayFundCouponOrderRefundRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 红包退回接口
+     *
+     * @param model {@link AlipayFundCouponOperationQueryModel}
+     * @return {@link AlipayFundCouponOperationQueryResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayFundCouponOperationQueryResponse fundCouponOperationQueryToResponse(AlipayFundCouponOperationQueryModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayFundCouponOperationQueryRequest request = new AlipayFundCouponOperationQueryRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 应用授权 URL 拼装
+     *
+     * @param appId       应用编号
+     * @param redirectUri 回调 URI
+     * @return 应用授权 URL
+     * @throws UnsupportedEncodingException 编码异常
+     */
+    public static String getOauth2Url(String appId, String redirectUri) throws UnsupportedEncodingException {
+        return new StringBuffer().append("https://openauth.alipay.com/oauth2/appToAppAuth.htm?app_id=").append(appId).append("&redirect_uri=").append(URLEncoder.encode(redirectUri, "UTF-8")).toString();
+    }
+
+    /**
+     * 使用 app_auth_code 换取 app_auth_token
+     *
+     * @param model {@link AlipayOpenAuthTokenAppModel}
+     * @return {@link AlipayOpenAuthTokenAppResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayOpenAuthTokenAppResponse openAuthTokenAppToResponse(AlipayOpenAuthTokenAppModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayOpenAuthTokenAppRequest request = new AlipayOpenAuthTokenAppRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 查询授权信息
+     *
+     * @param model {@link AlipayOpenAuthTokenAppQueryModel}
+     * @return {@link AlipayOpenAuthTokenAppQueryResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayOpenAuthTokenAppQueryResponse openAuthTokenAppQueryToResponse(AlipayOpenAuthTokenAppQueryModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayOpenAuthTokenAppQueryRequest request = new AlipayOpenAuthTokenAppQueryRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 地铁购票发码
+     *
+     * @param model {@link AlipayCommerceCityfacilitatorVoucherGenerateModel}
+     * @return {@link AlipayCommerceCityfacilitatorVoucherGenerateResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayCommerceCityfacilitatorVoucherGenerateResponse voucherGenerateToResponse(AlipayCommerceCityfacilitatorVoucherGenerateModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayCommerceCityfacilitatorVoucherGenerateRequest request = new AlipayCommerceCityfacilitatorVoucherGenerateRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 地铁购票发码退款
+     *
+     * @param model {@link AlipayCommerceCityfacilitatorVoucherRefundModel}
+     * @return {@link AlipayCommerceCityfacilitatorVoucherRefundResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayCommerceCityfacilitatorVoucherRefundResponse metroRefundToResponse(AlipayCommerceCityfacilitatorVoucherRefundModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayCommerceCityfacilitatorVoucherRefundRequest request = new AlipayCommerceCityfacilitatorVoucherRefundRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 地铁车站数据查询
+     *
+     * @param model {@link AlipayCommerceCityfacilitatorStationQueryModel}
+     * @return {@link AlipayCommerceCityfacilitatorStationQueryResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayCommerceCityfacilitatorStationQueryResponse stationQueryToResponse(AlipayCommerceCityfacilitatorStationQueryModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayCommerceCityfacilitatorStationQueryRequest request = new AlipayCommerceCityfacilitatorStationQueryRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 核销码批量查询
+     *
+     * @param model {@link AlipayCommerceCityfacilitatorVoucherBatchqueryModel}
+     * @return {@link AlipayCommerceCityfacilitatorVoucherBatchqueryResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayCommerceCityfacilitatorVoucherBatchqueryResponse voucherBatchqueryToResponse(AlipayCommerceCityfacilitatorVoucherBatchqueryModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayCommerceCityfacilitatorVoucherBatchqueryRequest request = new AlipayCommerceCityfacilitatorVoucherBatchqueryRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    public static void batchTrans(Map<String, String> params, String privateKey, String signType, HttpServletResponse response) throws IOException {
+        params.put("service", "batch_trans_notify");
+        params.put("_input_charset", "UTF-8");
+        params.put("pay_date", DateUtil.format(new Date(), "YYYYMMDD"));
+        Map<String, String> param = AliPayCore.buildRequestPara(params, privateKey, signType);
+        response.sendRedirect(GATEWAY_NEW.concat(AliPayCore.createLinkString(param)));
+    }
+
+    /**
+     * 将异步通知的参数转化为Map
+     *
+     * @param request {HttpServletRequest}
+     * @return 转化后的Map
+     */
+    public static Map<String, String> toMap(HttpServletRequest request) {
+        Map<String, String> params = new HashMap<String, String>();
+        Map<String, String[]> requestParams = request.getParameterMap();
+        for (Iterator<String> iter = requestParams.keySet().iterator(); iter.hasNext(); ) {
+            String name = iter.next();
+            String[] values = requestParams.get(name);
+            String valueStr = "";
+            for (int i = 0; i < values.length; i++) {
+                valueStr = (i == values.length - 1) ? valueStr + values[i] : valueStr + values[i] + ",";
+            }
+            // 乱码解决，这段代码在出现乱码时使用
+            // valueStr = new String(valueStr.getBytes("ISO-8859-1"), "utf-8");
+            params.put(name, valueStr);
+        }
+        return params;
+    }
+
+    /**
+     * 生活缴费查询账单
+     *
+     * @param orderType       支付宝订单类型
+     * @param merchantOrderNo 业务流水号
+     * @return {@link AlipayEbppBillGetResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static AlipayEbppBillGetResponse ebppBillGet(String orderType, String merchantOrderNo,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        AlipayEbppBillGetRequest request = new AlipayEbppBillGetRequest();
+        request.setOrderType(orderType);
+        request.setMerchantOrderNo(merchantOrderNo);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * H5刷脸认证初始化
+     *
+     * @param model {@link ZolozIdentificationUserWebInitializeModel}
+     * @return {@link ZolozIdentificationUserWebInitializeResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static ZolozIdentificationUserWebInitializeResponse identificationUserWebInitialize(ZolozIdentificationUserWebInitializeModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        ZolozIdentificationUserWebInitializeRequest request = new ZolozIdentificationUserWebInitializeRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * H5刷脸认证查询
+     *
+     * @param model {@link ZolozIdentificationUserWebQueryModel}
+     * @return {@link ZolozIdentificationUserWebQueryResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static ZolozIdentificationUserWebQueryResponse identificationUserWebInitialize(ZolozIdentificationUserWebQueryModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        ZolozIdentificationUserWebQueryRequest request = new ZolozIdentificationUserWebQueryRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 热脸入库
+     *
+     * @param model {@link ZolozAuthenticationCustomerFacemanageCreateModel}
+     * @return {@link ZolozAuthenticationCustomerFacemanageCreateResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static ZolozAuthenticationCustomerFacemanageCreateResponse authenticationCustomerFaceManageCreate(ZolozAuthenticationCustomerFacemanageCreateModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        ZolozAuthenticationCustomerFacemanageCreateRequest request = new ZolozAuthenticationCustomerFacemanageCreateRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 热脸出库
+     *
+     * @param model {@link ZolozAuthenticationCustomerFacemanageDeleteModel}
+     * @return {@link ZolozAuthenticationCustomerFacemanageDeleteResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static ZolozAuthenticationCustomerFacemanageDeleteResponse authenticationCustomerFaceManageDelete(ZolozAuthenticationCustomerFacemanageDeleteModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        ZolozAuthenticationCustomerFacemanageDeleteRequest request = new ZolozAuthenticationCustomerFacemanageDeleteRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 人脸 ftoken 查询消费接口
+     *
+     * @param model {@link ZolozAuthenticationCustomerFtokenQueryModel}
+     * @return {@link ZolozAuthenticationCustomerFtokenQueryResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static ZolozAuthenticationCustomerFtokenQueryResponse authenticationCustomerFTokenQuery(ZolozAuthenticationCustomerFtokenQueryModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        ZolozAuthenticationCustomerFtokenQueryRequest request = new ZolozAuthenticationCustomerFtokenQueryRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 人脸初始化刷脸付
+     *
+     * @param model {@link ZolozAuthenticationSmilepayInitializeModel}
+     * @return {@link ZolozAuthenticationSmilepayInitializeResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static ZolozAuthenticationSmilepayInitializeResponse authenticationSmilePayInitialize(ZolozAuthenticationSmilepayInitializeModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        ZolozAuthenticationSmilepayInitializeRequest request = new ZolozAuthenticationSmilepayInitializeRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+    /**
+     * 人脸初始化唤起zim
+     *
+     * @param model {@link ZolozAuthenticationCustomerSmilepayInitializeModel}
+     * @return {@link ZolozAuthenticationCustomerSmilepayInitializeResponse}
+     * @throws AlipayApiException 支付宝 Api 异常
+     */
+    public static ZolozAuthenticationCustomerSmilepayInitializeResponse authenticationCustomerSmilePayInitialize(ZolozAuthenticationCustomerSmilepayInitializeModel model,AliPayApiConfig aliPayApiConfig) throws AlipayApiException {
+        ZolozAuthenticationCustomerSmilepayInitializeRequest request = new ZolozAuthenticationCustomerSmilepayInitializeRequest();
+        request.setBizModel(model);
+        return aliPayApiConfig.getAliPayClient().execute(request);
+    }
+
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/alipay/AliPayApiConfig.java b/mallplus-pay/src/main/java/com/zscat/mallplus/alipay/AliPayApiConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..378561db775bc403fa55a54e8bbce1e6a458afb9
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/alipay/AliPayApiConfig.java
@@ -0,0 +1,209 @@
+package com.zscat.mallplus.alipay;
+
+import cn.hutool.core.util.StrUtil;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.CertAlipayRequest;
+import com.alipay.api.DefaultAlipayClient;
+
+import java.io.Serializable;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>支付宝支付配置</p>
+ *
+ * @author Javen
+ */
+public class AliPayApiConfig implements Serializable {
+    private static final long serialVersionUID = -4736760736935998953L;
+
+    private String privateKey;
+    private String aliPayPublicKey;
+    private String appId;
+    private String serviceUrl;
+    private String charset;
+    private String signType;
+    private String format;
+    private String appCertPath;
+    private String aliPayCertPath;
+    private String aliPayRootCertPath;
+    private AlipayClient alipayClient;
+
+    private AliPayApiConfig() {
+    }
+
+    public static AliPayApiConfig builder() {
+        return new AliPayApiConfig();
+    }
+
+    public AliPayApiConfig build() {
+        this.alipayClient = new DefaultAlipayClient(getServiceUrl(), getAppId(), getPrivateKey(), getFormat(),
+                getCharset(), getAliPayPublicKey(), getSignType());
+        return this;
+    }
+
+    public AliPayApiConfig buildByCert() throws AlipayApiException {
+        return build(getAppCertPath(), getAliPayCertPath(), getAliPayRootCertPath());
+    }
+
+    /**
+     * @param appCertPath        应用公钥证书路径
+     * @param aliPayCertPath     支付宝公钥证书文件路径
+     * @param aliPayRootCertPath 支付宝CA根证书文件路径
+     * @return {@link AliPayApiConfig}  支付宝支付配置
+     * @throws AlipayApiException
+     */
+    public AliPayApiConfig build(String appCertPath, String aliPayCertPath, String aliPayRootCertPath) throws AlipayApiException {
+        CertAlipayRequest certAlipayRequest = new CertAlipayRequest();
+        certAlipayRequest.setServerUrl(getServiceUrl());
+        certAlipayRequest.setAppId(getAppId());
+        certAlipayRequest.setPrivateKey(getPrivateKey());
+        certAlipayRequest.setFormat(getFormat());
+        certAlipayRequest.setCharset(getCharset());
+        certAlipayRequest.setSignType(getSignType());
+        certAlipayRequest.setCertPath(appCertPath);
+        certAlipayRequest.setAlipayPublicCertPath(aliPayCertPath);
+        certAlipayRequest.setRootCertPath(aliPayRootCertPath);
+        this.alipayClient = new DefaultAlipayClient(certAlipayRequest);
+        return this;
+    }
+
+    public String getPrivateKey() {
+        if (StrUtil.isBlank(privateKey)) {
+            throw new IllegalStateException("privateKey 未被赋值");
+        }
+        return privateKey;
+    }
+
+    public AliPayApiConfig setPrivateKey(String privateKey) {
+        if (StrUtil.isEmpty(privateKey)) {
+            throw new IllegalArgumentException("privateKey 值不能为 null");
+        }
+        this.privateKey = privateKey;
+        return this;
+    }
+
+    public String getAliPayPublicKey() {
+        if (StrUtil.isEmpty(aliPayPublicKey)) {
+            throw new IllegalStateException("aliPayPublicKey 未被赋值");
+        }
+        return aliPayPublicKey;
+    }
+
+    public AliPayApiConfig setAliPayPublicKey(String aliPayPublicKey) {
+        if (StrUtil.isEmpty(aliPayPublicKey)) {
+            throw new IllegalArgumentException("aliPayPublicKey 值不能为 null");
+        }
+        this.aliPayPublicKey = aliPayPublicKey;
+        return this;
+    }
+
+    public String getAppId() {
+        if (StrUtil.isEmpty(appId)) {
+            throw new IllegalStateException("appId 未被赋值");
+        }
+        return appId;
+    }
+
+    public AliPayApiConfig setAppId(String appId) {
+        if (StrUtil.isEmpty(appId)) {
+            throw new IllegalArgumentException("appId 值不能为 null");
+        }
+        this.appId = appId;
+        return this;
+    }
+
+    public String getServiceUrl() {
+        if (StrUtil.isEmpty(serviceUrl)) {
+            throw new IllegalStateException("serviceUrl 未被赋值");
+        }
+        return serviceUrl;
+    }
+
+    public AliPayApiConfig setServiceUrl(String serviceUrl) {
+        if (StrUtil.isEmpty(serviceUrl)) {
+            serviceUrl = "https://openapi.alipay.com/gateway.do";
+        }
+        this.serviceUrl = serviceUrl;
+        return this;
+    }
+
+    public String getCharset() {
+        if (StrUtil.isEmpty(charset)) {
+            charset = "UTF-8";
+        }
+        return charset;
+    }
+
+    public AliPayApiConfig setCharset(String charset) {
+        if (StrUtil.isEmpty(charset)) {
+            charset = "UTF-8";
+        }
+        this.charset = charset;
+        return this;
+    }
+
+    public String getSignType() {
+        if (StrUtil.isEmpty(signType)) {
+            signType = "RSA2";
+        }
+        return signType;
+    }
+
+    public AliPayApiConfig setSignType(String signType) {
+        if (StrUtil.isEmpty(signType)) {
+            signType = "RSA2";
+        }
+        this.signType = signType;
+        return this;
+    }
+
+    public String getFormat() {
+        if (StrUtil.isEmpty(format)) {
+            format = "json";
+        }
+        return format;
+    }
+
+    public String getAppCertPath() {
+        return appCertPath;
+    }
+
+    public AliPayApiConfig setAppCertPath(String appCertPath) {
+        this.appCertPath = appCertPath;
+        return this;
+    }
+
+    public String getAliPayCertPath() {
+        return aliPayCertPath;
+    }
+
+    public AliPayApiConfig setAliPayCertPath(String aliPayCertPath) {
+        this.aliPayCertPath = aliPayCertPath;
+        return this;
+    }
+
+    public String getAliPayRootCertPath() {
+        return aliPayRootCertPath;
+    }
+
+    public AliPayApiConfig setAliPayRootCertPath(String aliPayRootCertPath) {
+        this.aliPayRootCertPath = aliPayRootCertPath;
+        return this;
+    }
+
+    public AlipayClient getAliPayClient() {
+        if (alipayClient == null) {
+            throw new IllegalStateException("aliPayClient 未被初始化");
+        }
+        return alipayClient;
+    }
+
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/alipay/AliPayApiConfigKit.java b/mallplus-pay/src/main/java/com/zscat/mallplus/alipay/AliPayApiConfigKit.java
new file mode 100644
index 0000000000000000000000000000000000000000..3908a3afe4aecbf55c0ce6e844cdcb65bcb2bf5b
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/alipay/AliPayApiConfigKit.java
@@ -0,0 +1,143 @@
+package com.zscat.mallplus.alipay;
+
+import cn.hutool.core.util.StrUtil;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * @author Javen
+ */
+public class AliPayApiConfigKit {
+    private static final ThreadLocal<String> TL = new ThreadLocal<String>();
+
+    private static final Map<String, AliPayApiConfig> CFG_MAP = new ConcurrentHashMap<String, AliPayApiConfig>();
+    private static final String DEFAULT_CFG_KEY = "_default_key_";
+
+    /**
+     * <p>向缓存中设置 AliPayApiConfig </p>
+     * <p>每个 appId 只需添加一次，相同 appId 将被覆盖</p>
+     *
+     * @param aliPayApiConfig 支付宝支付配置
+     * @return {@link AliPayApiConfig}
+     */
+    public static AliPayApiConfig putApiConfig(AliPayApiConfig aliPayApiConfig) {
+        if (CFG_MAP.size() == 0) {
+            CFG_MAP.put(DEFAULT_CFG_KEY, aliPayApiConfig);
+        }
+        return CFG_MAP.put(aliPayApiConfig.getAppId(), aliPayApiConfig);
+    }
+
+    /**
+     * 向当前线程中设置 {@link AliPayApiConfig}
+     *
+     * @param aliPayApiConfig {@link AliPayApiConfig} 支付宝配置对象
+     * @return {@link AliPayApiConfig}
+     */
+    public static AliPayApiConfig setThreadLocalAliPayApiConfig(AliPayApiConfig aliPayApiConfig) {
+        if (StrUtil.isNotEmpty(aliPayApiConfig.getAppId())) {
+            setThreadLocalAppId(aliPayApiConfig.getAppId());
+        }
+        return putApiConfig(aliPayApiConfig);
+    }
+
+    /**
+     * 通过 AliPayApiConfig 移除支付配置
+     *
+     * @param aliPayApiConfig {@link AliPayApiConfig} 支付宝配置对象
+     * @return {@link AliPayApiConfig}
+     */
+    public static AliPayApiConfig removeApiConfig(AliPayApiConfig aliPayApiConfig) {
+        return removeApiConfig(aliPayApiConfig.getAppId());
+    }
+
+    /**
+     * 通过 appId 移除支付配置
+     *
+     * @param appId 支付宝应用编号
+     * @return {@link AliPayApiConfig}
+     */
+    public static AliPayApiConfig removeApiConfig(String appId) {
+        return CFG_MAP.remove(appId);
+    }
+
+    /**
+     * 向当前线程中设置 appId
+     *
+     * @param appId 支付宝应用编号
+     */
+    public static void setThreadLocalAppId(String appId) {
+        if (StrUtil.isEmpty(appId)) {
+            appId = CFG_MAP.get(DEFAULT_CFG_KEY).getAppId();
+        }
+        TL.set(appId);
+    }
+
+    /**
+     * 移除当前线程中的 appId
+     */
+    public static void removeThreadLocalAppId() {
+        TL.remove();
+    }
+
+    /**
+     * 获取当前线程中的  appId
+     *
+     * @return 支付宝应用编号 appId
+     */
+    public static String getAppId() {
+        String appId = TL.get();
+        if (StrUtil.isEmpty(appId)) {
+            appId = CFG_MAP.get(DEFAULT_CFG_KEY).getAppId();
+        }
+        return appId;
+    }
+
+    /**
+     * 获取当前线程中的 AliPayApiConfig
+     *
+     * @return {@link AliPayApiConfig}
+     */
+    public static AliPayApiConfig getAliPayApiConfig() {
+        // AliPayApiConfig aliPayApiConfig = null;
+        AliPayBean aliPayBean = new AliPayBean();
+        aliPayBean.setAppId("2017010804923732");
+        aliPayBean.setDomain("http://www.yjlive.cn/api");
+        aliPayBean.setServerUrl("https://openapi.alipay.com/gateway.do");
+        aliPayBean.setPublicKey("MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzQsSWsgXJO7HTWLd/8Y9de6kPBlGqvnBCdL6N8pbg9TZ5LDQOpPxef940nY/dHQiBw61bVZQULSps2mhOs7xjebhEJfhXiGV+aZBjacxr+qJ4EpM/pjH3MrfA8IB5MpB9OFEeOTGos3FMzeQHPiqeeDAIDEFs4fO112/3OWfCD6rLI88H0FoDqZ4oSsAkniFZAW1IjwW9Whgicgo4v3IjcWV+k4eFCSCORpnNKjLbsco0qJic1FaHqbkccnpW8/40j/Vo/ZZG/qCDyZ/Lt7+OKDgO8dzelFfG/IoAuEMGsgb26tCAZMVyjMxXUgLrqnTESAx6121pqy1fiwyMC6cRwIDAQAB\n");
+        aliPayBean.setPrivateKey("MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDNCxJayBck7sdNYt3/xj117qQ8GUaq+cEJ0vo3yluD1NnksNA6k/F5/3jSdj90dCIHDrVtVlBQtKmzaaE6zvGN5uEQl+FeIZX5pkGNpzGv6ongSkz+mMfcyt8DwgHkykH04UR45MaizcUzN5Ac+Kp54MAgMQWzh87XXb/c5Z8IPqssjzwfQWgOpnihKwCSeIVkBbUiPBb1aGCJyCji/ciNxZX6Th4UJII5Gmc0qMtuxyjSomJzUVoepuRxyelbz/jSP9Wj9lkb+oIPJn8u3v44oOA7x3N6UV8b8igC4QwayBvbq0IBkxXKMzFdSAuuqdMRIDHrXbWmrLV+LDIwLpxHAgMBAAECggEACYIM7NbAc/76kPUXtEeeC/zv8rV9WGpScEEvRy0EB130aK1mSoEXvn+BO8kt8hl8hnVBJnvNJ6DpCZ/JUS/NdbYSE7HnSnUmPjhea9In9K9ci2EGpvuwsOVbaBI0Akb6vf9ALJb3Ow9tqI1YCm/hf9tTLWr4h7Wxer0nK3geYsRn6O92AKFYjxvImR/qj9sr2DNHg83lX/2YkdDuxhLWF8oTZzunhqvEWo17mEcCrFpx/vY3bME+ZMG/IAtp89PFXXsNHii4nI0buR8mx4z6CgIetgL0qFJUeMUir1ZKn+uAyy9Jv1V9Bu7R07LXsjlZlA/xnew5ie/42iyGcusYiQKBgQDvRiPWCX0eEe4rVcPHAZJ1d/jsOGwvhzmE4TUQdnjVU0bKdgY4hHS9BrvjCTAWmzEE0siS85inzQj26DGGNr5U+D0HYfTEymNQNBMLin/ApLvNPL7xzFdpA19sVvatVV+c5Vl9JaVGuBraK69Q7Cz/6OQwXU1NGQWohZhOyMX6MwKBgQDbYF2BM7npaXFQVbigGmXgdvLHeWdZag7M4dB0lHsqGWAdtQzIIn05q9rBWNMusEfal/eZKuvmoXaDquh/g0VDCmmxxIE4OS9j37g64/4QbWJxwM8rDzA6Z58peng7CUse9Pb3Q/F8JQ/EvniEa6JT1qXWGWhQcpGsACCZEYYpnQKBgGQPAsFo6md+vAhnLx2zbJmu9+tglO0zMTx+KQCfalxbHMlhnaxYx7Ccdkm09+UcNN19f97j+zyAo3UNGFi139YMkQjbT85TjEBn5mb3HgFjYh2rf3YCK7OAc5EMtM87WmZ0Cn4pFfqC1sfRaNkASrkhnPsUqVTKV/FnHJAlqZS9AoGBAJgAKCmajolEzwerrXX5dHdX05YU72AL1V9uY0IzkzczR96tkMKm6v9nrPXktsaVy+ORAjS1gahWXciTRe78JKRz9ZH/ps0vCj/4Ri0/xczaDajlwGWEa5U8MRLLUb0ODmfPscLX591tzIQ0uUp/TYUrp9I13opHJ9n2aJ/GfaAdAoGARUzil6jIO3mASNaH7MPR4MqvxMO0LuBwaVxR1mvM7GtDDDYWU3fTJ6lFpyr340cYgEmHAVnLezbLmP75Jqo42j7H5V3BplPITSSik9ti3WOHFlPRYsZBewL7cJb4VX5oRrbfOX8to9wfw2TvofHE82NDtQn9fQUoFpqKlkIraL4=\n");
+        AliPayApiConfig aliPayApiConfig = AliPayApiConfig.builder()
+                .setAppId(aliPayBean.getAppId())
+                .setAliPayPublicKey(aliPayBean.getPublicKey())
+                .setCharset("UTF-8")
+                .setPrivateKey(aliPayBean.getPrivateKey())
+                .setServiceUrl(aliPayBean.getServerUrl())
+                .setSignType("RSA2")
+                .build();
+        return aliPayApiConfig;
+      /*  String appId = getAppId();
+        return getApiConfig(appId);*/
+    }
+
+    /**
+     * 通过 appId 获取 AliPayApiConfig
+     *
+     * @param appId 支付宝应用编号
+     * @return {@link AliPayApiConfig}
+     */
+    public static AliPayApiConfig getApiConfig(String appId) {
+        AliPayApiConfig cfg = CFG_MAP.get(appId);
+        if (cfg == null) {
+            throw new IllegalStateException("需事先调用 AliPayApiConfigKit.putApiConfig(aliPayApiConfig) 将 appId对应的 aliPayApiConfig 对象存入，才可以使用 AliPayApiConfigKit.getAliPayApiConfig() 的系列方法");
+        }
+        return cfg;
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/alipay/AliPayBean.java b/mallplus-pay/src/main/java/com/zscat/mallplus/alipay/AliPayBean.java
new file mode 100644
index 0000000000000000000000000000000000000000..53d032c5ad11edc74324739e6eeb32df54abcdde
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/alipay/AliPayBean.java
@@ -0,0 +1,30 @@
+package com.zscat.mallplus.alipay;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>支付宝配置 Bean</p>
+ *
+ * @author Javen
+ */
+
+@Setter
+@Getter
+public class AliPayBean {
+    private String appId;
+    private String privateKey;
+    private String publicKey;
+    private String serverUrl;
+    private String domain;
+
+
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/alipay/AliPayCore.java b/mallplus-pay/src/main/java/com/zscat/mallplus/alipay/AliPayCore.java
new file mode 100644
index 0000000000000000000000000000000000000000..cf82a67fc741e5a2930c94aa37b27c54ba289abc
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/alipay/AliPayCore.java
@@ -0,0 +1,103 @@
+package com.zscat.mallplus.alipay;
+
+import cn.hutool.crypto.SecureUtil;
+import com.zscat.mallplus.core.enums.SignType;
+
+import java.util.*;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * @author Javen
+ */
+public class AliPayCore {
+
+    /**
+     * 生成签名结果
+     *
+     * @param params   要签名的数组
+     * @param key      签名密钥
+     * @param signType 签名类型
+     * @return 签名结果字符串
+     */
+    public static String buildRequestMySign(Map<String, String> params, String key, String signType) {
+        // 把数组所有元素，按照“参数=参数值”的模式用“&”字符拼接成字符串
+        String preStr = createLinkString(params);
+        if (SignType.MD5.getType().equals(signType)) {
+            return SecureUtil.md5(preStr.concat(key));
+        }
+        return null;
+    }
+
+    /**
+     * 生成要请求给支付宝的参数数组
+     *
+     * @param params   请求前的参数数组
+     * @param key      商户的私钥
+     * @param signType 签名类型
+     * @return 要请求的参数数组
+     */
+    public static Map<String, String> buildRequestPara(Map<String, String> params, String key, String signType) {
+        // 除去数组中的空值和签名参数
+        Map<String, String> tempMap = paraFilter(params);
+        // 生成签名结果
+        String mySign = buildRequestMySign(params, key, signType);
+
+        // 签名结果与签名方式加入请求提交参数组中
+        tempMap.put("sign", mySign);
+        tempMap.put("sign_type", signType);
+
+        return tempMap;
+    }
+
+    /**
+     * 除去数组中的空值和签名参数
+     *
+     * @param sArray 签名参数组
+     * @return 去掉空值与签名参数后的新签名参数组
+     */
+    public static Map<String, String> paraFilter(Map<String, String> sArray) {
+        Map<String, String> result = new HashMap<String, String>(sArray.size());
+        if (sArray == null || sArray.size() <= 0) {
+            return result;
+        }
+        for (String key : sArray.keySet()) {
+            String value = sArray.get(key);
+            if (value == null || "".equals(value) || "sign".equalsIgnoreCase(key)
+                    || "sign_type".equalsIgnoreCase(key)) {
+                continue;
+            }
+            result.put(key, value);
+        }
+        return result;
+    }
+
+    /**
+     * 把数组所有元素排序
+     *
+     * @param params 需要排序并参与字符拼接的参数组
+     * @return 拼接后字符串
+     */
+    public static String createLinkString(Map<String, String> params) {
+        List<String> keys = new ArrayList<String>(params.keySet());
+        Collections.sort(keys);
+        StringBuffer content = new StringBuffer();
+        for (int i = 0; i < keys.size(); i++) {
+            String key = keys.get(i);
+            String value = params.get(key);
+            // 拼接时，不包括最后一个&字符
+            if (i == keys.size() - 1) {
+                content.append(key + "=" + value);
+            } else {
+                content.append(key + "=" + value + "&");
+            }
+        }
+        return content.toString();
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/core/XmlHelper.java b/mallplus-pay/src/main/java/com/zscat/mallplus/core/XmlHelper.java
new file mode 100644
index 0000000000000000000000000000000000000000..8b861df53d61f7fd5bcff0a9fc797f06e5245bbf
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/core/XmlHelper.java
@@ -0,0 +1,254 @@
+package com.zscat.mallplus.core;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * xpath解析xml
+ *
+ * <pre>
+ *     文档地址：
+ *     http://www.w3school.com.cn/xpath/index.asp
+ * </pre>
+ *
+ * @author L.cm
+ */
+public class XmlHelper {
+    private final XPath path;
+    private final Document doc;
+
+    private XmlHelper(InputSource inputSource) throws ParserConfigurationException, SAXException, IOException {
+        DocumentBuilderFactory dbf = getDocumentBuilderFactory();
+        // This is the PRIMARY defense. If DTDs (doctypes) are disallowed, almost all
+        // XML entity attacks are prevented
+        // Xerces 2 only -
+        // http://xerces.apache.org/xerces2-j/features.html#disallow-doctype-decl
+        dbf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+
+        // If you can't completely disable DTDs, then at least do the following:
+        // Xerces 1 -
+        // http://xerces.apache.org/xerces-j/features.html#external-general-entities
+        // Xerces 2 -
+        // http://xerces.apache.org/xerces2-j/features.html#external-general-entities
+        // JDK7+ - http://xml.org/sax/features/external-general-entities
+        dbf.setFeature("http://xml.org/sax/features/external-general-entities", false);
+
+        // Xerces 1 -
+        // http://xerces.apache.org/xerces-j/features.html#external-parameter-entities
+        // Xerces 2 -
+        // http://xerces.apache.org/xerces2-j/features.html#external-parameter-entities
+        // JDK7+ - http://xml.org/sax/features/external-parameter-entities
+        dbf.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+
+        // Disable external DTDs as well
+        dbf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+
+        // and these as well, per Timothy Morgan's 2014 paper: "XML Schema, DTD, and
+        // Entity Attacks"
+        dbf.setXIncludeAware(false);
+        dbf.setExpandEntityReferences(false);
+        DocumentBuilder db = dbf.newDocumentBuilder();
+        doc = db.parse(inputSource);
+        path = getXpathFactory().newXPath();
+    }
+
+    private static XmlHelper create(InputSource inputSource) {
+        try {
+            return new XmlHelper(inputSource);
+        } catch (ParserConfigurationException e) {
+            throw new RuntimeException(e);
+        } catch (SAXException e) {
+            throw new RuntimeException(e);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static XmlHelper of(InputStream is) {
+        InputSource inputSource = new InputSource(is);
+        return create(inputSource);
+    }
+
+    public static XmlHelper of(File file) {
+        InputSource inputSource = new InputSource(file.toURI().toASCIIString());
+        return create(inputSource);
+    }
+
+    public static XmlHelper of(String xmlStr) {
+        StringReader sr = new StringReader(xmlStr.trim());
+        InputSource inputSource = new InputSource(sr);
+        XmlHelper xmlHelper = create(inputSource);
+        sr.close();
+        return xmlHelper;
+    }
+
+    private static DocumentBuilderFactory getDocumentBuilderFactory() {
+        return XmlHelper.XmlHelperHolder.documentBuilderFactory;
+    }
+
+    private static XPathFactory getXpathFactory() {
+        return XmlHelper.XmlHelperHolder.xPathFactory;
+    }
+
+    private Object evalXpath(String expression, Object item, QName returnType) {
+        item = null == item ? doc : item;
+        try {
+            return path.evaluate(expression, item, returnType);
+        } catch (XPathExpressionException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 获取String
+     *
+     * @param expression 路径
+     * @return String
+     */
+    public String getString(String expression) {
+        return (String) evalXpath(expression, null, XPathConstants.STRING);
+    }
+
+    /**
+     * 获取Boolean
+     *
+     * @param expression 路径
+     * @return String
+     */
+    public Boolean getBoolean(String expression) {
+        return (Boolean) evalXpath(expression, null, XPathConstants.BOOLEAN);
+    }
+
+    /**
+     * 获取Number
+     *
+     * @param expression 路径
+     * @return {Number}
+     */
+    public Number getNumber(String expression) {
+        return (Number) evalXpath(expression, null, XPathConstants.NUMBER);
+    }
+
+    /**
+     * 获取某个节点
+     *
+     * @param expression 路径
+     * @return {Node}
+     */
+    public Node getNode(String expression) {
+        return (Node) evalXpath(expression, null, XPathConstants.NODE);
+    }
+
+    /**
+     * 获取子节点
+     *
+     * @param expression 路径
+     * @return NodeList
+     */
+    public NodeList getNodeList(String expression) {
+        return (NodeList) evalXpath(expression, null, XPathConstants.NODESET);
+    }
+
+    /**
+     * 获取String
+     *
+     * @param node       节点
+     * @param expression 相对于node的路径
+     * @return String
+     */
+    public String getString(Object node, String expression) {
+        return (String) evalXpath(expression, node, XPathConstants.STRING);
+    }
+
+    /**
+     * 获取
+     *
+     * @param node       节点
+     * @param expression 相对于node的路径
+     * @return String
+     */
+    public Boolean getBoolean(Object node, String expression) {
+        return (Boolean) evalXpath(expression, node, XPathConstants.BOOLEAN);
+    }
+
+    /**
+     * 获取
+     *
+     * @param node       节点
+     * @param expression 相对于node的路径
+     * @return {Number}
+     */
+    public Number getNumber(Object node, String expression) {
+        return (Number) evalXpath(expression, node, XPathConstants.NUMBER);
+    }
+
+    /**
+     * 获取某个节点
+     *
+     * @param node       节点
+     * @param expression 路径
+     * @return {Node}
+     */
+    public Node getNode(Object node, String expression) {
+        return (Node) evalXpath(expression, node, XPathConstants.NODE);
+    }
+
+    /**
+     * 获取子节点
+     *
+     * @param node       节点
+     * @param expression 相对于node的路径
+     * @return NodeList
+     */
+    public NodeList getNodeList(Object node, String expression) {
+        return (NodeList) evalXpath(expression, node, XPathConstants.NODESET);
+    }
+
+    /**
+     * 针对没有嵌套节点的简单处理
+     *
+     * @return map集合
+     */
+    public Map<String, String> toMap() {
+        Element root = doc.getDocumentElement();
+
+        // 将节点封装成map形式
+        NodeList list = root.getChildNodes();
+        Map<String, String> params = new HashMap<String, String>(list.getLength());
+        for (int i = 0; i < list.getLength(); i++) {
+            Node node = list.item(i);
+            params.put(node.getNodeName(), node.getTextContent());
+        }
+        // 含有空白符会生成一个#text参数
+        params.remove("#text");
+        return params;
+    }
+
+    /**
+     * 内部类单例
+     */
+    private static class XmlHelperHolder {
+        private static DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+        private static XPathFactory xPathFactory = XPathFactory.newInstance();
+    }
+
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/core/enums/PayModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/core/enums/PayModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..c0aad6f1c52c69ec9e9c994b8f09588c0c4e257c
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/core/enums/PayModel.java
@@ -0,0 +1,39 @@
+package com.zscat.mallplus.core.enums;
+
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>商户平台模式</p>
+ *
+ * @author Javen
+ */
+public enum PayModel {
+    /**
+     * 商户模式
+     */
+    BUSINESS_MODEL("BUSINESS_MODEL"),
+    /**
+     * 服务商模式
+     */
+    SERVICE_MODE("SERVICE_MODE");
+
+    /**
+     * 商户模式
+     */
+    private final String payModel;
+
+    PayModel(String payModel) {
+        this.payModel = payModel;
+    }
+
+    public String getPayModel() {
+        return payModel;
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/core/enums/SignType.java b/mallplus-pay/src/main/java/com/zscat/mallplus/core/enums/SignType.java
new file mode 100644
index 0000000000000000000000000000000000000000..1429bc3c18e54b8f61a441d3bfc29dbdc4dfc0e8
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/core/enums/SignType.java
@@ -0,0 +1,35 @@
+package com.zscat.mallplus.core.enums;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>签名方式</p>
+ *
+ * @author Javen
+ */
+public enum SignType {
+    /**
+     * HMAC-SHA256 加密
+     */
+    HMACSHA256("HMAC-SHA256"),
+    /**
+     * MD5 加密
+     */
+    MD5("MD5");
+
+    private final String type;
+
+    SignType(String type) {
+        this.type = type;
+    }
+
+    public String getType() {
+        return type;
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/core/enums/TradeType.java b/mallplus-pay/src/main/java/com/zscat/mallplus/core/enums/TradeType.java
new file mode 100644
index 0000000000000000000000000000000000000000..4382c45bbee7da28fac4bfa71c47337da8fe7d65
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/core/enums/TradeType.java
@@ -0,0 +1,50 @@
+package com.zscat.mallplus.core.enums;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>支付方式</p>
+ *
+ * @author Javen
+ */
+public enum TradeType {
+    /**
+     * 微信公众号支付或者小程序支付
+     */
+    JSAPI("JSAPI"),
+    /**
+     * 微信扫码支付
+     */
+    NATIVE("NATIVE"),
+    /**
+     * 微信APP支付
+     */
+    APP("APP"),
+    /**
+     * 付款码支付
+     */
+    MICROPAY("MICROPAY"),
+    /**
+     * H5支付
+     */
+    MWEB("MWEB");
+
+    /**
+     * 交易类型
+     */
+    private final String tradeType;
+
+    TradeType(String tradeType) {
+        this.tradeType = tradeType;
+    }
+
+    public String getTradeType() {
+        return tradeType;
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/core/http/AbstractHttpDelegate.java b/mallplus-pay/src/main/java/com/zscat/mallplus/core/http/AbstractHttpDelegate.java
new file mode 100644
index 0000000000000000000000000000000000000000..28c21151dfc12fc8258999e1b93c4b0917fc798b
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/core/http/AbstractHttpDelegate.java
@@ -0,0 +1,137 @@
+package com.zscat.mallplus.core.http;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.http.ssl.SSLSocketFactoryBuilder;
+
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.KeyManagerFactory;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.security.KeyStore;
+import java.security.SecureRandom;
+import java.util.Map;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>Http 代理类</p>
+ *
+ * @author Javen
+ */
+public abstract class AbstractHttpDelegate {
+    /**
+     * get 请求
+     *
+     * @param url 请求url
+     * @return {@link String} 请求返回的结果
+     */
+    public String get(String url) {
+        return HttpUtil.get(url);
+    }
+
+    /**
+     * get 请求
+     *
+     * @param url      请求url
+     * @param paramMap 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public String get(String url, Map<String, Object> paramMap) {
+        return HttpUtil.get(url, paramMap);
+    }
+
+    /**
+     * post 请求
+     *
+     * @param url  请求url
+     * @param data 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public String post(String url, String data) {
+        return HttpUtil.post(url, data);
+    }
+
+    /**
+     * post 请求
+     *
+     * @param url      请求url
+     * @param paramMap 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public String post(String url, Map<String, Object> paramMap) {
+        return HttpUtil.post(url, paramMap);
+    }
+
+    /**
+     * post 请求
+     *
+     * @param url      请求url
+     * @param data     请求参数
+     * @param certPath 证书路径
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public String post(String url, String data, String certPath, String certPass) {
+        try {
+            return HttpRequest.post(url)
+                    .setSSLSocketFactory(SSLSocketFactoryBuilder
+                            .create()
+                            .setProtocol(SSLSocketFactoryBuilder.TLSv1)
+                            .setKeyManagers(getKeyManager(certPass, certPath, null))
+                            .setSecureRandom(new SecureRandom())
+                            .build()
+                    )
+                    .body(data)
+                    .execute()
+                    .body();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * post 请求
+     *
+     * @param url      请求url
+     * @param data     请求参数
+     * @param certFile 证书文件输入流
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public String post(String url, String data, InputStream certFile, String certPass) {
+        try {
+            return HttpRequest.post(url)
+                    .setSSLSocketFactory(SSLSocketFactoryBuilder
+                            .create()
+                            .setProtocol(SSLSocketFactoryBuilder.TLSv1)
+                            .setKeyManagers(getKeyManager(certPass, null, certFile))
+                            .setSecureRandom(new SecureRandom())
+                            .build()
+                    )
+                    .body(data)
+                    .execute()
+                    .body();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private KeyManager[] getKeyManager(String certPass, String certPath, InputStream certFile) throws Exception {
+        KeyStore clientStore = KeyStore.getInstance("PKCS12");
+        if (certFile != null) {
+            clientStore.load(certFile, certPass.toCharArray());
+        } else {
+            clientStore.load(new FileInputStream(certPath), certPass.toCharArray());
+        }
+        KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+        kmf.init(clientStore, certPass.toCharArray());
+        return kmf.getKeyManagers();
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/core/kit/HttpKit.java b/mallplus-pay/src/main/java/com/zscat/mallplus/core/kit/HttpKit.java
new file mode 100644
index 0000000000000000000000000000000000000000..6b6c302e3f75b775e7110c93b695e4791f6d89d9
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/core/kit/HttpKit.java
@@ -0,0 +1,67 @@
+package com.zscat.mallplus.core.kit;
+
+
+import com.zscat.mallplus.core.http.AbstractHttpDelegate;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.BufferedReader;
+import java.io.IOException;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>Http 工具类</p>
+ *
+ * @author Javen
+ */
+public class HttpKit {
+
+    private static AbstractHttpDelegate delegate = new DefaultHttpKit();
+
+    public static AbstractHttpDelegate getDelegate() {
+        return delegate;
+    }
+
+    public static void setDelegate(AbstractHttpDelegate delegate) {
+        HttpKit.delegate = delegate;
+    }
+
+    public static String readData(HttpServletRequest request) {
+        BufferedReader br = null;
+        try {
+            StringBuilder result = new StringBuilder();
+            br = request.getReader();
+            for (String line; (line = br.readLine()) != null; ) {
+                if (result.length() > 0) {
+                    result.append("\n");
+                }
+                result.append(line);
+            }
+            return result.toString();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } finally {
+            if (br != null) {
+                try {
+                    br.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+}
+
+/**
+ * 使用 huTool 实现的 Http 工具类
+ *
+ * @author Javen
+ */
+class DefaultHttpKit extends AbstractHttpDelegate {
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/core/kit/IpKit.java b/mallplus-pay/src/main/java/com/zscat/mallplus/core/kit/IpKit.java
new file mode 100644
index 0000000000000000000000000000000000000000..fc4e90ad8f2f91b9a41d854a27ccd4efbab61a46
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/core/kit/IpKit.java
@@ -0,0 +1,37 @@
+package com.zscat.mallplus.core.kit;
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author Javen
+ */
+public class IpKit {
+    public IpKit() {
+    }
+
+    public static String getRealIp(HttpServletRequest request) {
+        String ip = request.getHeader("x-forwarded-for");
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("Proxy-Client-IP");
+        }
+
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("WL-Proxy-Client-IP");
+        }
+
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getRemoteAddr();
+        }
+
+        return ip;
+    }
+
+    public static String getRealIpV2(HttpServletRequest request) {
+        String accessIp = request.getHeader("x-forwarded-for");
+        return null == accessIp ? request.getRemoteAddr() : accessIp;
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/core/kit/PayKit.java b/mallplus-pay/src/main/java/com/zscat/mallplus/core/kit/PayKit.java
new file mode 100644
index 0000000000000000000000000000000000000000..0b0c8e519ae69b578ba0fe57a6980fb23959477f
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/core/kit/PayKit.java
@@ -0,0 +1,165 @@
+package com.zscat.mallplus.core.kit;
+
+import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.crypto.digest.HmacAlgorithm;
+import com.zscat.mallplus.core.XmlHelper;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>IJPay 工具类</p>
+ *
+ * @author Javen
+ */
+public class PayKit {
+
+    public static String hmacSha256(String data, String key) {
+        return SecureUtil.hmac(HmacAlgorithm.HmacSHA256, key).digestHex(data, CharsetUtil.UTF_8);
+    }
+
+    public static String md5(String data) {
+        return SecureUtil.md5(data);
+    }
+
+    /**
+     * AES 解密
+     *
+     * @param base64Data 需要解密的数据
+     * @param key        密钥
+     * @return 解密后的数据
+     */
+    public static String decryptData(String base64Data, String key) {
+        return SecureUtil.aes(md5(key).toLowerCase().getBytes()).decryptStr(base64Data);
+    }
+
+    /**
+     * AES 加密
+     *
+     * @param data 需要加密的数据
+     * @param key  密钥
+     * @return 加密后的数据
+     */
+    public static String encryptData(String data, String key) {
+        return SecureUtil.aes(md5(key).toLowerCase().getBytes()).encryptBase64(data.getBytes());
+    }
+
+    public static String generateStr() {
+        return IdUtil.fastSimpleUUID();
+    }
+
+    /**
+     * 把所有元素排序
+     *
+     * @param params 需要排序并参与字符拼接的参数组
+     * @return 拼接后字符串
+     */
+    public static String createLinkString(Map<String, String> params) {
+        return createLinkString(params, false);
+    }
+
+    /**
+     * @param params 需要排序并参与字符拼接的参数组
+     * @param encode 是否进行URLEncoder
+     * @return 拼接后字符串
+     */
+    public static String createLinkString(Map<String, String> params, boolean encode) {
+        List<String> keys = new ArrayList<String>(params.keySet());
+        Collections.sort(keys);
+        StringBuffer content = new StringBuffer();
+        for (int i = 0; i < keys.size(); i++) {
+            String key = keys.get(i);
+            String value = params.get(key);
+            // 拼接时，不包括最后一个&字符
+            if (i == keys.size() - 1) {
+                content.append(key + "=" + (encode ? urlEncode(value) : value));
+            } else {
+                content.append(key + "=" + (encode ? urlEncode(value) : value) + "&");
+            }
+        }
+        return content.toString();
+    }
+
+
+    /**
+     * URL 编码
+     *
+     * @param src 需要编码的字符串
+     * @return 编码后的字符串
+     */
+    public static String urlEncode(String src) {
+        try {
+            return URLEncoder.encode(src, CharsetUtil.UTF_8).replace("+", "%20");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 遍历 Map 并构建 xml 数据
+     *
+     * @param params 需要遍历的 Map
+     * @param prefix xml 前缀
+     * @param suffix xml 后缀
+     * @return
+     */
+    public static StringBuilder forEachMap(Map<String, String> params, String prefix, String suffix) {
+        StringBuilder xml = new StringBuilder();
+        if (StrUtil.isNotEmpty(prefix)) {
+            xml.append(prefix);
+        }
+        for (Map.Entry<String, String> entry : params.entrySet()) {
+            String key = entry.getKey();
+            String value = entry.getValue();
+            // 略过空值
+            if (StrUtil.isEmpty(value)) {
+                continue;
+            }
+            xml.append("<").append(key).append(">");
+            xml.append(entry.getValue());
+            xml.append("</").append(key).append(">");
+        }
+        if (StrUtil.isNotEmpty(suffix)) {
+            xml.append(suffix);
+        }
+        return xml;
+    }
+
+    /**
+     * 微信下单 map to xml
+     *
+     * @param params Map 参数
+     * @return xml 字符串
+     */
+    public static String toXml(Map<String, String> params) {
+        StringBuilder xml = forEachMap(params, "<xml>", "</xml>");
+        return xml.toString();
+    }
+
+    /**
+     * 针对支付的 xml，没有嵌套节点的简单处理
+     *
+     * @param xmlStr xml 字符串
+     * @return 转化后的 Map
+     */
+    public static Map<String, String> xmlToMap(String xmlStr) {
+        XmlHelper xmlHelper = XmlHelper.of(xmlStr);
+        return xmlHelper.toMap();
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/core/kit/QrCodeKit.java b/mallplus-pay/src/main/java/com/zscat/mallplus/core/kit/QrCodeKit.java
new file mode 100644
index 0000000000000000000000000000000000000000..dc172b65bc4387f7c48d186ebb494e7efc09dbd4
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/core/kit/QrCodeKit.java
@@ -0,0 +1,149 @@
+package com.zscat.mallplus.core.kit;
+
+import com.google.zxing.*;
+import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
+import com.google.zxing.client.j2se.MatrixToImageConfig;
+import com.google.zxing.client.j2se.MatrixToImageWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.common.HybridBinarizer;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p> google 开源图形码工具类</p>
+ *
+ * @author Javen
+ */
+public class QrCodeKit {
+    /**
+     * 图形码生成工具
+     *
+     * @param contents        内容
+     * @param barcodeFormat   BarcodeFormat对象
+     * @param format          图片格式，可选[png,jpg,bmp]
+     * @param width           宽
+     * @param height          高
+     * @param margin          边框间距px
+     * @param saveImgFilePath 存储图片的完整位置，包含文件名
+     * @return {boolean}
+     */
+    public static boolean encode(String contents, BarcodeFormat barcodeFormat, Integer margin,
+                                 ErrorCorrectionLevel errorLevel, String format, int width, int height, String saveImgFilePath) {
+        Boolean bool = false;
+        BufferedImage bufImg;
+        Map<EncodeHintType, Object> hints = new HashMap<EncodeHintType, Object>(3);
+        // 指定纠错等级
+        hints.put(EncodeHintType.ERROR_CORRECTION, errorLevel);
+        hints.put(EncodeHintType.MARGIN, margin);
+        hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
+        try {
+            BitMatrix bitMatrix = new MultiFormatWriter().encode(contents, barcodeFormat, width, height, hints);
+            MatrixToImageConfig config = new MatrixToImageConfig(0xFF000001, 0xFFFFFFFF);
+            bufImg = MatrixToImageWriter.toBufferedImage(bitMatrix, config);
+            bool = writeToFile(bufImg, format, saveImgFilePath);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return bool;
+    }
+
+    /**
+     * @param outputStream  可以来自response，也可以来自文件
+     * @param contents      内容
+     * @param barcodeFormat BarcodeFormat对象
+     * @param margin        图片格式，可选[png,jpg,bmp]
+     * @param errorLevel    纠错级别 一般为：ErrorCorrectionLevel.H
+     * @param format        图片格式，可选[png,jpg,bmp]
+     * @param width         宽
+     * @param height        高
+     */
+    public static void encodeOutPutSteam(OutputStream outputStream, String contents, BarcodeFormat barcodeFormat, Integer margin, ErrorCorrectionLevel errorLevel, String format, int width, int height) throws IOException {
+        Map<EncodeHintType, Object> hints = new HashMap<EncodeHintType, Object>(3);
+        hints.put(EncodeHintType.ERROR_CORRECTION, errorLevel);
+        hints.put(EncodeHintType.MARGIN, margin);
+        hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
+
+        try {
+            BitMatrix bitMatrix = (new MultiFormatWriter()).encode(contents, barcodeFormat, width, height, hints);
+            MatrixToImageWriter.writeToStream(bitMatrix, format, outputStream);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (outputStream != null) {
+                outputStream.close();
+            }
+        }
+
+    }
+
+    /**
+     * @param srcImgFilePath 要解码的图片地址
+     * @return {Result}
+     */
+    public static Result decode(String srcImgFilePath) {
+        Result result = null;
+        BufferedImage image;
+        try {
+            File srcFile = new File(srcImgFilePath);
+            image = ImageIO.read(srcFile);
+            if (null != image) {
+                LuminanceSource source = new BufferedImageLuminanceSource(image);
+                BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
+
+                Hashtable<DecodeHintType, String> hints = new Hashtable<DecodeHintType, String>();
+                hints.put(DecodeHintType.CHARACTER_SET, "UTF-8");
+                result = new MultiFormatReader().decode(bitmap, hints);
+            } else {
+                throw new IllegalArgumentException("Could not decode image.");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    /**
+     * 将BufferedImage对象写入文件
+     *
+     * @param bufImg          BufferedImage对象
+     * @param format          图片格式，可选[png,jpg,bmp]
+     * @param saveImgFilePath 存储图片的完整位置，包含文件名
+     * @return {boolean}
+     */
+    public static boolean writeToFile(BufferedImage bufImg, String format, String saveImgFilePath) {
+        Boolean bool = false;
+        try {
+            bool = ImageIO.write(bufImg, format, new File(saveImgFilePath));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return bool;
+    }
+
+    public static void main(String[] args) {
+        String saveImgFilePath = "/Users/Javen/Documents/dev/IJPay/qrCode.png";
+        Boolean encode = encode("https://gitee.com/javen205/IJPay", BarcodeFormat.QR_CODE, 3,
+                ErrorCorrectionLevel.H, "png", 200, 200, saveImgFilePath);
+        if (encode) {
+            Result result = decode(saveImgFilePath);
+            String text = result.getText();
+            System.out.println(text);
+        }
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/core/kit/RsaKit.java b/mallplus-pay/src/main/java/com/zscat/mallplus/core/kit/RsaKit.java
new file mode 100644
index 0000000000000000000000000000000000000000..0094e144177300070db815d9a7d3992eed815538
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/core/kit/RsaKit.java
@@ -0,0 +1,371 @@
+package com.zscat.mallplus.core.kit;
+
+import cn.hutool.core.codec.Base64;
+import cn.hutool.core.util.StrUtil;
+
+import javax.crypto.Cipher;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigInteger;
+import java.security.*;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.RSAPublicKey;
+import java.security.spec.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>RSA 非对称加密工具类</p>
+ *
+ * @author Javen
+ */
+public class RsaKit {
+
+    /**
+     * RSA最大加密明文大小
+     */
+    private static final int MAX_ENCRYPT_BLOCK = 117;
+
+    /**
+     * RSA最大解密密文大小
+     */
+    private static final int MAX_DECRYPT_BLOCK = 128;
+
+    /**
+     * 加密算法RSA
+     */
+    private static final String KEY_ALGORITHM = "RSA";
+
+    /**
+     * 生成公钥和私钥
+     *
+     * @throws Exception
+     */
+    public static Map<String, String> getKeys() throws Exception {
+        KeyPairGenerator keyPairGen = KeyPairGenerator.getInstance(KEY_ALGORITHM);
+        keyPairGen.initialize(1024);
+        KeyPair keyPair = keyPairGen.generateKeyPair();
+        RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic();
+        RSAPrivateKey privateKey = (RSAPrivateKey) keyPair.getPrivate();
+
+        String publicKeyStr = getPublicKeyStr(publicKey);
+        String privateKeyStr = getPrivateKeyStr(privateKey);
+
+        Map<String, String> map = new HashMap<String, String>(2);
+        map.put("publicKey", publicKeyStr);
+        map.put("privateKey", privateKeyStr);
+
+        System.out.println("公钥\r\n" + publicKeyStr);
+        System.out.println("私钥\r\n" + privateKeyStr);
+        return map;
+    }
+
+    /**
+     * 使用模和指数生成RSA公钥
+     * 注意：【此代码用了默认补位方式，为RSA/None/PKCS1Padding，不同JDK默认的补位方式可能不同，如Android默认是RSA
+     * /None/NoPadding】
+     *
+     * @param modulus  模
+     * @param exponent 公钥指数
+     * @return
+     */
+    public static RSAPublicKey getPublicKey(String modulus, String exponent) {
+        try {
+            BigInteger b1 = new BigInteger(modulus);
+            BigInteger b2 = new BigInteger(exponent);
+            KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM);
+            RSAPublicKeySpec keySpec = new RSAPublicKeySpec(b1, b2);
+            return (RSAPublicKey) keyFactory.generatePublic(keySpec);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 使用模和指数生成RSA私钥
+     * 注意：【此代码用了默认补位方式，为RSA/None/PKCS1Padding，不同JDK默认的补位方式可能不同，如Android默认是RSA
+     * /None/NoPadding】
+     *
+     * @param modulus  模
+     * @param exponent 指数
+     * @return
+     */
+    public static RSAPrivateKey getPrivateKey(String modulus, String exponent) {
+        try {
+            BigInteger b1 = new BigInteger(modulus);
+            BigInteger b2 = new BigInteger(exponent);
+            KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM);
+            RSAPrivateKeySpec keySpec = new RSAPrivateKeySpec(b1, b2);
+            return (RSAPrivateKey) keyFactory.generatePrivate(keySpec);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 公钥加密
+     *
+     * @param data      需要加密的数据
+     * @param publicKey 公钥
+     * @return 加密后的数据
+     * @throws Exception
+     */
+    public static String encryptByPublicKey(String data, String publicKey) throws Exception {
+        return encryptByPublicKey(data, publicKey, "RSA/ECB/PKCS1Padding");
+    }
+
+    public static String encryptByPublicKeyByWx(String data, String publicKey) throws Exception {
+        return encryptByPublicKey(data, publicKey, "RSA/ECB/OAEPWITHSHA-1ANDMGF1PADDING");
+    }
+
+    /**
+     * 公钥加密
+     *
+     * @param data      需要加密的数据
+     * @param publicKey 公钥
+     * @param fillMode  填充模式
+     * @return 加密后的数据
+     * @throws Exception
+     */
+    public static String encryptByPublicKey(String data, String publicKey, String fillMode) throws Exception {
+        byte[] dataByte = data.getBytes("UTF-8");
+        byte[] keyBytes = Base64.decode(publicKey);
+        X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(keyBytes);
+        KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM);
+        Key key = keyFactory.generatePublic(x509KeySpec);
+        // 对数据加密
+        Cipher cipher = Cipher.getInstance(fillMode);
+        cipher.init(Cipher.ENCRYPT_MODE, key);
+        int inputLen = dataByte.length;
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        int offSet = 0;
+        byte[] cache;
+        int i = 0;
+        // 对数据分段加密
+        while (inputLen - offSet > 0) {
+            if (inputLen - offSet > MAX_ENCRYPT_BLOCK) {
+                cache = cipher.doFinal(dataByte, offSet, MAX_ENCRYPT_BLOCK);
+            } else {
+                cache = cipher.doFinal(dataByte, offSet, inputLen - offSet);
+            }
+            out.write(cache, 0, cache.length);
+            i++;
+            offSet = i * MAX_ENCRYPT_BLOCK;
+        }
+        byte[] encryptedData = out.toByteArray();
+        out.close();
+        return StrUtil.str(Base64.encode(encryptedData));
+    }
+
+    /**
+     * 私钥签名
+     *
+     * @param data       需要加密的数据
+     * @param privateKey 私钥
+     * @return 加密后的数据
+     * @throws Exception
+     */
+    public static String encryptByPrivateKey(String data, String privateKey) throws Exception {
+        PKCS8EncodedKeySpec priPkcs8 = new PKCS8EncodedKeySpec(Base64.decode(privateKey));
+        KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM);
+        PrivateKey priKey = keyFactory.generatePrivate(priPkcs8);
+        Signature signature = Signature.getInstance("SHA256WithRSA");
+
+        signature.initSign(priKey);
+        signature.update(data.getBytes("UTF-8"));
+        byte[] signed = signature.sign();
+        return StrUtil.str(Base64.encode(signed));
+    }
+
+    /**
+     * 公钥验证签名
+     *
+     * @param data      需要加密的数据
+     * @param sign      签名
+     * @param publicKey 公钥
+     * @return 验证结果
+     * @throws Exception
+     */
+    public static boolean checkByPublicKey(String data, String sign, String publicKey) throws Exception {
+        KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM);
+        byte[] encodedKey = Base64.decode(publicKey);
+        PublicKey pubKey = keyFactory.generatePublic(new X509EncodedKeySpec(encodedKey));
+        Signature signature = Signature.getInstance("SHA256WithRSA");
+        signature.initVerify(pubKey);
+        signature.update(data.getBytes("UTF-8"));
+        return signature.verify(Base64.decode(sign.getBytes("UTF-8")));
+    }
+
+    /**
+     * 私钥解密
+     *
+     * @param data
+     * @param privateKey
+     * @return
+     * @throws Exception
+     */
+    public static String decryptByPrivateKey(String data, String privateKey) throws Exception {
+        return decryptByPrivateKey(data, privateKey, "RSA/ECB/PKCS1Padding");
+    }
+
+    public static String decryptByPrivateKeyByWx(String data, String privateKey) throws Exception {
+        return decryptByPrivateKey(data, privateKey, "RSA/ECB/OAEPWITHSHA-1ANDMGF1PADDING");
+    }
+
+    /**
+     * 私钥解密
+     *
+     * @param data
+     * @param privateKey
+     * @param fillMode   填充模式
+     * @return
+     * @throws Exception
+     */
+    public static String decryptByPrivateKey(String data, String privateKey, String fillMode) throws Exception {
+        byte[] encryptedData = Base64.decode(data);
+        byte[] keyBytes = Base64.decode(privateKey);
+        PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(keyBytes);
+        KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM);
+        Key key = keyFactory.generatePrivate(pkcs8KeySpec);
+        Cipher cipher = Cipher.getInstance(fillMode);
+
+        cipher.init(Cipher.DECRYPT_MODE, key);
+        int inputLen = encryptedData.length;
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        int offSet = 0;
+        byte[] cache;
+        int i = 0;
+        // 对数据分段解密
+        while (inputLen - offSet > 0) {
+            if (inputLen - offSet > MAX_DECRYPT_BLOCK) {
+                cache = cipher.doFinal(encryptedData, offSet, MAX_DECRYPT_BLOCK);
+            } else {
+                cache = cipher.doFinal(encryptedData, offSet, inputLen - offSet);
+            }
+            out.write(cache, 0, cache.length);
+            i++;
+            offSet = i * MAX_DECRYPT_BLOCK;
+        }
+        byte[] decryptedData = out.toByteArray();
+        out.close();
+        return new String(decryptedData);
+    }
+
+    /**
+     * 获取模数和密钥
+     *
+     * @return
+     */
+    public static Map<String, String> getModulusAndKeys() {
+
+        Map<String, String> map = new HashMap<String, String>(3);
+
+        try {
+            InputStream in = RsaKit.class.getResourceAsStream("/rsa.properties");
+            Properties prop = new Properties();
+            prop.load(in);
+
+            String modulus = prop.getProperty("modulus");
+            String publicKey = prop.getProperty("publicKey");
+            String privateKey = prop.getProperty("privateKey");
+
+            in.close();
+
+            map.put("modulus", modulus);
+            map.put("publicKey", publicKey);
+            map.put("privateKey", privateKey);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return map;
+    }
+
+    /**
+     * 从字符串中加载公钥
+     *
+     * @param publicKeyStr 公钥数据字符串
+     * @throws Exception 加载公钥时产生的异常
+     */
+    public static PublicKey loadPublicKey(String publicKeyStr) throws Exception {
+        try {
+            byte[] buffer = Base64.decode(publicKeyStr);
+            KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM);
+            X509EncodedKeySpec keySpec = new X509EncodedKeySpec(buffer);
+            return (RSAPublicKey) keyFactory.generatePublic(keySpec);
+        } catch (NoSuchAlgorithmException e) {
+            throw new Exception("无此算法");
+        } catch (InvalidKeySpecException e) {
+            throw new Exception("公钥非法");
+        } catch (NullPointerException e) {
+            throw new Exception("公钥数据为空");
+        }
+    }
+
+    /**
+     * 从字符串中加载私钥<br>
+     * 加载时使用的是PKCS8EncodedKeySpec（PKCS#8编码的Key指令）。
+     *
+     * @param privateKeyStr
+     * @return
+     * @throws Exception
+     */
+    public static PrivateKey loadPrivateKey(String privateKeyStr) throws Exception {
+        try {
+            byte[] buffer = Base64.decode(privateKeyStr);
+            PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(buffer);
+            KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM);
+            return (RSAPrivateKey) keyFactory.generatePrivate(keySpec);
+        } catch (NoSuchAlgorithmException e) {
+            throw new Exception("无此算法");
+        } catch (InvalidKeySpecException e) {
+            throw new Exception("私钥非法");
+        } catch (NullPointerException e) {
+            throw new Exception("私钥数据为空");
+        }
+    }
+
+    public static String getPrivateKeyStr(PrivateKey privateKey) throws Exception {
+        return new String(Base64.encode(privateKey.getEncoded()));
+    }
+
+    public static String getPublicKeyStr(PublicKey publicKey) throws Exception {
+        return new String(Base64.encode(publicKey.getEncoded()));
+    }
+
+    public static void main(String[] args) throws Exception {
+        Map<String, String> keys = getKeys();
+        String publicKey = keys.get("publicKey");
+        String privateKey = keys.get("privateKey");
+        String content = "我是Javen,I am Javen";
+        String encrypt = encryptByPublicKey(content, publicKey);
+        String decrypt = decryptByPrivateKey(encrypt, privateKey);
+        System.out.println("加密之后：" + encrypt);
+        System.out.println("解密之后：" + decrypt);
+
+        System.out.println("======华丽的分割线=========");
+
+        content = "我是Javen,I am Javen";
+        encrypt = encryptByPublicKeyByWx(content, publicKey);
+        decrypt = decryptByPrivateKeyByWx(encrypt, privateKey);
+        System.out.println("加密之后：" + encrypt);
+        System.out.println("解密之后：" + decrypt);
+
+        //OPPO
+        String sign = encryptByPrivateKey(content, privateKey);
+        System.out.println("加密之后：" + sign);
+        System.out.println(checkByPublicKey(content, sign, publicKey));
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/core/kit/WxPayKit.java b/mallplus-pay/src/main/java/com/zscat/mallplus/core/kit/WxPayKit.java
new file mode 100644
index 0000000000000000000000000000000000000000..6e88cf492b3303b91ec51f07806a927423d682b5
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/core/kit/WxPayKit.java
@@ -0,0 +1,330 @@
+package com.zscat.mallplus.core.kit;
+
+import cn.hutool.core.util.StrUtil;
+import com.zscat.mallplus.core.enums.SignType;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>微信支付工具类</p>
+ *
+ * @author Javen
+ */
+public class WxPayKit {
+    private static final String FIELD_SIGN = "sign";
+    private static final String FIELD_SIGN_TYPE = "sign_type";
+
+    public static String hmacSha256(String data, String key) {
+        return PayKit.hmacSha256(data, key);
+    }
+
+    public static String md5(String data) {
+        return PayKit.md5(data);
+    }
+
+    /**
+     * AES 解密
+     *
+     * @param base64Data 需要解密的数据
+     * @param key        密钥
+     * @return 解密后的数据
+     */
+    public static String decryptData(String base64Data, String key) {
+        return PayKit.decryptData(base64Data, key);
+    }
+
+    /**
+     * AES 加密
+     *
+     * @param data 需要加密的数据
+     * @param key  密钥
+     * @return 加密后的数据
+     */
+    public static String encryptData(String data, String key) {
+        return PayKit.encryptData(data, key);
+    }
+
+    public static String generateStr() {
+        return PayKit.generateStr();
+    }
+
+
+    /**
+     * 支付异步通知时校验 sign
+     *
+     * @param params     参数
+     * @param partnerKey 支付密钥
+     * @return {boolean}
+     */
+    public static boolean verifyNotify(Map<String, String> params, String partnerKey) {
+        String sign = params.get("sign");
+        String localSign = createSign(params, partnerKey, SignType.MD5);
+        return sign.equals(localSign);
+    }
+
+    /**
+     * 支付异步通知时校验 sign
+     *
+     * @param params     参数
+     * @param partnerKey 支付密钥
+     * @param signType   {@link SignType}
+     * @return
+     */
+    public static boolean verifyNotify(Map<String, String> params, String partnerKey, SignType signType) {
+        String sign = params.get("sign");
+        String localSign = createSign(params, partnerKey, signType);
+        return sign.equals(localSign);
+    }
+
+    /**
+     * 生成签名
+     *
+     * @param params     需要签名的参数
+     * @param partnerKey 密钥
+     * @param signType   签名类型
+     * @return 签名后的数据
+     */
+    public static String createSign(Map<String, String> params, String partnerKey, SignType signType) {
+        if (signType == null) {
+            signType = SignType.MD5;
+        }
+        // 生成签名前先去除sign
+        params.remove(FIELD_SIGN);
+        String tempStr = PayKit.createLinkString(params);
+        String stringSignTemp = tempStr + "&key=" + partnerKey;
+        if (signType == SignType.MD5) {
+            return md5(stringSignTemp).toUpperCase();
+        } else {
+            return hmacSha256(stringSignTemp, partnerKey).toUpperCase();
+        }
+    }
+
+    /**
+     * 构建签名
+     *
+     * @param params     需要签名的参数
+     * @param partnerKey 密钥
+     * @param signType   签名类型
+     * @return 签名后的 Map
+     */
+    public static Map<String, String> buildSign(Map<String, String> params, String partnerKey, SignType signType) {
+        return buildSign(params, partnerKey, signType, true);
+    }
+
+    /**
+     * 构建签名
+     *
+     * @param params       需要签名的参数
+     * @param partnerKey   密钥
+     * @param signType     签名类型
+     * @param haveSignType 签名是否包含 sign_type 字段
+     * @return 签名后的 Map
+     */
+    public static Map<String, String> buildSign(Map<String, String> params, String partnerKey, SignType signType, boolean haveSignType) {
+        if (haveSignType) {
+            params.put(FIELD_SIGN_TYPE, signType.getType());
+        }
+        String sign = createSign(params, partnerKey, signType);
+        params.put(FIELD_SIGN, sign);
+        return params;
+    }
+
+    public static StringBuilder forEachMap(Map<String, String> params, String prefix, String suffix) {
+        return PayKit.forEachMap(params, prefix, suffix);
+    }
+
+    /**
+     * 微信下单 map to xml
+     *
+     * @param params Map 参数
+     * @return xml 字符串
+     */
+    public static String toXml(Map<String, String> params) {
+        return PayKit.toXml(params);
+    }
+
+    /**
+     * 针对支付的 xml，没有嵌套节点的简单处理
+     *
+     * @param xmlStr xml 字符串
+     * @return 转化后的 Map
+     */
+    public static Map<String, String> xmlToMap(String xmlStr) {
+        return PayKit.xmlToMap(xmlStr);
+    }
+
+    /**
+     * <p>生成二维码链接</p>
+     * <p>原生支付接口模式一(扫码模式一)</p>
+     *
+     * @param sign      签名
+     * @param appId     公众账号ID
+     * @param mchId     商户号
+     * @param productId 商品ID
+     * @param timeStamp 时间戳
+     * @param nonceStr  随机字符串
+     * @return
+     */
+    public static String bizPayUrl(String sign, String appId, String mchId, String productId, String timeStamp, String nonceStr) {
+        String rules = "weixin://wxpay/bizpayurl?sign=Temp&appid=Temp&mch_id=Temp&product_id=Temp&time_stamp=Temp&nonce_str=Temp";
+        return replace(rules, "Temp", sign, appId, mchId, productId, timeStamp, nonceStr);
+    }
+
+    /**
+     * <p>生成二维码链接</p>
+     * <p>原生支付接口模式一(扫码模式一)</p>
+     *
+     * @param partnerKey 密钥
+     * @param appId      公众账号ID
+     * @param mchId      商户号
+     * @param productId  商品ID
+     * @param timeStamp  时间戳
+     * @param nonceStr   随机字符串
+     * @param signType   签名类型
+     * @return
+     */
+    public static String bizPayUrl(String partnerKey, String appId, String mchId, String productId, String timeStamp, String nonceStr, SignType signType) {
+        HashMap<String, String> map = new HashMap<String, String>(5);
+        map.put("appid", appId);
+        map.put("mch_id", mchId);
+        map.put("time_stamp", StrUtil.isEmpty(timeStamp) ? Long.toString(System.currentTimeMillis() / 1000) : timeStamp);
+        map.put("nonce_str", StrUtil.isEmpty(nonceStr) ? WxPayKit.generateStr() : nonceStr);
+        map.put("product_id", productId);
+        return bizPayUrl(createSign(map, partnerKey, signType), appId, mchId, productId, timeStamp, nonceStr);
+    }
+
+    /**
+     * <p>生成二维码链接</p>
+     * <p>原生支付接口模式一(扫码模式一)</p>
+     *
+     * @param partnerKey 密钥
+     * @param appId      公众账号ID
+     * @param mchId      商户号
+     * @param productId  商品ID
+     * @return
+     */
+    public static String bizPayUrl(String partnerKey, String appId, String mchId, String productId) {
+        String timeStamp = Long.toString(System.currentTimeMillis() / 1000);
+        String nonceStr = WxPayKit.generateStr();
+        HashMap<String, String> map = new HashMap<String, String>(5);
+        map.put("appid", appId);
+        map.put("mch_id", mchId);
+        map.put("time_stamp", timeStamp);
+        map.put("nonce_str", nonceStr);
+        map.put("product_id", productId);
+        return bizPayUrl(createSign(map, partnerKey, null), appId, mchId, productId, timeStamp, nonceStr);
+    }
+
+
+    /**
+     * 替换url中的参数
+     *
+     * @param str   原始字符串
+     * @param regex 表达式
+     * @param args  替换字符串
+     * @return {String}
+     */
+    public static String replace(String str, String regex, String... args) {
+        for (String arg : args) {
+            str = str.replaceFirst(regex, arg);
+        }
+        return str;
+    }
+
+    /**
+     * 判断接口返回的 code
+     *
+     * @param codeValue code 值
+     * @return 是否是 SUCCESS
+     */
+    public static boolean codeIsOk(String codeValue) {
+        return StrUtil.isNotEmpty(codeValue) && "SUCCESS".equals(codeValue);
+    }
+
+    /**
+     * <p>公众号支付-预付订单再次签名</p>
+     * <p>注意此处签名方式需与统一下单的签名类型一致</p>
+     *
+     * @param prepayId   预付订单号
+     * @param appId      应用编号
+     * @param partnerKey API Key
+     * @param signType   签名方式
+     * @return 再次签名后的 Map
+     */
+    public static Map<String, String> prepayIdCreateSign(String prepayId, String appId, String partnerKey, SignType signType) {
+        Map<String, String> packageParams = new HashMap<String, String>(6);
+        packageParams.put("appId", appId);
+        packageParams.put("timeStamp", String.valueOf(System.currentTimeMillis() / 1000));
+        packageParams.put("nonceStr", String.valueOf(System.currentTimeMillis()));
+        packageParams.put("package", "prepay_id=" + prepayId);
+        if (signType == null) {
+            signType = SignType.MD5;
+        }
+        packageParams.put("signType", signType.getType());
+        String packageSign = WxPayKit.createSign(packageParams, partnerKey, signType);
+        packageParams.put("paySign", packageSign);
+        return packageParams;
+    }
+
+    /**
+     * <p>APP 支付-预付订单再次签名</p>
+     * <p>注意此处签名方式需与统一下单的签名类型一致</p>
+     *
+     * @param appId      应用编号
+     * @param partnerId  商户号
+     * @param prepayId   预付订单号
+     * @param partnerKey API Key
+     * @param signType   签名方式
+     * @return 再次签名后的 Map
+     */
+    public static Map<String, String> appPrepayIdCreateSign(String appId, String partnerId, String prepayId, String partnerKey, SignType signType) {
+        Map<String, String> packageParams = new HashMap<String, String>(8);
+        packageParams.put("appid", appId);
+        packageParams.put("partnerid", partnerId);
+        packageParams.put("prepayid", prepayId);
+        packageParams.put("package", "Sign=WXPay");
+        packageParams.put("noncestr", String.valueOf(System.currentTimeMillis()));
+        packageParams.put("timestamp", String.valueOf(System.currentTimeMillis() / 1000));
+        if (signType == null) {
+            signType = SignType.MD5;
+        }
+        String packageSign = createSign(packageParams, partnerKey, signType);
+        packageParams.put("sign", packageSign);
+        return packageParams;
+    }
+
+    /**
+     * <p>小程序-预付订单再次签名</p>
+     * <p>注意此处签名方式需与统一下单的签名类型一致</p>
+     *
+     * @param appId      应用编号
+     * @param prepayId   预付订单号
+     * @param partnerKey API Key
+     * @param signType   签名方式
+     * @return 再次签名后的 Map
+     */
+    public static Map<String, String> miniAppPrepayIdCreateSign(String appId, String prepayId, String partnerKey, SignType signType) {
+        Map<String, String> packageParams = new HashMap<String, String>(6);
+        packageParams.put("appId", appId);
+        packageParams.put("timeStamp", String.valueOf(System.currentTimeMillis() / 1000));
+        packageParams.put("nonceStr", String.valueOf(System.currentTimeMillis()));
+        packageParams.put("package", "prepay_id=" + prepayId);
+        if (signType == null) {
+            signType = SignType.MD5;
+        }
+        packageParams.put("signType", signType.getType());
+        String packageSign = createSign(packageParams, partnerKey, signType);
+        packageParams.put("paySign", packageSign);
+        return packageParams;
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/core/model/BaseModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/core/model/BaseModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..e25628b0569a2202a65ec7dfb0186be76e09c21f
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/core/model/BaseModel.java
@@ -0,0 +1,104 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>Model 公用方法</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.core.model;
+
+import cn.hutool.core.util.StrUtil;
+import com.zscat.mallplus.core.enums.SignType;
+import com.zscat.mallplus.core.kit.WxPayKit;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+public class BaseModel {
+
+    /**
+     * 将建构的 builder 转为 Map
+     *
+     * @return 转化后的 Map
+     */
+    public Map<String, String> toMap() {
+        String[] fieldNames = getFiledNames(this);
+        HashMap<String, String> map = new HashMap<String, String>(fieldNames.length);
+        for (int i = 0; i < fieldNames.length; i++) {
+            String name = fieldNames[i];
+            String value = (String) getFieldValueByName(name, this);
+            if (StrUtil.isNotEmpty(value)) {
+                map.put(name, value);
+            }
+        }
+        return map;
+    }
+
+    /**
+     * 构建签名 Map
+     *
+     * @param partnerKey API KEY
+     * @param signType   {@link SignType} 签名类型
+     * @return 构建签名后的 Map
+     */
+    public Map<String, String> createSign(String partnerKey, SignType signType) {
+        return createSign(partnerKey, signType, true);
+    }
+
+    /**
+     * 构建签名 Map
+     *
+     * @param partnerKey   API KEY
+     * @param signType     {@link SignType} 签名类型
+     * @param haveSignType 签名是否包含 sign_type 字段
+     * @return 构建签名后的 Map
+     */
+    public Map<String, String> createSign(String partnerKey, SignType signType, boolean haveSignType) {
+        return WxPayKit.buildSign(toMap(), partnerKey, signType, haveSignType);
+    }
+
+    /**
+     * 获取属性名数组
+     *
+     * @param obj 对象
+     * @return 返回对象属性名数组
+     */
+    public String[] getFiledNames(Object obj) {
+        Field[] fields = obj.getClass().getDeclaredFields();
+        String[] fieldNames = new String[fields.length];
+        for (int i = 0; i < fields.length; i++) {
+            fieldNames[i] = fields[i].getName();
+        }
+        return fieldNames;
+    }
+
+    /**
+     * 根据属性名获取属性值
+     *
+     * @param fieldName 属性名称
+     * @param obj       对象
+     * @return 返回对应属性的值
+     */
+    public Object getFieldValueByName(String fieldName, Object obj) {
+        try {
+            String firstLetter = fieldName.substring(0, 1).toUpperCase();
+            String getter = new StringBuffer().append("get")
+                    .append(firstLetter)
+                    .append(fieldName.substring(1))
+                    .toString();
+            Method method = obj.getClass().getMethod(getter, new Class[]{});
+            return method.invoke(obj, new Object[]{});
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/JdPayApi.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/JdPayApi.java
new file mode 100644
index 0000000000000000000000000000000000000000..7d8131391a9d3d04bb68d0bccef59c618b7487d4
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/JdPayApi.java
@@ -0,0 +1,151 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p> 京东支付 Api</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.jdpay;
+
+
+import com.zscat.mallplus.core.kit.HttpKit;
+
+public class JdPayApi {
+    /**
+     * PC 在线支付接口
+     */
+    public static String PC_SAVE_ORDER_URL = "https://wepay.jd.com/jdpay/saveOrder";
+    /**
+     * H5 在线支付接口
+     */
+    public static String H5_SAVE_ORDER_URL = "https://h5pay.jd.com/jdpay/saveOrder";
+    /**
+     * 统一下单接口
+     */
+    public static String UNI_ORDER_URL = "https://paygate.jd.com/service/uniorder";
+    /**
+     * 商户二维码支付接口
+     */
+    public static String CUSTOMER_PAY_URL = "https://h5pay.jd.com/jdpay/customerPay";
+    /**
+     * 付款码支付接口
+     */
+    public static String FKM_PAY_URL = "https://paygate.jd.com/service/fkmPay";
+
+    /**
+     * 白条分期策略查询接口
+     */
+    public static String QUERY_BAI_TIAO_FQ_URL = "https://paygate.jd.com/service/queryBaiTiaoFQ";
+
+    /**
+     * 交易查询接口
+     */
+    public static String QUERY_ORDER_URL = "https://paygate.jd.com/service/query";
+    /**
+     * 退款申请接口
+     */
+    public static String REFUND_URL = "https://paygate.jd.com/service/refund";
+    /**
+     * 撤销申请接口
+     */
+    public static String REVOKE_URL = "https://paygate.jd.com/service/revoke";
+    /**
+     * 用户关系查询接口
+     */
+    public static String GET_USER_RELATION_URL = "https://paygate.jd.com/service/getUserRelation";
+    /**
+     * 用户关系解绑接口
+     */
+    public static String CANCEL_USER_RELATION_URL = "https://paygate.jd.com/service/cancelUserRelation";
+
+    /**
+     * 统一下单
+     *
+     * @param xml 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String uniOrder(String xml) {
+        return doPost(UNI_ORDER_URL, xml);
+    }
+
+    /**
+     * 付款码支付
+     *
+     * @param xml 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String fkmPay(String xml) {
+        return doPost(FKM_PAY_URL, xml);
+    }
+
+    /**
+     * 白条分期策略查询
+     *
+     * @param xml 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String queryBaiTiaoFq(String xml) {
+        return doPost(QUERY_BAI_TIAO_FQ_URL, xml);
+    }
+
+    /**
+     * 查询订单
+     *
+     * @param xml 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String queryOrder(String xml) {
+        return doPost(QUERY_ORDER_URL, xml);
+    }
+
+    /**
+     * 退款申请
+     *
+     * @param xml 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String refund(String xml) {
+        return doPost(REFUND_URL, xml);
+    }
+
+    /**
+     * 撤销申请
+     *
+     * @param xml 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String revoke(String xml) {
+        return doPost(REVOKE_URL, xml);
+    }
+
+    /**
+     * 查询用户关系
+     *
+     * @param xml 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String getUserRelation(String xml) {
+        return doPost(GET_USER_RELATION_URL, xml);
+    }
+
+    /**
+     * 解除用户关系
+     *
+     * @param xml 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String cancelUserRelation(String xml) {
+        return doPost(GET_USER_RELATION_URL, xml);
+    }
+
+    public static String doPost(String url, String reqXml) {
+        return HttpKit.getDelegate().post(url, reqXml);
+    }
+
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/JdPayApiConfig.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/JdPayApiConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..4b99b87b8d982ecf9ff2c7238ee89c693bf93b5f
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/JdPayApiConfig.java
@@ -0,0 +1,35 @@
+package com.zscat.mallplus.jdpay;
+
+import lombok.*;
+
+import java.io.Serializable;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、京东支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>京东支付常用配置</p>
+ *
+ * @author Javen
+ */
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class JdPayApiConfig implements Serializable {
+    private static final long serialVersionUID = -9044503427692786302L;
+
+    private String appId;
+    private String mchId;
+    private String rsaPrivateKey;
+    private String rsaPublicKey;
+    private String desKey;
+    private String domain;
+    private String certPath;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/JdPayApiConfigKit.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/JdPayApiConfigKit.java
new file mode 100644
index 0000000000000000000000000000000000000000..5229e7ba27344b22d4398c34ec5bef4ce66f92c2
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/JdPayApiConfigKit.java
@@ -0,0 +1,87 @@
+package com.zscat.mallplus.jdpay;
+
+import cn.hutool.core.util.StrUtil;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、京东支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>京东支付常用配置 Kit</p>
+ *
+ * @author Javen
+ */
+public class JdPayApiConfigKit {
+
+    private static final ThreadLocal<String> TL = new ThreadLocal<String>();
+
+    private static final Map<String, JdPayApiConfig> CFG_MAP = new ConcurrentHashMap<String, JdPayApiConfig>();
+    private static final String DEFAULT_CFG_KEY = "_default_key_";
+
+    /**
+     * 添加微信支付配置，每个appId只需添加一次，相同appId将被覆盖
+     *
+     * @param jdPayApiConfig 微信支付配置
+     * @return {WxPayApiConfig} 微信支付配置
+     */
+    public static JdPayApiConfig putApiConfig(JdPayApiConfig jdPayApiConfig) {
+        if (CFG_MAP.size() == 0) {
+            CFG_MAP.put(DEFAULT_CFG_KEY, jdPayApiConfig);
+        }
+        return CFG_MAP.put(jdPayApiConfig.getAppId(), jdPayApiConfig);
+    }
+
+    public static JdPayApiConfig setThreadLocalJdPayApiConfig(JdPayApiConfig jdPayApiConfig) {
+        if (StrUtil.isNotEmpty(jdPayApiConfig.getAppId())) {
+            setThreadLocalAppId(jdPayApiConfig.getAppId());
+        }
+        return putApiConfig(jdPayApiConfig);
+    }
+
+    public static JdPayApiConfig removeApiConfig(JdPayApiConfig jdPayApiConfig) {
+        return removeApiConfig(jdPayApiConfig.getAppId());
+    }
+
+    public static JdPayApiConfig removeApiConfig(String appId) {
+        return CFG_MAP.remove(appId);
+    }
+
+    public static void setThreadLocalAppId(String appId) {
+        if (StrUtil.isEmpty(appId)) {
+            appId = CFG_MAP.get(DEFAULT_CFG_KEY).getAppId();
+        }
+        TL.set(appId);
+    }
+
+    public static void removeThreadLocalAppId() {
+        TL.remove();
+    }
+
+    public static String getAppId() {
+        String appId = TL.get();
+        if (StrUtil.isEmpty(appId)) {
+            appId = CFG_MAP.get(DEFAULT_CFG_KEY).getAppId();
+        }
+        return appId;
+    }
+
+    public static JdPayApiConfig getJdPayApiConfig() {
+        String appId = getAppId();
+        return getApiConfig(appId);
+    }
+
+    public static JdPayApiConfig getApiConfig(String appId) {
+        JdPayApiConfig cfg = CFG_MAP.get(appId);
+        if (cfg == null) {
+            throw new IllegalStateException("需事先调用 JdPayApiConfigKit.putApiConfig(jdPayApiConfig) 将 appId 对应的 jdPayApiConfig 对象存入，才可以使用 JdPayApiConfigKit.getJdPayApiConfig() 的系列方法");
+        }
+        return cfg;
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/kit/JdPayKit.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/kit/JdPayKit.java
new file mode 100644
index 0000000000000000000000000000000000000000..71b36514bd129653f08b8fb8a5d001380c4c87c8
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/kit/JdPayKit.java
@@ -0,0 +1,162 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>京东支付 Kit</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.jdpay.kit;
+
+import cn.hutool.core.codec.Base64;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.XmlUtil;
+import cn.hutool.crypto.SecureUtil;
+import com.zscat.mallplus.core.kit.WxPayKit;
+import com.zscat.mallplus.jdpay.util.SignUtil;
+import com.zscat.mallplus.jdpay.util.ThreeDesUtil;
+import com.zscat.mallplus.jdpay.util.XmlEncryptUtil;
+import org.w3c.dom.Document;
+
+import javax.xml.xpath.XPathConstants;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class JdPayKit {
+    /**
+     * MD5 加密
+     *
+     * @param data 需要加密的数据
+     * @return 加密后的数据
+     */
+    public static String md5LowerCase(String data) {
+        return SecureUtil.md5(data).toLowerCase();
+    }
+
+    /**
+     * 请求参数 Map 转化为京东支付 xml
+     *
+     * @param params 请求参数
+     * @return
+     */
+    public static String toJdXml(Map<String, String> params) {
+        return WxPayKit.forEachMap(params, "<jdpay>", "</jdpay>").toString();
+    }
+
+    /**
+     * 请求参数签名
+     *
+     * @param rsaPrivateKey RSA 私钥
+     * @param strDesKey     DES 密钥
+     * @param genSignStr    xml 数据
+     * @return 签名后的数据
+     */
+    public static String encrypt(String rsaPrivateKey, String strDesKey, String genSignStr) {
+        return XmlEncryptUtil.encrypt(rsaPrivateKey, strDesKey, genSignStr);
+    }
+
+    /**
+     * 解密接口返回的 xml 数据
+     *
+     * @param rsaPubKey RSA 公钥
+     * @param strDesKey DES 密钥
+     * @param encrypt   加密的 xml 数据
+     * @return 解密后的数据
+     */
+    public static String decrypt(String rsaPubKey, String strDesKey, String encrypt) {
+        return XmlEncryptUtil.decrypt(rsaPubKey, strDesKey, encrypt);
+    }
+
+    /**
+     * 明文验证签名
+     *
+     * @param rsaPubKey RSA 公钥
+     * @param reqBody   xml 数据
+     * @return 明文数据
+     */
+    public static String decrypt(String rsaPubKey, String reqBody) {
+        return XmlEncryptUtil.decrypt(rsaPubKey, reqBody);
+    }
+
+    public static String signRemoveSelectedKeys(Map<String, String> map, String rsaPriKey, List<String> unSignKeyList) {
+        return SignUtil.signRemoveSelectedKeys(map, rsaPriKey, unSignKeyList);
+    }
+
+    /**
+     * 3DES加密
+     *
+     * @param desKey     DES 密钥
+     * @param sourceData 需要加密的字符串
+     * @return 加密后的字符串
+     */
+    public static String threeDesEncrypt(String desKey, String sourceData) {
+        byte[] key = Base64.decode(desKey);
+        return ThreeDesUtil.encrypt2HexStr(key, sourceData);
+    }
+
+    /**
+     * 3DES解密
+     *
+     * @param desKey     DES 密钥
+     * @param sourceData 需要解密的字符串
+     * @return 解密后的字符串
+     */
+    public static String threeDecDecrypt(String desKey, String sourceData) {
+        byte[] key = Base64.decode(desKey);
+        return ThreeDesUtil.decrypt4HexStr(key, sourceData);
+    }
+
+
+    /**
+     * <p>在线支付接口</p>
+     * <p>除了merchant（商户号）、version（版本号）、sign(签名)以外，其余字段全部采用3DES进行加密。</p>
+     *
+     * @return 转化后的 Map
+     */
+    public static Map<String, String> threeDesToMap(Map<String, String> map, String desKey) {
+
+        HashMap<String, String> tempMap = new HashMap<String, String>(map.size());
+
+        for (Map.Entry<String, String> entry : map.entrySet()) {
+            String name = entry.getKey();
+            String value = entry.getValue();
+            if (StrUtil.isNotEmpty(value)) {
+                if ("merchant".equals(name) || "version".equals(name) || "sign".equals(name)) {
+                    tempMap.put(name, value);
+                } else {
+                    tempMap.put(name, threeDesEncrypt(desKey, value));
+                }
+            }
+        }
+        return tempMap;
+    }
+
+    /**
+     * 将支付接口返回的 xml 数据转化为 Map
+     *
+     * @param xml 接口返回的 xml 数据
+     * @return 解析后的数据
+     */
+    public static Map<String, String> parseResp(String xml) {
+        if (StrUtil.isEmpty(xml)) {
+            return null;
+        }
+        Map<String, String> map = new HashMap<String, String>(3);
+        Document docResult = XmlUtil.parseXml(xml);
+        String code = (String) XmlUtil.getByXPath("//jdpay/result/code", docResult, XPathConstants.STRING);
+        String desc = (String) XmlUtil.getByXPath("//jdpay/result/desc", docResult, XPathConstants.STRING);
+        map.put("code", code);
+        map.put("desc", desc);
+        if ("000000".equals(code)) {
+            String encrypt = (String) XmlUtil.getByXPath("//jdpay/encrypt", docResult, XPathConstants.STRING);
+            map.put("encrypt", encrypt);
+        }
+        return map;
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/CustomerPayModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/CustomerPayModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..771b5d99e850ff692d2be05c27436bbb34b34b31
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/CustomerPayModel.java
@@ -0,0 +1,46 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>商户二维码支付接口 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.jdpay.model;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class CustomerPayModel extends JdBaseModel {
+    private String version;
+    private String sign;
+    private String merchant;
+    private String payMerchant;
+    private String device;
+    private String tradeNum;
+    private String tradeName;
+    private String tradeDesc;
+    private String tradeTime;
+    private String amount;
+    private String orderType;
+    private String industryCategoryCode;
+    private String currency;
+    private String note;
+    private String callbackUrl;
+    private String notifyUrl;
+    private String ip;
+    private String expireTime;
+    private String riskInfo;
+    private String goodsInfo;
+    private String bizTp;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/FkmModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/FkmModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..f2f2413cda6b6777f78e8bc5595448374f3df20a
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/FkmModel.java
@@ -0,0 +1,47 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>付款码支付接口 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.jdpay.model;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class FkmModel extends JdBaseModel {
+    private String token;
+    private String version;
+    private String merchant;
+    private String device;
+    private String tradeNum;
+    private String tradeName;
+    private String tradeDesc;
+    private String tradeTime;
+    private String amount;
+    private String industryCategoryCode;
+    private String currency;
+    private String note;
+    private String notifyUrl;
+    private String orderGoodsNum;
+    private String vendorId;
+    private String goodsInfoList;
+    private String receiverInfo;
+    private String termInfo;
+    private String payMerchant;
+    private String sign;
+    private String riskInfo;
+    private String bizTp;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/JdBaseModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/JdBaseModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..cdd27384891c972eb640658df1b862229f41a875
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/JdBaseModel.java
@@ -0,0 +1,63 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>Model 公用方法</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.jdpay.model;
+
+import cn.hutool.core.util.StrUtil;
+import com.zscat.mallplus.core.model.BaseModel;
+import com.zscat.mallplus.jdpay.kit.JdPayKit;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+public class JdBaseModel extends BaseModel {
+    /**
+     * 自动生成请求接口的 xml
+     *
+     * @param rsaPrivateKey RSA 私钥
+     * @param strDesKey     DES 密钥
+     * @param version       版本号
+     * @param merchant      商户号
+     * @return 生成的 xml 数据
+     */
+    public String genReqXml(String rsaPrivateKey, String strDesKey, String version, String merchant) {
+
+        if (StrUtil.isEmpty(version) || StrUtil.isEmpty(merchant)) {
+            throw new RuntimeException("version or merchant is empty");
+        }
+        String encrypt = JdPayKit.encrypt(rsaPrivateKey, strDesKey, JdPayKit.toJdXml(toMap()));
+        Map<String, String> requestMap = JdRequestModel.builder()
+                .version(version)
+                .merchant(merchant)
+                .encrypt(encrypt)
+                .build()
+                .toMap();
+        return JdPayKit.toJdXml(requestMap);
+    }
+
+    /**
+     * PC H5 支付创建签名
+     *
+     * @param rsaPrivateKey RSA 私钥
+     * @param strDesKey     DES 密钥
+     * @return 生成签名后的 Map
+     */
+    public Map<String, String> createSign(String rsaPrivateKey, String strDesKey) {
+        Map<String, String> map = toMap();
+        // 生成签名
+        String sign = JdPayKit.signRemoveSelectedKeys(map, rsaPrivateKey, new ArrayList<String>());
+        map.put("sign", sign);
+        // 3DES进行加密
+        return JdPayKit.threeDesToMap(map, strDesKey);
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/JdRequestModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/JdRequestModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..5beee040fa2184254f9598fb0e1c74f36d53391d
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/JdRequestModel.java
@@ -0,0 +1,28 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>请求参数 Model </p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.jdpay.model;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class JdRequestModel extends JdBaseModel {
+    private String version;
+    private String merchant;
+    private String encrypt;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/QueryBaiTiaoFqModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/QueryBaiTiaoFqModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..3e51c351b6a26e0db76f8adf81ab2c4446693e03
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/QueryBaiTiaoFqModel.java
@@ -0,0 +1,30 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>白条分期策略查询接口 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.jdpay.model;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class QueryBaiTiaoFqModel extends JdBaseModel {
+    private String version;
+    private String merchant;
+    private String tradeNum;
+    private String amount;
+    private String sign;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/QueryOrderModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/QueryOrderModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..8183ce25190fd71730dc400b15c843b5fbcfb2b0
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/QueryOrderModel.java
@@ -0,0 +1,31 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>交易查询接口 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.jdpay.model;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class QueryOrderModel extends JdBaseModel {
+    private String version;
+    private String merchant;
+    private String tradeNum;
+    private String oTradeNum;
+    private String tradeType;
+    private String sign;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/RefundModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/RefundModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..34c02ec66a2326d539d14b29ffa70f749893aa37
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/RefundModel.java
@@ -0,0 +1,38 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>退款申请接口 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.jdpay.model;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class RefundModel extends JdBaseModel {
+    private String version;
+    private String merchant;
+    private String tradeNum;
+    private String oTradeNum;
+    private String amount;
+    private String currency;
+    private String tradeTime;
+    private String notifyUrl;
+    private String note;
+    private String sign;
+    private String device;
+    private String termInfoId;
+    private String cert;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/RevokeModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/RevokeModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..5d66faebe3a1b715dc039d78944a7557456eea2c
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/RevokeModel.java
@@ -0,0 +1,35 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>撤销申请接口 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.jdpay.model;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class RevokeModel extends JdBaseModel {
+    private String version;
+    private String merchant;
+    private String tradeNum;
+    private String oTradeNum;
+    private String amount;
+    private String currency;
+    private String tradeTime;
+    private String note;
+    private String sign;
+    private String cert;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/SaveOrderModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/SaveOrderModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..8847ae05036d0816e25e71f0cdf54bf014336e5a
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/SaveOrderModel.java
@@ -0,0 +1,58 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p> 在线支付接口 </p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.jdpay.model;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class SaveOrderModel extends JdBaseModel {
+    private String version;
+    private String sign;
+    private String merchant;
+    private String payMerchant;
+    private String device;
+    private String tradeNum;
+    private String tradeName;
+    private String tradeDesc;
+    private String tradeTime;
+    private String amount;
+    private String orderType;
+    private String industryCategoryCode;
+    private String currency;
+    private String note;
+    private String callbackUrl;
+    private String notifyUrl;
+    private String ip;
+    private String specCardNo;
+    private String specId;
+    private String specName;
+    private String userId;
+    private String expireTime;
+    private String orderGoodsNum;
+    private String vendorId;
+    private String goodsInfo;
+    private String receiverInfo;
+    private String termInfo;
+    private String riskInfo;
+    private String settleCurrency;
+    private String kjInfo;
+    private String installmentNum;
+    private String preProduct;
+    private String bizTp;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/UniOrderModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/UniOrderModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..241130bcc6062a1503af3f6e723b3d65998d957f
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/UniOrderModel.java
@@ -0,0 +1,56 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p> 统一下单接口 </p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.jdpay.model;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class UniOrderModel extends JdBaseModel {
+    private String version;
+    private String sign;
+    private String merchant;
+    private String payMerchant;
+    private String device;
+    private String tradeNum;
+    private String tradeName;
+    private String tradeDesc;
+    private String tradeTime;
+    private String amount;
+    private String orderType;
+    private String industryCategoryCode;
+    private String currency;
+    private String note;
+    private String callbackUrl;
+    private String notifyUrl;
+    private String ip;
+    private String specCardNo;
+    private String specId;
+    private String specName;
+    private String tradeType;
+    private String expireTime;
+    private String orderGoodsNum;
+    private String vendorId;
+    private String goodsInfo;
+    private String receiverInfo;
+    private String termInfo;
+    private String riskInfo;
+    private String installmentNum;
+    private String preProduct;
+    private String bizTp;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/UserRelationModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/UserRelationModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..4545934bb1f9362ea4b7bd585e243aed0f997dbb
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/model/UserRelationModel.java
@@ -0,0 +1,29 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>用户关系 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.jdpay.model;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class UserRelationModel extends JdBaseModel {
+    private String version;
+    private String merchant;
+    private String userId;
+    private String sign;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/JdPayXmlUtil.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/JdPayXmlUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..2900e28ef8827d824dd87e0d112b26c00f9933a3
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/JdPayXmlUtil.java
@@ -0,0 +1,75 @@
+package com.zscat.mallplus.jdpay.util;
+
+import java.util.Scanner;
+import java.util.regex.Pattern;
+
+public class JdPayXmlUtil {
+    private static String XML_HEAD = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
+    private static String XML_JDPAY_START = "<jdpay>";
+    private static String XML_JDPAY_END = "</jdpay>";
+    private static Pattern PATTERN = Pattern.compile("\t|\r|\n");
+
+    public static String fomatXmlStr(String xml) {
+        StringBuilder formatStr = new StringBuilder();
+        Scanner scanner = new Scanner(xml);
+        scanner.useDelimiter(PATTERN);
+        while (scanner.hasNext()) {
+            formatStr.append(scanner.next().trim());
+        }
+        return formatStr.toString();
+    }
+
+
+    public static String addXmlHead(String xml) {
+        if (xml != null && !"".equals(xml) &&
+                !xml.trim().startsWith("<?xml")) {
+            xml = XML_HEAD + xml;
+        }
+
+        return xml;
+    }
+
+
+    public static String addXmlHeadAndElJdPay(String xml) {
+        if (xml != null && !"".equals(xml)) {
+            if (!xml.contains(XML_JDPAY_START)) {
+                xml = XML_JDPAY_START + xml;
+            }
+            if (!xml.contains(XML_JDPAY_END)) {
+                xml = xml + XML_JDPAY_END;
+            }
+            if (!xml.trim().startsWith("<?xml")) {
+                xml = XML_HEAD + xml;
+            }
+        }
+        return xml;
+    }
+
+
+    public static String getXmlElm(String xml, String elName) {
+        String result = "";
+        String elStart = "<" + elName + ">";
+        String elEnd = "</" + elName + ">";
+        if (xml.contains(elStart) && xml.contains(elEnd)) {
+            int from = xml.indexOf(elStart) + elStart.length();
+            int to = xml.lastIndexOf(elEnd);
+            result = xml.substring(from, to);
+        }
+        return result;
+    }
+
+
+    public static String delXmlElm(String xml, String elmName) {
+        String elStart = "<" + elmName + ">";
+        String elEnd = "</" + elmName + ">";
+        if (xml.contains(elStart) && xml.contains(elEnd)) {
+            int i1 = xml.indexOf(elStart);
+            int i2 = xml.lastIndexOf(elEnd);
+            String start = xml.substring(0, i1);
+            int length = elEnd.length();
+            String end = xml.substring(i2 + length, xml.length());
+            xml = start + end;
+        }
+        return xml;
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/RSACoder.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/RSACoder.java
new file mode 100644
index 0000000000000000000000000000000000000000..ab58b34e81d557d7e8f3287e22afc513ccb14f5c
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/RSACoder.java
@@ -0,0 +1,201 @@
+package com.zscat.mallplus.jdpay.util;
+
+import javax.crypto.Cipher;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.security.*;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.RSAPublicKey;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.HashMap;
+import java.util.Map;
+
+
+public class RSACoder extends RsaUtil {
+    public static final String KEY_ALGORITHM = "RSA";
+    public static final String KEY_ALGORITHM_DETAIL = "RSA/ECB/PKCS1Padding";
+    public static final String SIGNATURE_ALGORITHM = "MD5withRSA";
+    public static final String PUBLIC_KEY = "RSAPublicKey";
+    public static final String PRIVATE_KEY = "RSAPrivateKey";
+
+    public static String sign(byte[] data, String privateKey) throws Exception {
+        byte[] keyBytes = decryptBASE64(privateKey);
+
+
+        PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(keyBytes);
+
+
+        KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+
+
+        PrivateKey priKey = keyFactory.generatePrivate(pkcs8KeySpec);
+
+
+        Signature signature = Signature.getInstance("MD5withRSA");
+        signature.initSign(priKey);
+        signature.update(data);
+
+        return encryptBASE64(signature.sign());
+    }
+
+
+    public static boolean verify(byte[] data, String publicKey, String sign) throws Exception {
+        byte[] keyBytes = decryptBASE64(publicKey);
+
+
+        X509EncodedKeySpec keySpec = new X509EncodedKeySpec(keyBytes);
+
+
+        KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+
+
+        PublicKey pubKey = keyFactory.generatePublic(keySpec);
+
+        Signature signature = Signature.getInstance("MD5withRSA");
+        signature.initVerify(pubKey);
+        signature.update(data);
+
+
+        return signature.verify(decryptBASE64(sign));
+    }
+
+
+    public static byte[] decryptByPrivateKey(byte[] data, String key) throws Exception {
+        byte[] keyBytes = decryptBASE64(key);
+
+
+        PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(keyBytes);
+        KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+        Key privateKey = keyFactory.generatePrivate(pkcs8KeySpec);
+
+
+        Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding");
+        cipher.init(2, privateKey);
+
+        return cipher.doFinal(data);
+    }
+
+
+    public static byte[] decryptByPublicKey(byte[] data, String key) throws Exception {
+        byte[] keyBytes = decryptBASE64(key);
+
+
+        X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(keyBytes);
+        KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+        Key publicKey = keyFactory.generatePublic(x509KeySpec);
+
+
+        Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding");
+        cipher.init(2, publicKey);
+        return cipher.doFinal(data);
+    }
+
+
+    public static byte[] encryptByPublicKey(byte[] data, String key) throws Exception {
+        byte[] keyBytes = decryptBASE64(key);
+
+
+        X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(keyBytes);
+        KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+        Key publicKey = keyFactory.generatePublic(x509KeySpec);
+
+
+        Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding");
+        cipher.init(1, publicKey);
+
+        return cipher.doFinal(data);
+    }
+
+
+    public static byte[] encryptByPrivateKey(byte[] data, String key) throws Exception {
+        byte[] keyBytes = decryptBASE64(key);
+
+
+        PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(keyBytes);
+        KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+        Key privateKey = keyFactory.generatePrivate(pkcs8KeySpec);
+
+
+        Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding");
+        cipher.init(1, privateKey);
+
+        return cipher.doFinal(data);
+    }
+
+
+    public static String getPrivateKey(Map<String, Object> keyMap) throws Exception {
+        Key key = (Key) keyMap.get("RSAPrivateKey");
+
+        return encryptBASE64(key.getEncoded());
+    }
+
+
+    public static String getPublicKey(Map<String, Object> keyMap) throws Exception {
+        Key key = (Key) keyMap.get("RSAPublicKey");
+
+        return encryptBASE64(key.getEncoded());
+    }
+
+
+    public static Map<String, Object> initKey() throws Exception {
+        KeyPairGenerator keyPairGen = KeyPairGenerator.getInstance("RSA");
+        keyPairGen.initialize(1024);
+        KeyPair keyPair = keyPairGen.generateKeyPair();
+
+        RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic();
+
+        RSAPrivateKey privateKey = (RSAPrivateKey) keyPair.getPrivate();
+        Map<String, Object> keyMap = new HashMap<String, Object>(2);
+        keyMap.put("RSAPublicKey", publicKey);
+        keyMap.put("RSAPrivateKey", privateKey);
+        return keyMap;
+    }
+
+
+    public static void main(String[] args) {
+        FileOutputStream fop = null;
+
+        StringBuilder content = new StringBuilder("");
+
+
+        try {
+            for (int i = 0; i < 100; i++) {
+
+                Map<String, Object> map = initKey();
+
+
+                String pk = getPublicKey(map).replace("\r\n", "");
+                String sk = getPrivateKey(map).replace("\r\n", "");
+                content.append("publicKey:");
+                content.append(pk);
+                content.append("\n\n");
+                content.append("privateKey:");
+                content.append(sk);
+                content.append("\n\n\n");
+            }
+
+
+            File file = new File("E:/������������/������������������/key.txt");
+            fop = new FileOutputStream(file);
+
+
+            if (!file.exists()) {
+                file.createNewFile();
+            }
+
+
+            byte[] contentInBytes = content.toString().getBytes();
+
+            fop.write(contentInBytes);
+            fop.flush();
+            fop.close();
+
+            System.out.println("Done");
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/RsaUtil.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/RsaUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..6b20c1fdd7df17fc80843b2e0f394083488b6344
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/RsaUtil.java
@@ -0,0 +1,78 @@
+package com.zscat.mallplus.jdpay.util;
+
+import org.apache.commons.codec.binary.Base64;
+
+import javax.crypto.KeyGenerator;
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.ByteArrayOutputStream;
+import java.security.MessageDigest;
+
+
+public class RsaUtil {
+    public static final String KEY_MAC = "HmacMD5";
+    private static final String KEY_SHA = "SHA";
+    private static final String KEY_MD5 = "MD5";
+    private static String hexString = "0123456789ABCDEF";
+
+    public static byte[] decryptBASE64(String key) throws Exception {
+        return Base64.decodeBase64(key);
+    }
+
+
+    public static String encryptBASE64(byte[] key) throws Exception {
+        return Base64.encodeBase64String(key);
+    }
+
+
+    public static byte[] encryptMD5(byte[] data) throws Exception {
+        MessageDigest md5 = MessageDigest.getInstance("MD5");
+        md5.update(data);
+        return md5.digest();
+    }
+
+
+    public static byte[] encryptSHA(byte[] data) throws Exception {
+        MessageDigest sha = MessageDigest.getInstance("SHA");
+        sha.update(data);
+        return sha.digest();
+    }
+
+
+    public static String initMacKey() throws Exception {
+        KeyGenerator keyGenerator = KeyGenerator.getInstance("HmacMD5");
+        SecretKey secretKey = keyGenerator.generateKey();
+        return encryptBASE64(secretKey.getEncoded());
+    }
+
+
+    public static byte[] encryptHMAC(byte[] data, String key) throws Exception {
+        SecretKey secretKey = new SecretKeySpec(decryptBASE64(key), "HmacMD5");
+        Mac mac = Mac.getInstance(secretKey.getAlgorithm());
+        mac.init(secretKey);
+        return mac.doFinal(data);
+    }
+
+
+    public static String bytesToString(byte[] src) throws Exception {
+        StringBuilder stringBuilder = new StringBuilder("");
+        if (src == null || src.length <= 0) {
+            return null;
+        }
+        for (int i = 0; i < src.length; i++) {
+            int v = src[i] & 0xFF;
+            String hv = Integer.toHexString(v);
+            if (hv.length() < 2) {
+                stringBuilder.append(0);
+            }
+            stringBuilder.append(hv);
+        }
+        String bytes = stringBuilder.toString();
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(bytes.length() / 2);
+
+        for (int i = 0; i < bytes.length(); i += 2)
+            baos.write(hexString.indexOf(bytes.charAt(i)) << 4 | hexString.indexOf(bytes.charAt(i + 1)));
+        return new String(baos.toByteArray());
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/SHAUtil.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/SHAUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..75423c1ec033caede90e2090f8ad0b9ca9ebe54c
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/SHAUtil.java
@@ -0,0 +1,42 @@
+package com.zscat.mallplus.jdpay.util;
+
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class SHAUtil {
+    public static String Encrypt(String strSrc, String encName) {
+        MessageDigest md = null;
+        String strDes = null;
+        byte[] bt = new byte[0];
+        try {
+            bt = strSrc.getBytes("UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            return null;
+        }
+        try {
+            if (encName == null || encName.equals("")) {
+                encName = "SHA-256";
+            }
+            md = MessageDigest.getInstance(encName);
+            md.update(bt);
+            strDes = bytes2Hex(md.digest());
+        } catch (NoSuchAlgorithmException e) {
+            return null;
+        }
+        return strDes;
+    }
+
+    public static String bytes2Hex(byte[] bts) {
+        String des = "";
+        String tmp = null;
+        for (int i = 0; i < bts.length; i++) {
+            tmp = Integer.toHexString(bts[i] & 0xFF);
+            if (tmp.length() == 1) {
+                des = des + "0";
+            }
+            des = des + tmp;
+        }
+        return des;
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/SignUtil.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/SignUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..0a820dab9085fc1482a1b216ee752a4aec118c50
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/SignUtil.java
@@ -0,0 +1,154 @@
+package com.zscat.mallplus.jdpay.util;
+
+import org.apache.commons.codec.binary.Base64;
+
+import java.lang.reflect.Field;
+import java.util.*;
+
+public class SignUtil {
+    private static List<String> unSignKeyList = Arrays.asList(new String[]{"merchantSign", "token", "version"});
+
+    public static String sign4SelectedKeys(Object object, String rsaPriKey, List<String> signKeyList) {
+        String result = "";
+
+        try {
+            String sourceSignString = signString4SelectedKeys(object, signKeyList);
+            String sha256SourceSignString = SHAUtil.Encrypt(sourceSignString, null);
+
+            byte[] newsks = RSACoder.encryptByPrivateKey(sha256SourceSignString.getBytes("UTF-8"), rsaPriKey);
+            result = Base64.encodeBase64String(newsks);
+        } catch (Exception e) {
+            throw new RuntimeException("sign4SelectedKeys>error", e);
+        }
+        return result;
+    }
+
+
+    public static String signRemoveSelectedKeys(Object object, String rsaPriKey, List<String> signKeyList) {
+        String result = "";
+
+        try {
+            String sourceSignString = signString(object, signKeyList);
+
+            String sha256SourceSignString = SHAUtil.Encrypt(sourceSignString, null);
+
+            byte[] newK = RSACoder.encryptByPrivateKey(sha256SourceSignString.getBytes("UTF-8"), rsaPriKey);
+            result = Base64.encodeBase64String(newK);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+
+    public static String signString(Object object, List<String> unSignKeyList) throws IllegalArgumentException, IllegalAccessException {
+        TreeMap<String, Object> map = objectToMap(object);
+
+
+        StringBuilder sb = new StringBuilder();
+
+        for (String str : unSignKeyList) {
+            map.remove(str);
+        }
+
+        Iterator<Map.Entry<String, Object>> iterator = map.entrySet().iterator();
+        while (iterator.hasNext()) {
+            Map.Entry<String, Object> entry = (Map.Entry) iterator.next();
+            if (entry.getValue() == null) {
+                continue;
+            }
+            String value = (String) entry.getValue();
+            if (value.trim().length() > 0) {
+                sb.append((String) entry.getKey()).append("=").append(entry.getValue()).append("&");
+            }
+        }
+
+        String result = sb.toString();
+        if (result.endsWith("&")) {
+            result = result.substring(0, result.length() - 1);
+        }
+        return result;
+    }
+
+
+    private static String signString4SelectedKeys(Object object, List<String> signedKeyList) throws IllegalArgumentException, IllegalAccessException {
+        TreeMap<String, Object> map = objectToMap(object);
+        if (map == null || map.isEmpty() || signedKeyList == null || signedKeyList.isEmpty()) {
+            return null;
+        }
+
+        TreeMap<String, Object> signMap = new TreeMap<String, Object>();
+
+        StringBuilder sb = new StringBuilder();
+
+        for (String str : signedKeyList) {
+            Object o = map.get(str);
+            if (o != null) {
+                signMap.put(str, o);
+                continue;
+            }
+            signMap.put(str, "");
+        }
+
+
+        Iterator iterator = signMap.entrySet().iterator();
+        while (iterator.hasNext()) {
+            Map.Entry entry = (Map.Entry) iterator.next();
+            sb.append(entry.getKey() + "=" + (
+                    (entry.getValue() == null) ? "" : entry.getValue()) + "&");
+        }
+
+        String result = sb.toString();
+        if (result.endsWith("&")) {
+            result = result.substring(0, result.length() - 1);
+        }
+        return result;
+    }
+
+
+    public static TreeMap<String, Object> objectToMap(Object object) throws IllegalArgumentException, IllegalAccessException {
+        TreeMap<String, Object> map = new TreeMap<String, Object>();
+        if (object instanceof Map) {
+            Map<String, Object> objectMap = (Map) object;
+            for (String str : objectMap.keySet()) {
+                map.put(str, objectMap.get(str));
+            }
+            return map;
+        }
+
+        for (Class<?> cls = object.getClass(); cls != Object.class; cls = cls.getSuperclass()) {
+
+            Field[] fields = cls.getDeclaredFields();
+            for (Field f : fields) {
+                f.setAccessible(true);
+                map.put(f.getName(), f.get(object));
+            }
+        }
+        return map;
+    }
+
+
+    public static String sign4PCString(Object object, List<String> unSignKeyList) throws IllegalArgumentException, IllegalAccessException {
+        TreeMap<String, Object> map = objectToMap(object);
+
+        StringBuilder sb = new StringBuilder();
+
+        for (String str : unSignKeyList) {
+            map.remove(str);
+        }
+
+
+        Iterator iterator = map.entrySet().iterator();
+        while (iterator.hasNext()) {
+            Map.Entry entry = (Map.Entry) iterator.next();
+            sb.append(entry.getKey() + "=" + ((entry.getValue() == null) ? "" : entry.getValue()) + "&");
+        }
+
+        String result = sb.toString();
+        if (result.endsWith("&")) {
+            result = result.substring(0, result.length() - 1);
+        }
+
+        return result;
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/SignatureUtil.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/SignatureUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..eb6f4c95d4088619e22d3589720eaf3da519d9e7
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/SignatureUtil.java
@@ -0,0 +1,52 @@
+package com.zscat.mallplus.jdpay.util;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+
+public class SignatureUtil {
+    public static void checkArguments(Map<String, String> merchantSignMap, List<String> signKeyList, String signData, String key) {
+        if (merchantSignMap == null || merchantSignMap.isEmpty()) {
+            throw new IllegalArgumentException("Argument 'merchantSignMap' is null or empty");
+        }
+        if (signKeyList == null || signKeyList.isEmpty()) {
+            throw new IllegalArgumentException("Argument 'signKeyList' is null or empty");
+        }
+        if (signData == null || signData.isEmpty()) {
+            throw new IllegalArgumentException("Argument 'signData' is null or empty");
+        }
+        if (key == null || key.isEmpty()) {
+            throw new IllegalArgumentException("Argument 'key' is null or empty");
+        }
+    }
+
+
+    public static String generateSrcData(Map<String, String> merchantSignMap, List<String> signKeyList) {
+        TreeMap<String, Object> signMap = new TreeMap<String, Object>();
+
+        for (String str : signKeyList) {
+            Object o = merchantSignMap.get(str);
+            if (o != null) {
+                signMap.put(str, o);
+                continue;
+            }
+            signMap.put(str, "");
+        }
+
+
+        StringBuilder sb = new StringBuilder();
+        Iterator iterator = signMap.entrySet().iterator();
+        while (iterator.hasNext()) {
+            Map.Entry entry = (Map.Entry) iterator.next();
+            sb.append(entry.getKey() + "=" + ((entry.getValue() == null) ? "" : entry.getValue()) + "&");
+        }
+
+        String result = sb.toString();
+        if (result.endsWith("&")) {
+            result = result.substring(0, result.length() - 1);
+        }
+        return result;
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/ThreeDesUtil.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/ThreeDesUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..ce560c593e6b7a4ce9461741d9148fd8c8d55d25
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/ThreeDesUtil.java
@@ -0,0 +1,216 @@
+package com.zscat.mallplus.jdpay.util;
+
+import javax.crypto.Cipher;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.UnsupportedEncodingException;
+import java.security.NoSuchAlgorithmException;
+
+
+public class ThreeDesUtil {
+    public static final byte[] DEFAULT_KEY = {
+            49, 50, 51, 52, 53, 54, 55, 56, 57, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 48, 49, 50, 51, 52};
+
+
+    public static byte[] encrypt(byte[] keybyte, byte[] src) {
+        try {
+            SecretKey deskey = new SecretKeySpec(keybyte, "DESede");
+
+            Cipher c1 = Cipher.getInstance("DESede/ECB/NoPadding");
+            c1.init(1, deskey);
+            return c1.doFinal(src);
+        } catch (NoSuchAlgorithmException e1) {
+            e1.printStackTrace();
+        } catch (NoSuchPaddingException e2) {
+            e2.printStackTrace();
+        } catch (Exception e3) {
+            e3.printStackTrace();
+        }
+        return null;
+    }
+
+
+    private static byte[] decrypt(byte[] keybyte, byte[] src) {
+        try {
+            SecretKey deskey = new SecretKeySpec(keybyte, "DESede");
+
+            Cipher c1 = Cipher.getInstance("DESede/ECB/NoPadding");
+            c1.init(2, deskey);
+            return c1.doFinal(src);
+        } catch (NoSuchAlgorithmException e1) {
+            e1.printStackTrace();
+        } catch (NoSuchPaddingException e2) {
+            e2.printStackTrace();
+        } catch (Exception e3) {
+            e3.printStackTrace();
+        }
+        return null;
+    }
+
+
+    private static String byte2Hex(byte[] b) {
+        String hs = "";
+        String stmp = "";
+        for (int n = 0; n < b.length; n++) {
+            stmp = Integer.toHexString(b[n] & 0xFF);
+            if (stmp.length() == 1) {
+                hs = hs + "0" + stmp;
+            } else {
+                hs = hs + stmp;
+            }
+            if (n < b.length - 1) hs = hs + ":";
+        }
+        return hs.toUpperCase();
+    }
+
+
+    public static String encrypt2HexStr(byte[] keys, String sourceData) {
+        try {
+            byte[] source = sourceData.getBytes("UTF-8");
+            int merchantData = source.length;
+            int x = (merchantData + 4) % 8;
+            int y = (x == 0) ? 0 : (8 - x);
+            byte[] sizeByte = intToByteArray(merchantData);
+            byte[] resultByte = new byte[merchantData + 4 + y];
+            resultByte[0] = sizeByte[0];
+            resultByte[1] = sizeByte[1];
+            resultByte[2] = sizeByte[2];
+            resultByte[3] = sizeByte[3];
+            for (int i = 0; i < merchantData; i++) {
+                resultByte[4 + i] = source[i];
+            }
+            for (int i = 0; i < y; i++) {
+                resultByte[merchantData + 4 + i] = 0;
+            }
+            byte[] desdata = encrypt(keys, resultByte);
+            return bytes2Hex(desdata);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+
+            return null;
+        }
+    }
+
+
+    public static String decrypt4HexStr(byte[] keys, String data) {
+        byte[] hexSourceData = new byte[0];
+        try {
+            hexSourceData = hex2byte(data.getBytes("UTF-8"));
+            byte[] unDesResult = decrypt(keys, hexSourceData);
+            byte[] dataSizeByte = new byte[4];
+            dataSizeByte[0] = unDesResult[0];
+            dataSizeByte[1] = unDesResult[1];
+            dataSizeByte[2] = unDesResult[2];
+            dataSizeByte[3] = unDesResult[3];
+            int dsb = byteArrayToInt(dataSizeByte, 0);
+            if (dsb > 16384) {
+                throw new RuntimeException("msg over MAX_MSG_LENGTH or msg error");
+            }
+            byte[] tempData = new byte[dsb];
+            for (int i = 0; i < dsb; i++) {
+                tempData[i] = unDesResult[4 + i];
+            }
+            return hex2bin(toHexString(tempData));
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    private static String hex2bin(String hex) throws UnsupportedEncodingException {
+        String digital = "0123456789abcdef";
+        char[] hex2char = hex.toCharArray();
+        byte[] bytes = new byte[hex.length() / 2];
+
+        for (int i = 0; i < bytes.length; i++) {
+            int temp = digital.indexOf(hex2char[2 * i]) * 16;
+            temp += digital.indexOf(hex2char[2 * i + 1]);
+            bytes[i] = (byte) (temp & 0xFF);
+        }
+
+        return new String(bytes, "UTF-8");
+    }
+
+
+    private static String toHexString(byte[] ba) {
+        StringBuilder str = new StringBuilder();
+        for (int i = 0; i < ba.length; i++) {
+            str.append(String.format("%x", new Object[]{Byte.valueOf(ba[i])}));
+        }
+        return str.toString();
+    }
+
+
+    private static String bytes2Hex(byte[] bts) {
+        String des = "";
+        String tmp = null;
+        for (int i = 0; i < bts.length; i++) {
+            tmp = Integer.toHexString(bts[i] & 0xFF);
+            if (tmp.length() == 1) {
+                des = des + "0";
+            }
+            des = des + tmp;
+        }
+        return des;
+    }
+
+    public static byte[] hex2byte(byte[] b) {
+        if (b.length % 2 != 0) {
+            throw new IllegalArgumentException("长度不是偶数");
+        }
+        byte[] b2 = new byte[b.length / 2];
+        for (int n = 0; n < b.length; n += 2) {
+            String item = new String(b, n, 2);
+
+            b2[n / 2] = (byte) Integer.parseInt(item, 16);
+        }
+        b = null;
+        return b2;
+    }
+
+
+    private static byte[] intToByteArray(int i) {
+        byte[] result = new byte[4];
+        result[0] = (byte) (i >> 24 & 0xFF);
+        result[1] = (byte) (i >> 16 & 0xFF);
+        result[2] = (byte) (i >> 8 & 0xFF);
+        result[3] = (byte) (i & 0xFF);
+        return result;
+    }
+
+
+    private static int byteArrayToInt(byte[] b, int offset) {
+        int value = 0;
+        for (int i = 0; i < 4; i++) {
+            int shift = (3 - i) * 8;
+            value += ((b[i + offset] & 0xFF) << shift);
+        }
+        return value;
+    }
+
+
+    public static void main(String[] args) {
+        String szSrc = "This is a 3DES test. 测试abcdf";
+        System.out.println("加密前的字符串:" + szSrc);
+        byte[] encoded = new byte[0];
+        try {
+            System.out.println("加密前长度:" + szSrc.getBytes("UTF-8").length);
+            System.out.println("加密前HEX:" + bytes2Hex(szSrc.getBytes("UTF-8")));
+            encoded = encrypt(DEFAULT_KEY, szSrc.getBytes("UTF-8"));
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        try {
+            System.out.println("加密后长度:" + encoded.length);
+            System.out.println("加密后的字符串:" + new String(encoded, "UTF-8"));
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        byte[] srcBytes = decrypt(DEFAULT_KEY, encoded);
+
+        System.out.println("解密后HEX:" + bytes2Hex(srcBytes));
+        System.out.println("解密后的字符串:" + new String(srcBytes));
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/VerifySignatureUtl.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/VerifySignatureUtl.java
new file mode 100644
index 0000000000000000000000000000000000000000..dcd5553cbf1eaa54da00c829ed98c4363b0e1db0
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/VerifySignatureUtl.java
@@ -0,0 +1,71 @@
+package com.zscat.mallplus.jdpay.util;
+
+import org.apache.commons.codec.binary.Base64;
+
+import java.io.UnsupportedEncodingException;
+
+
+public class VerifySignatureUtl {
+
+    public static String encryptMerchant(String sourceSignString, String rsaPriKey) {
+        String result = "";
+
+        try {
+            String sha256SourceSignString = SHAUtil.Encrypt(sourceSignString, null);
+
+            byte[] newsks = RSACoder.encryptByPrivateKey(sha256SourceSignString.getBytes("UTF-8"), rsaPriKey);
+            result = Base64.encodeBase64String(newsks);
+        } catch (Exception e) {
+            throw new RuntimeException("verify signature failed.", e);
+        }
+        return result;
+    }
+
+
+    public static boolean decryptMerchant(String strSourceData, String signData, String rsaPubKey) {
+        if (signData == null || signData.isEmpty()) {
+            throw new IllegalArgumentException("Argument 'signData' is null or empty");
+        }
+        if (rsaPubKey == null || rsaPubKey.isEmpty()) {
+            throw new IllegalArgumentException("Argument 'key' is null or empty");
+        }
+
+        try {
+            String sha256SourceSignString = SHAUtil.Encrypt(strSourceData, null);
+
+            byte[] signByte = Base64.decodeBase64(signData);
+
+            byte[] decryptArr = RSACoder.decryptByPublicKey(signByte, rsaPubKey);
+
+            String decryptStr = RSACoder.bytesToString(decryptArr);
+            if (sha256SourceSignString.equals(decryptStr)) {
+                return true;
+            } else {
+                throw new RuntimeException("Signature verification failed.");
+            }
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException("verify signature failed.", e);
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new RuntimeException("verify signature failed.", e);
+        }
+    }
+
+
+    public static void main(String[] args) throws Exception {
+        String rsaPubKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+tBTL7NrtsYpAmwDVqIUECPpZTpxa6GzIfk85J/7BlchTVQQZsk/Ho/umuqNvG9lRpTD/qDhkUo6ybqsu6cDCajL1j8UppjI06m4vxWJiTSX2JnBB63/CcJ+TxSTdmwkHbIlyX4jKrryU4kgw1fZuNzQl3HKf8B169FENOTgGJQIDAQAB";
+        String rsaPriKey = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAL60FMvs2u2xikCbANWohQQI+llOnFrobMh+Tzkn/sGVyFNVBBmyT8ej+6a6o28b2VGlMP+oOGRSjrJuqy7pwMJqMvWPxSmmMjTqbi/FYmJNJfYmcEHrf8Jwn5PFJN2bCQdsiXJfiMquvJTiSDDV9m43NCXccp/wHXr0UQ05OAYlAgMBAAECgYEAhBrNeUKXmibtxblah6eYlWX+vtT0/QibKvxMtyRclw/CWO/Aymg6WerfzezmgHaDQcq0ObX3co+6KCL/1Jy7GP/Hk32BgfFpbp90PtQXGjVp03wUobJUBlGFfIxQjnIPUMT145z7aYN0u+ycz17IhA6K3M0QSn39VaOxpp37XcECQQDp6Xfj5dZ1TPcnPMRnSbARwo6fluMmCSRKffO032UOThZkE8un5nD5VhI3KCEllhB6LiIeG35CR5yf++lBUcbRAkEA0LYZnUu8WeNaHwAlKshvquiPzk3xugjum3Gld3wrY6neMSP1F84pbGumpIMnUuglWtKaWPD5anC8sAlF6qMHFQJAFAif8Q/lT0SZQm4M8D+6abr9FiQJLl/IEO06qzoa4J/FgSrE3Yt6D5DUnI6+UAbLQHulBmkaZjjV7EnaD3MekQJAJHOJabVugex5MuzdkOlMx3aylv959lnVAoUItyOSmGd0jPSQu8Wf6nWqtxTI62vsCj66Akqj5Pknmz8jXOV4OQJBANtNmkZH79AQl3heWHnFsr6pPyiZwVopHphzifjddHu3Mvu8/nwQvgXGRu+2vXeUGGhVRlw9W8YYRfNEFiQ+L3o=";
+        String sourceData = "amount=16500&callbackUrl=http://fplocal.jd.com&currency=CNY&device=111&expireTime=20190624205928&industryCategoryCode=20JD9601&ip=192.168.178.16&merchant=22318136&note={\"merchantId\":\"22318136\",\"orderIdList\":[\"100560406493366\"]}&notifyUrl=http://jdpaydemo.jd.com/asynNotify.htm&orderType=1&tradeDesc=������&tradeName=������&tradeNum=1005604093366&tradeTime=20190625144314&version=V2.0";
+
+
+        String sha256SourceSignString = SHAUtil.Encrypt(sourceData, null);
+        byte[] newsks = RSACoder.encryptByPrivateKey(sha256SourceSignString.getBytes("UTF-8"), rsaPriKey);
+        String sign = Base64.encodeBase64String(newsks);
+        System.out.println(sign);
+
+
+        boolean result = decryptMerchant(sourceData, sign, rsaPubKey);
+        System.out.println(result);
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/XmlEncryptUtil.java b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/XmlEncryptUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..caadefff5b0af8a06d8fef7266e84a3acec93b9e
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/jdpay/util/XmlEncryptUtil.java
@@ -0,0 +1,102 @@
+package com.zscat.mallplus.jdpay.util;
+
+import cn.hutool.core.util.StrUtil;
+import org.apache.commons.codec.binary.Base64;
+
+
+public class XmlEncryptUtil {
+    private static String XML_JDPAY_END = "</jdpay>";
+    private static String XML_SIGN_START = "<sign>";
+    private static String XML_SIGN_END = "</sign>";
+    private static String SIGN = "sign";
+    private static String RESULT = "result";
+
+
+    public static String encrypt(String rsaPrivateKey, String strDesKey, String genSignStr) {
+        System.out.println("genSignStr>" + genSignStr);
+        String encrypt = null;
+        if (StrUtil.isNotEmpty(rsaPrivateKey) && StrUtil.isNotEmpty(strDesKey) && StrUtil.isNotEmpty(genSignStr)) {
+
+            try {
+                genSignStr = JdPayXmlUtil.addXmlHeadAndElJdPay(genSignStr);
+
+                genSignStr = JdPayXmlUtil.fomatXmlStr(genSignStr);
+
+                genSignStr = JdPayXmlUtil.delXmlElm(genSignStr, SIGN);
+
+                String sign = VerifySignatureUtl.encryptMerchant(genSignStr, rsaPrivateKey);
+                System.out.println("sign>" + sign);
+                String data = genSignStr.substring(0, genSignStr.length() - XML_JDPAY_END.length()) + XML_SIGN_START + sign + XML_SIGN_END + XML_JDPAY_END;
+
+                encrypt = Base64.encodeBase64String(ThreeDesUtil.encrypt2HexStr(RsaUtil.decryptBASE64(strDesKey), data).getBytes("UTF-8"));
+            } catch (Exception e) {
+                throw new RuntimeException("signature failed");
+            }
+        }
+        return encrypt;
+    }
+
+    public static String decrypt(String rsaPubKey, String strDesKey, String encrypt) {
+        String reqBody = "";
+
+        try {
+            reqBody = ThreeDesUtil.decrypt4HexStr(RsaUtil.decryptBASE64(strDesKey), new String(Base64.decodeBase64(encrypt), "UTF-8"));
+
+            String inputSign = JdPayXmlUtil.getXmlElm(reqBody, SIGN);
+
+            reqBody = JdPayXmlUtil.addXmlHead(reqBody);
+
+            reqBody = JdPayXmlUtil.fomatXmlStr(reqBody);
+
+            String genSignStr = JdPayXmlUtil.delXmlElm(reqBody, SIGN);
+
+            boolean verifyResult = VerifySignatureUtl.decryptMerchant(genSignStr, inputSign, rsaPubKey);
+            if (!verifyResult) {
+                throw new RuntimeException("verify signature failed");
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("data decrypt failed");
+        }
+        return reqBody;
+    }
+
+
+    public static String decrypt(String rsaPubKey, String reqBody) {
+        String req = "";
+
+        try {
+            String inputSign = JdPayXmlUtil.getXmlElm(reqBody, SIGN);
+
+            req = JdPayXmlUtil.addXmlHead(reqBody);
+
+            req = JdPayXmlUtil.fomatXmlStr(req);
+
+            String genSignStr = JdPayXmlUtil.delXmlElm(req, SIGN);
+
+            boolean verifyResult = VerifySignatureUtl.decryptMerchant(genSignStr, inputSign, rsaPubKey);
+            if (!verifyResult) {
+                throw new RuntimeException("verify signature failed");
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("data decrypt failed");
+        }
+        return req;
+    }
+
+
+    public static void main(String[] args) {
+        String rsaPubKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3Q7knFjJBC0ZzQep5Wq3G+LcGtvPrCfUv6Wfo8Tz1rIfGvHFYjDz2z2iDCP6b5tRSePWfVjdz4O8OEdF+fQWFhJhAPNDIbT8wOALuKQ2MvpDRtZL9hOOr1K4eZNiRw2ppCXKPmi/obSf6maCP7URfhAa6rUixfcPJ5QCEaCWlteuRNYbWFRhORFGIrCOw4pULY42E2yXbgD+N7ORdNxzRZFCrdcwMyIDQ8dmFeWc17mHo/ZTxbVZxMgUQ1m3eBDc+5OGd7jiqSisohli7DvMt+VIwm1f0S5c7QtEFS0FBeul3sgLOM55mz5VlOZOdB61lDw+dh3RHf2ex6BABOb6ywIDAQAB";
+        String rsaPrivateKey = "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDdDuScWMkELRnNB6nlarcb4twa28+sJ9S/pZ+jxPPWsh8a8cViMPPbPaIMI/pvm1FJ49Z9WN3Pg7w4R0X59BYWEmEA80MhtPzA4Au4pDYy+kNG1kv2E46vUrh5k2JHDamkJco+aL+htJ/qZoI/tRF+EBrqtSLF9w8nlAIRoJaW165E1htYVGE5EUYisI7DilQtjjYTbJduAP43s5F03HNFkUKt1zAzIgNDx2YV5ZzXuYej9lPFtVnEyBRDWbd4ENz7k4Z3uOKpKKyiGWLsO8y35UjCbV/RLlztC0QVLQUF66XeyAs4znmbPlWU5k50HrWUPD52HdEd/Z7HoEAE5vrLAgMBAAECggEAbZfTmPufdPWTJAXXogh9DVM0QhCV7ci1fenzsjKTnO4j46zXaa3RR/FPZGt13l0HOPW+wdgL57Rs3Q3g0GHFjV3BP8JaltxuroSk6v5mbHGMZxMZB798bsk48fUytP0+DEY79SLjVp0A5ym5CzKOoIwFfDUfLzwkBEApommWHuOUeW12yXWa4xEttB+JAoARBgg2mhGRN0s1N6x5XWLrc0epYNs0syx58YhetQ3X77aXvgyig0haHDOG671UAB+gPCatByR3u7DgzqGDfJp9s6MXZgSp2KmfYl4JLec065XNbThMURgqKpiZgpE3Mx6EChzO9dUXExbMnbsUvf3XCQKBgQD+OU8xtdrs9Het1oaKEMwnP9xJPVIr3j7E+WIi3zhqW2IQ+4gkhvAmnsHsy/f2bM0rYckeZZWz1iWOkqzAAFnPONJiVx4jIwQ86/1s+mbX1MlreyT+9AphXadjTc1QLyAgjqWwiabiAmuFc83Ql+LEK+jLGTc9PnhVhx1Jv4dX9QKBgQDemkPuQJ7ooRGSZMjSFydRanVysTY/Ng9C74eLnLzS4t0gyKxGUFa6MHCOixOIauM5k9cuFIBEPBrl8nLOH1aMMtHV5aw5l/3XMQdTDRX6/hCc26dWolnR+Wp7+11yTTha0B3d5lQHPOZaM47+xouTa60BBCpy7+L0jCU+g5EPvwKBgQDFO3cqjPlNjxjuwJnescuBw/TGyZFfwWwXa5dskJv3P/CkVlE4bYwRmme/rDszbxP6TUI4l/196W134GmwCFWlBGOMsiQKhJc8IKacDuUNG+Qsw/xe5LzM71j3HRxl0jntqF35ycG0ZMZAYijSZZQkOCDCuUx28mlviYT6e2KopQKBgQCIFMZyYA7FJ7IWTIZ36K+glfQ2qR8AhYvO3599OdQ1F3sXD5ZBZdue9v3YJi1KuA0wpbBl+yJulE/dQtnsKDxAeNDOchlXHBOR+ecAXn+RcL+3JJCn5ZgDRPZT1NbLiWlqGtAnVycHRbOMcPh5x+aLuMeKV4Gbwgp8dTBPhx6nAQKBgAHNFHusDx5zFIkS13mlN+7rG9oDJKwr+gLp0zqGOfzLznslXGS9dze56cmWRhHQdSQBYji51Bcb5TP6Pgwv18d6M0g8NiXanIktc3OtdCw9K1lB2nZpJP0hKxkBni15wURzN5Kj0MRtPoe5vXhKF/uDu9IUwY9/x2jzJgh2o8o9";
+
+        String strDesKey = "GX/CH6HIAT2Ubtn3ZKjfYdbxa6HgSVca";
+
+
+        String param = "<jdpay><version>2.0</version><merchant>110025845001</merchant><tradeNum>201604080000055</tradeNum><tradeType>0</tradeType></jdpay>";
+        String encrypt = encrypt(rsaPrivateKey, strDesKey, param);
+        System.out.println("encrypt:" + encrypt);
+
+
+        String decrypt = decrypt(rsaPubKey, strDesKey, encrypt);
+        System.out.println("decrypt:" + decrypt);
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/QqPayApi.java b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/QqPayApi.java
new file mode 100644
index 0000000000000000000000000000000000000000..47fec1eca9e0a7c92fd9eb7d21470651338a74eb
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/QqPayApi.java
@@ -0,0 +1,299 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>QQ 钱包支付 API</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.qqpay;
+
+
+import com.zscat.mallplus.core.kit.HttpKit;
+import com.zscat.mallplus.core.kit.WxPayKit;
+
+import java.io.InputStream;
+import java.util.Map;
+
+public class QqPayApi {
+    /**
+     * 提交付款码支付
+     */
+    private static final String MICRO_PAY_URL = "https://qpay.qq.com/cgi-bin/pay/qpay_micro_pay.cgi";
+    /**
+     * 统一下单
+     */
+    private static final String UNIFIED_ORDER_URL = "https://qpay.qq.com/cgi-bin/pay/qpay_unified_order.cgi";
+
+    /**
+     * 订单查询
+     */
+    private static final String ORDER_QUERY_URL = "https://qpay.qq.com/cgi-bin/pay/qpay_order_query.cgi";
+
+    /**
+     * 关闭订单
+     */
+    private static final String CLOSE_ORDER_URL = "https://qpay.qq.com/cgi-bin/pay/qpay_close_order.cgi";
+
+    /**
+     * 撤销订单
+     */
+    private static final String ORDER_REVERSE_URL = "https://api.qpay.qq.com/cgi-bin/pay/qpay_reverse.cgi";
+
+    /**
+     * 申请退款
+     */
+    private static final String ORDER_REFUND_URL = "https://api.qpay.qq.com/cgi-bin/pay/qpay_refund.cgi";
+
+    /**
+     * 退款查询
+     */
+    private static final String REFUND_QUERY_URL = "https://qpay.qq.com/cgi-bin/pay/qpay_refund_query.cgi";
+
+    /**
+     * 对账单下载
+     */
+    private static final String DOWNLOAD_BILL_URL = "https://qpay.qq.com/cgi-bin/sp_download/qpay_mch_statement_down.cgi";
+
+    /**
+     * 创建现金红包
+     */
+    private static final String CREATE_READ_PACK_URL = "https://api.qpay.qq.com/cgi-bin/hongbao/qpay_hb_mch_send.cgi";
+    /**
+     * 查询红包详情
+     */
+    private static final String GET_HB_INFO_URL = "https://qpay.qq.com/cgi-bin/mch_query/qpay_hb_mch_list_query.cgi";
+    /**
+     * 红包对账单下载
+     */
+    private static final String DOWNLOAD_HB_BILL_URL = "https://api.qpay.qq.com/cgi-bin/hongbao/qpay_hb_mch_down_list_file.cgi";
+
+    /**
+     * 企业付款到余额
+     */
+    private static final String TRANSFER_URL = "https://api.qpay.qq.com/cgi-bin/epay/qpay_epay_b2c.cgi";
+    /**
+     * 查询企业付款
+     */
+    private static final String GET_TRANSFER_INFO_URL = "https://qpay.qq.com/cgi-bin/pay/qpay_epay_query.cgi";
+    /**
+     * 企业付款对账单下载
+     */
+    private static final String DOWNLOAD_TRANSFER_BILL_URL = "https://qpay.qq.com/cgi-bin/pay/qpay_epay_statement_down.cgi";
+
+
+    /**
+     * 提交付款码支付
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String microPay(Map<String, String> params) {
+        return doPost(MICRO_PAY_URL, params);
+    }
+
+    /**
+     * 统一下单
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String unifiedOrder(Map<String, String> params) {
+        return doPost(UNIFIED_ORDER_URL, params);
+    }
+
+    /**
+     * 订单查询
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String orderQuery(Map<String, String> params) {
+        return doPost(ORDER_QUERY_URL, params);
+    }
+
+    /**
+     * 关闭订单
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String closeOrder(Map<String, String> params) {
+        return doPost(CLOSE_ORDER_URL, params);
+    }
+
+    /**
+     * 撤销订单
+     *
+     * @param params   请求参数
+     * @param cerPath  证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String orderReverse(Map<String, String> params, String cerPath, String certPass) {
+        return doPost(ORDER_REVERSE_URL, params, cerPath, certPass);
+    }
+
+    /**
+     * 撤销订单
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String orderReverse(Map<String, String> params, InputStream certFile, String certPass) {
+        return doPost(ORDER_REVERSE_URL, params, certFile, certPass);
+    }
+
+    /**
+     * 申请退款
+     *
+     * @param params   请求参数
+     * @param cerPath  证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String orderRefund(Map<String, String> params, String cerPath, String certPass) {
+        return doPost(ORDER_REFUND_URL, params, cerPath, certPass);
+    }
+
+    /**
+     * 申请退款
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String orderRefund(Map<String, String> params, InputStream certFile, String certPass) {
+        return doPost(ORDER_REFUND_URL, params, certFile, certPass);
+    }
+
+    /**
+     * 退款查询
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String refundQuery(Map<String, String> params) {
+        return doPost(REFUND_QUERY_URL, params);
+    }
+
+    /**
+     * 对账单下载
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String downloadBill(Map<String, String> params) {
+        return doPost(DOWNLOAD_BILL_URL, params);
+    }
+
+    /**
+     * 创建现金红包
+     *
+     * @param params   请求参数
+     * @param cerPath  证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String createReadPack(Map<String, String> params, String cerPath, String certPass) {
+        return doPost(CREATE_READ_PACK_URL, params, cerPath, certPass);
+    }
+
+    /**
+     * 创建现金红包
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String createReadPack(Map<String, String> params, InputStream certFile, String certPass) {
+        return doPost(CREATE_READ_PACK_URL, params, certFile, certPass);
+    }
+
+    /**
+     * 查询红包详情
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String getHbInfo(Map<String, String> params) {
+        return doPost(GET_HB_INFO_URL, params);
+    }
+
+    /**
+     * 下载红包对账单
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String downloadHbBill(Map<String, String> params) {
+        return doPost(DOWNLOAD_HB_BILL_URL, params);
+    }
+
+
+    /**
+     * 企业付款到余额
+     *
+     * @param params   请求参数
+     * @param cerPath  证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String transfer(Map<String, String> params, String cerPath, String certPass) {
+        return doPost(TRANSFER_URL, params, cerPath, certPass);
+    }
+
+    /**
+     * 企业付款到余额
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String transfer(Map<String, String> params, InputStream certFile, String certPass) {
+        return doPost(TRANSFER_URL, params, certFile, certPass);
+    }
+
+    /**
+     * 查询企业付款
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String getTransferInfo(Map<String, String> params) {
+        return doPost(GET_TRANSFER_INFO_URL, params);
+    }
+
+    /**
+     * 下载企业付款对账单
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String downloadTransferBill(Map<String, String> params) {
+        return doPost(DOWNLOAD_TRANSFER_BILL_URL, params);
+    }
+
+
+    public static String doPost(String url, Map<String, String> params) {
+        return HttpKit.getDelegate().post(url, WxPayKit.toXml(params));
+    }
+
+    public static String doPost(String url, Map<String, String> params, String certPath, String certPass) {
+        return HttpKit.getDelegate().post(url, WxPayKit.toXml(params), certPath, certPass);
+    }
+
+    public static String doPost(String url, Map<String, String> params, InputStream certFile, String certPass) {
+        return HttpKit.getDelegate().post(url, WxPayKit.toXml(params), certFile, certPass);
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/QqPayApiConfig.java b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/QqPayApiConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..019b4846f87120badbc724427f098633a129a0dd
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/QqPayApiConfig.java
@@ -0,0 +1,36 @@
+package com.zscat.mallplus.qqpay;
+
+import lombok.*;
+
+import java.io.Serializable;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>QQ 钱包支付常用配置</p>
+ *
+ * @author Javen
+ */
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class QqPayApiConfig implements Serializable {
+    private static final long serialVersionUID = 8365822256469245771L;
+
+    private String appId;
+    private String mchId;
+    private String slAppId;
+    private String slMchId;
+    private String partnerKey;
+    private String domain;
+    private String certPath;
+    private Object exParams;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/QqPayApiConfigKit.java b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/QqPayApiConfigKit.java
new file mode 100644
index 0000000000000000000000000000000000000000..72cee97e09c33bd99f9c4d546e517dfc0f298b54
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/QqPayApiConfigKit.java
@@ -0,0 +1,87 @@
+package com.zscat.mallplus.qqpay;
+
+import cn.hutool.core.util.StrUtil;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>QQ 钱包支付常用配置 Kit</p>
+ *
+ * @author Javen
+ */
+public class QqPayApiConfigKit {
+
+    private static final ThreadLocal<String> TL = new ThreadLocal<String>();
+
+    private static final Map<String, QqPayApiConfig> CFG_MAP = new ConcurrentHashMap<String, QqPayApiConfig>();
+    private static final String DEFAULT_CFG_KEY = "_default_key_";
+
+    /**
+     * 添加微信支付配置，每个appId只需添加一次，相同appId将被覆盖
+     *
+     * @param qqPayApiConfig 微信支付配置
+     * @return {WxPayApiConfig} 微信支付配置
+     */
+    public static QqPayApiConfig putApiConfig(QqPayApiConfig qqPayApiConfig) {
+        if (CFG_MAP.size() == 0) {
+            CFG_MAP.put(DEFAULT_CFG_KEY, qqPayApiConfig);
+        }
+        return CFG_MAP.put(qqPayApiConfig.getAppId(), qqPayApiConfig);
+    }
+
+    public static QqPayApiConfig setThreadLocalQqPayApiConfig(QqPayApiConfig qqPayApiConfig) {
+        if (StrUtil.isNotEmpty(qqPayApiConfig.getAppId())) {
+            setThreadLocalAppId(qqPayApiConfig.getAppId());
+        }
+        return putApiConfig(qqPayApiConfig);
+    }
+
+    public static QqPayApiConfig removeApiConfig(QqPayApiConfig qqPayApiConfig) {
+        return removeApiConfig(qqPayApiConfig.getAppId());
+    }
+
+    public static QqPayApiConfig removeApiConfig(String appId) {
+        return CFG_MAP.remove(appId);
+    }
+
+    public static void setThreadLocalAppId(String appId) {
+        if (StrUtil.isEmpty(appId)) {
+            appId = CFG_MAP.get(DEFAULT_CFG_KEY).getAppId();
+        }
+        TL.set(appId);
+    }
+
+    public static void removeThreadLocalAppId() {
+        TL.remove();
+    }
+
+    public static String getAppId() {
+        String appId = TL.get();
+        if (StrUtil.isEmpty(appId)) {
+            appId = CFG_MAP.get(DEFAULT_CFG_KEY).getAppId();
+        }
+        return appId;
+    }
+
+    public static QqPayApiConfig getQqPayApiConfig() {
+        String appId = getAppId();
+        return getApiConfig(appId);
+    }
+
+    public static QqPayApiConfig getApiConfig(String appId) {
+        QqPayApiConfig cfg = CFG_MAP.get(appId);
+        if (cfg == null) {
+            throw new IllegalStateException("需事先调用 QqPayApiConfigKit.putApiConfig(qqPayApiConfig) 将 appId 对应的 QqPayApiConfig 对象存入，才可以使用 QqPayApiConfigKit.getQqPayApiConfig() 的系列方法");
+        }
+        return cfg;
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/CloseOrderModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/CloseOrderModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..5e9b3530986ee48c6fdacb68d5f162633daf631f
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/CloseOrderModel.java
@@ -0,0 +1,35 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>关闭订单 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.qqpay.model;
+
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class CloseOrderModel extends BaseModel {
+    private String appid;
+    private String sub_appid;
+    private String mch_id;
+    private String sub_mch_id;
+    private String nonce_str;
+    private String sign;
+    private String out_trade_no;
+    private String total_fee;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/CreateHbModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/CreateHbModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..06a25ee83a3b0c59b0236f41d4d9a711d1d6e8e9
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/CreateHbModel.java
@@ -0,0 +1,44 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>创建现金红包 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.qqpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class CreateHbModel extends BaseModel {
+    private String charset;
+    private String nonce_str;
+    private String sign;
+    private String mch_billno;
+    private String mch_id;
+    private String mch_name;
+    private String qqappid;
+    private String re_openid;
+    private String total_amount;
+    private String total_num;
+    private String wishing;
+    private String act_name;
+    private String icon_id;
+    private String banner_id;
+    private String notify_url;
+    private String not_send_msg;
+    private String min_value;
+    private String max_value;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/DownloadBillModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/DownloadBillModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..1c248237629607c038719125416f04a5295fb95e
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/DownloadBillModel.java
@@ -0,0 +1,33 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>对账单下载 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.qqpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class DownloadBillModel extends BaseModel {
+    private String appid;
+    private String mch_id;
+    private String nonce_str;
+    private String sign;
+    private String bill_date;
+    private String bill_type;
+    private String tar_type;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/DownloadHbBillModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/DownloadHbBillModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..b2ded486d2a2b0778c680e42b707a46db8531256
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/DownloadHbBillModel.java
@@ -0,0 +1,29 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>现金红包对账单下载 Model </p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.qqpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class DownloadHbBillModel extends BaseModel {
+    private String sign;
+    private String mch_id;
+    private String date;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/DownloadTransferBillModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/DownloadTransferBillModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..54a9d23754d9318ae2abc21e7a762d176ddae727
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/DownloadTransferBillModel.java
@@ -0,0 +1,30 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>企业付款对账单下载 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.qqpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class DownloadTransferBillModel extends BaseModel {
+    private String mch_id;
+    private String nonce_str;
+    private String bill_date;
+    private String sign;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/GetHbInfoModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/GetHbInfoModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..ad8b835979ec86c71a9df79bc433aa1947c97ae9
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/GetHbInfoModel.java
@@ -0,0 +1,33 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>查询红包详情 Model </p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.qqpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class GetHbInfoModel extends BaseModel {
+    private String send_type;
+    private String nonce_str;
+    private String mch_id;
+    private String mch_billno;
+    private String listid;
+    private String sub_mch_id;
+    private String sign;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/GetTransferInfoModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/GetTransferInfoModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..d42dee025826ddf5cc1c99fcddb339766d69523f
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/GetTransferInfoModel.java
@@ -0,0 +1,31 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>查询企业付款 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.qqpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class GetTransferInfoModel extends BaseModel {
+    private String mch_id;
+    private String nonce_str;
+    private String sign;
+    private String out_trade_no;
+    private String transaction_id;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/MicroPayModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/MicroPayModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..882be090a467fc115979e99115778034e6d6e865
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/MicroPayModel.java
@@ -0,0 +1,44 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>提交付款码支付 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.qqpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class MicroPayModel extends BaseModel {
+    private String appid;
+    private String sub_appid;
+    private String mch_id;
+    private String sub_mch_id;
+    private String nonce_str;
+    private String sign;
+    private String body;
+    private String attach;
+    private String out_trade_no;
+    private String fee_type;
+    private String total_fee;
+    private String spbill_create_ip;
+    private String limit_pay;
+    private String promotion_tag;
+    private String notify_url;
+    private String device_info;
+    private String auth_code;
+    private String trade_type;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/OrderQueryModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/OrderQueryModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..baca3db4deaac1464df98621df5756787909fb16
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/OrderQueryModel.java
@@ -0,0 +1,34 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>查询订单 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.qqpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class OrderQueryModel extends BaseModel {
+    private String appid;
+    private String sub_appid;
+    private String mch_id;
+    private String sub_mch_id;
+    private String nonce_str;
+    private String sign;
+    private String transaction_id;
+    private String out_trade_no;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/OrderRefundModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/OrderRefundModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..28809c7b46da904a9c20d19bed0ef0a3417f8b91
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/OrderRefundModel.java
@@ -0,0 +1,39 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>申请退款 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.qqpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class OrderRefundModel extends BaseModel {
+    private String appid;
+    private String sub_appid;
+    private String mch_id;
+    private String sub_mch_id;
+    private String nonce_str;
+    private String sign;
+    private String transaction_id;
+    private String out_trade_no;
+    private String out_refund_no;
+    private String refund_fee;
+    private String op_user_id;
+    private String op_user_passwd;
+    private String refund_account;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/OrderReverseModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/OrderReverseModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..581bb57b64b69aac56ea17d8fb1d6ba59aefb3dc
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/OrderReverseModel.java
@@ -0,0 +1,35 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>撤销订单 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.qqpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class OrderReverseModel extends BaseModel {
+    private String appid;
+    private String sub_appid;
+    private String mch_id;
+    private String sub_mch_id;
+    private String nonce_str;
+    private String sign;
+    private String out_trade_no;
+    private String op_user_id;
+    private String op_user_passwd;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/RefundQueryModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/RefundQueryModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..105ea07d9f8d9cc7948174dcf2a1ee7f1fdbd70f
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/RefundQueryModel.java
@@ -0,0 +1,36 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>退款查询 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.qqpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class RefundQueryModel extends BaseModel {
+    private String appid;
+    private String sub_appid;
+    private String mch_id;
+    private String sub_mch_id;
+    private String nonce_str;
+    private String sign;
+    private String refund_id;
+    private String out_refund_no;
+    private String transaction_id;
+    private String out_trade_no;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/TransferModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/TransferModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..7be16d62167fbba63f3ec05f75b725d91eaa8766
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/TransferModel.java
@@ -0,0 +1,44 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>企业付款到余额 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.qqpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class TransferModel extends BaseModel {
+    private String input_charset;
+    private String appid;
+    private String openid;
+    private String uin;
+    private String mch_id;
+    private String nonce_str;
+    private String sign;
+    private String out_trade_no;
+    private String fee_type;
+    private String total_fee;
+    private String memo;
+    private String check_name;
+    private String re_user_name;
+    private String check_real_name;
+    private String op_user_id;
+    private String op_user_passwd;
+    private String spbill_create_ip;
+    private String notify_url;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/UnifiedOrderModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/UnifiedOrderModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..d034260c7b26d4bad266c7abf1e4ecac76e985f4
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/qqpay/model/UnifiedOrderModel.java
@@ -0,0 +1,48 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>统一下单 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.qqpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class UnifiedOrderModel extends BaseModel {
+    private String appid;
+    private String sub_appid;
+    private String mch_id;
+    private String sub_mch_id;
+    private String nonce_str;
+    private String sign;
+    private String body;
+    private String attach;
+    private String out_trade_no;
+    private String fee_type;
+    private String total_fee;
+    private String spbill_create_ip;
+    private String time_start;
+    private String time_expire;
+    private String limit_pay;
+    private String contract_code;
+    private String promotion_tag;
+    private String trade_type;
+    private String notify_url;
+    private String device_info;
+    private String mini_app_param;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/AcpService.java b/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/AcpService.java
new file mode 100644
index 0000000000000000000000000000000000000000..8c4ede5d8e93d85b7ddd798866ee759bb1116ee2
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/AcpService.java
@@ -0,0 +1,361 @@
+package com.zscat.mallplus.unionpay;
+
+import java.io.*;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+/**
+ * @author UnionPay
+ */
+public class AcpService {
+
+    public static Map<String, String> sign(Map<String, String> reqData, String encoding) {
+        reqData = SDKUtil.filterBlank(reqData);
+        SDKUtil.sign(reqData, encoding);
+        return reqData;
+    }
+
+    public static Map<String, String> signByCertInfo(Map<String, String> reqData, String certPath, String certPwd, String encoding) {
+        reqData = SDKUtil.filterBlank(reqData);
+        SDKUtil.signByCertInfo(reqData, certPath, certPwd, encoding);
+        return reqData;
+    }
+
+    public static Map<String, String> signBySecureKey(Map<String, String> reqData, String secureKey, String encoding) {
+        reqData = SDKUtil.filterBlank(reqData);
+        SDKUtil.signBySecureKey(reqData, secureKey, encoding);
+        return reqData;
+    }
+
+    public static boolean validate(Map<String, String> rspData, String encoding) {
+        return SDKUtil.validate(rspData, encoding);
+    }
+
+    public static boolean validateBySecureKey(Map<String, String> rspData, String secureKey, String encoding) {
+        return SDKUtil.validateBySecureKey(rspData, secureKey, encoding);
+    }
+
+    public static String createAutoFormHtml(String reqUrl, Map<String, String> hiddenMap, String encoding) {
+        StringBuffer sf = new StringBuffer();
+        sf.append("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=" + encoding + "\"/></head><body>");
+        sf.append("<form id = \"pay_form\" action=\"" + reqUrl
+                + "\" method=\"post\">");
+        if (null != hiddenMap && 0 != hiddenMap.size()) {
+            Set<Entry<String, String>> set = hiddenMap.entrySet();
+            Iterator<Entry<String, String>> it = set.iterator();
+            while (it.hasNext()) {
+                Entry<String, String> ey = it.next();
+                String key = ey.getKey();
+                String value = ey.getValue();
+                sf.append("<input type=\"hidden\" name=\"" + key + "\" id=\""
+                        + key + "\" value=\"" + value + "\"/>");
+            }
+        }
+        sf.append("</form>");
+        sf.append("</body>");
+        sf.append("<script type=\"text/javascript\">");
+        sf.append("document.all.pay_form.submit();");
+        sf.append("</script>");
+        sf.append("</html>");
+        return sf.toString();
+    }
+
+
+    public static String enCodeFileContent(String filePath, String encoding) {
+        String baseFileContent = "";
+
+        File file = new File(filePath);
+        if (!file.exists()) {
+            try {
+                file.createNewFile();
+            } catch (IOException e) {
+                LogUtil.writeErrorLog(e.getMessage(), e);
+            }
+        }
+        InputStream in = null;
+        try {
+            in = new FileInputStream(file);
+            int fl = in.available();
+            if (null != in) {
+                byte[] s = new byte[fl];
+                in.read(s, 0, fl);
+                // 压缩编码.
+                baseFileContent = new String(SecureUtil.base64Encode(SDKUtil.deflater(s)), encoding);
+            }
+        } catch (Exception e) {
+            LogUtil.writeErrorLog(e.getMessage(), e);
+        } finally {
+            if (null != in) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    LogUtil.writeErrorLog(e.getMessage(), e);
+                }
+            }
+        }
+        return baseFileContent;
+    }
+
+    public static String deCodeFileContent(Map<String, String> resData, String fileDirectory, String encoding) {
+        // 解析返回文件
+        String filePath = null;
+        String fileContent = resData.get(SDKConstants.param_fileContent);
+        if (null != fileContent && !"".equals(fileContent)) {
+            FileOutputStream out = null;
+            try {
+                byte[] fileArray = SDKUtil.inflater(SecureUtil
+                        .base64Decode(fileContent.getBytes(encoding)));
+                if (SDKUtil.isEmpty(resData.get("fileName"))) {
+                    filePath = fileDirectory + File.separator + resData.get("merId")
+                            + "_" + resData.get("batchNo") + "_"
+                            + resData.get("txnTime") + ".txt";
+                } else {
+                    filePath = fileDirectory + File.separator + resData.get("fileName");
+                }
+                File file = new File(filePath);
+                if (file.exists()) {
+                    file.delete();
+                }
+                file.createNewFile();
+                out = new FileOutputStream(file);
+                out.write(fileArray, 0, fileArray.length);
+                out.flush();
+            } catch (UnsupportedEncodingException e) {
+                LogUtil.writeErrorLog(e.getMessage(), e);
+            } catch (IOException e) {
+                LogUtil.writeErrorLog(e.getMessage(), e);
+            } finally {
+                try {
+                    out.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return filePath;
+    }
+
+    public static String getFileContent(String fileContent, String encoding) {
+        String fc = "";
+        try {
+            fc = new String(SDKUtil.inflater(SecureUtil.base64Decode(fileContent.getBytes())), encoding);
+        } catch (UnsupportedEncodingException e) {
+            LogUtil.writeErrorLog(e.getMessage(), e);
+        } catch (IOException e) {
+            LogUtil.writeErrorLog(e.getMessage(), e);
+        }
+        return fc;
+    }
+
+
+    public static String getCustomerInfo(Map<String, String> customerInfoMap, String accNo, String encoding) {
+
+        if (customerInfoMap.isEmpty()) {
+            return "{}";
+        }
+        StringBuffer sf = new StringBuffer("{");
+        for (Iterator<String> it = customerInfoMap.keySet().iterator(); it.hasNext(); ) {
+            String key = it.next();
+            String value = customerInfoMap.get(key);
+            if ("pin".equals(key)) {
+                if (null == accNo || "".equals(accNo.trim())) {
+                    LogUtil.writeLog("送了密码（PIN），必须在getCustomerInfo参数中上传卡号");
+                    throw new RuntimeException("加密PIN没送卡号无法后续处理");
+                } else {
+                    value = encryptPin(accNo, value, encoding);
+                }
+            }
+            sf.append(key).append(SDKConstants.EQUAL).append(value);
+            if (it.hasNext()) {
+                sf.append(SDKConstants.AMPERSAND);
+            }
+        }
+        String customerInfo = sf.append("}").toString();
+        LogUtil.writeLog("组装的customerInfo明文：" + customerInfo);
+        try {
+            return new String(SecureUtil.base64Encode(sf.toString().getBytes(
+                    encoding)), encoding);
+        } catch (UnsupportedEncodingException e) {
+            LogUtil.writeErrorLog(e.getMessage(), e);
+        } catch (IOException e) {
+            LogUtil.writeErrorLog(e.getMessage(), e);
+        }
+        return customerInfo;
+    }
+
+    public static String getCustomerInfoWithEncrypt(Map<String, String> customerInfoMap, String accNo, String encoding) {
+        if (customerInfoMap.isEmpty()) {
+            return "{}";
+        }
+        StringBuffer sf = new StringBuffer("{");
+        //敏感信息加密域
+        StringBuffer encryptedInfoSb = new StringBuffer("");
+
+        for (Iterator<String> it = customerInfoMap.keySet().iterator(); it.hasNext(); ) {
+            String key = it.next();
+            String value = customerInfoMap.get(key);
+            if ("phoneNo".equals(key) || "cvn2".equals(key) || "expired".equals(key)) {
+                encryptedInfoSb.append(key).append(SDKConstants.EQUAL).append(value).append(SDKConstants.AMPERSAND);
+            } else {
+                if ("pin".equals(key)) {
+                    if (null == accNo || "".equals(accNo.trim())) {
+                        LogUtil.writeLog("送了密码（PIN），必须在getCustomerInfoWithEncrypt参数中上传卡号");
+                        throw new RuntimeException("加密PIN没送卡号无法后续处理");
+                    } else {
+                        value = encryptPin(accNo, value, encoding);
+                    }
+                }
+                sf.append(key).append(SDKConstants.EQUAL).append(value).append(SDKConstants.AMPERSAND);
+            }
+        }
+
+        if (!"".equals(encryptedInfoSb.toString())) {
+            //去掉最后一个&符号
+            encryptedInfoSb.setLength(encryptedInfoSb.length() - 1);
+            LogUtil.writeLog("组装的customerInfo encryptedInfo明文：" + encryptedInfoSb.toString());
+            sf.append("encryptedInfo").append(SDKConstants.EQUAL).append(encryptData(encryptedInfoSb.toString(), encoding));
+        } else {
+            sf.setLength(sf.length() - 1);
+        }
+
+        String customerInfo = sf.append("}").toString();
+        LogUtil.writeLog("组装的customerInfo明文：" + customerInfo);
+        try {
+            return new String(SecureUtil.base64Encode(sf.toString().getBytes(encoding)), encoding);
+        } catch (UnsupportedEncodingException e) {
+            LogUtil.writeErrorLog(e.getMessage(), e);
+        } catch (IOException e) {
+            LogUtil.writeErrorLog(e.getMessage(), e);
+        }
+        return customerInfo;
+    }
+
+    public static Map<String, String> parseCustomerInfo(String customerInfo, String encoding) {
+        Map<String, String> customerInfoMap = null;
+        try {
+            byte[] b = SecureUtil.base64Decode(customerInfo.getBytes(encoding));
+            String customerInfoNoBase64 = new String(b, encoding);
+            LogUtil.writeLog("解base64后===>" + customerInfoNoBase64);
+            //去掉前后的{}
+            customerInfoNoBase64 = customerInfoNoBase64.substring(1, customerInfoNoBase64.length() - 1);
+            customerInfoMap = SDKUtil.parseQString(customerInfoNoBase64);
+            if (customerInfoMap.containsKey("encryptedInfo")) {
+                String encInfoStr = customerInfoMap.get("encryptedInfo");
+                customerInfoMap.remove("encryptedInfo");
+                String encryptedInfoStr = decryptData(encInfoStr, encoding);
+                Map<String, String> encryptedInfoMap = SDKUtil.parseQString(encryptedInfoStr);
+                customerInfoMap.putAll(encryptedInfoMap);
+            }
+        } catch (UnsupportedEncodingException e) {
+            LogUtil.writeErrorLog(e.getMessage(), e);
+        } catch (IOException e) {
+            LogUtil.writeErrorLog(e.getMessage(), e);
+        }
+        return customerInfoMap;
+    }
+
+    public static Map<String, String> parseCustomerInfo(String customerInfo, String certPath, String certPwd, String encoding) {
+        Map<String, String> customerInfoMap = null;
+        try {
+            byte[] b = SecureUtil.base64Decode(customerInfo.getBytes(encoding));
+            String customerInfoNoBase64 = new String(b, encoding);
+            LogUtil.writeLog("解base64后===>" + customerInfoNoBase64);
+            //去掉前后的{}
+            customerInfoNoBase64 = customerInfoNoBase64.substring(1, customerInfoNoBase64.length() - 1);
+            customerInfoMap = SDKUtil.parseQString(customerInfoNoBase64);
+            if (customerInfoMap.containsKey("encryptedInfo")) {
+                String encInfoStr = customerInfoMap.get("encryptedInfo");
+                customerInfoMap.remove("encryptedInfo");
+                String encryptedInfoStr = decryptData(encInfoStr, certPath, certPwd, encoding);
+                Map<String, String> encryptedInfoMap = SDKUtil.parseQString(encryptedInfoStr);
+                customerInfoMap.putAll(encryptedInfoMap);
+            }
+        } catch (UnsupportedEncodingException e) {
+            LogUtil.writeErrorLog(e.getMessage(), e);
+        } catch (IOException e) {
+            LogUtil.writeErrorLog(e.getMessage(), e);
+        }
+        return customerInfoMap;
+    }
+
+    public static String encryptPin(String accNo, String pin, String encoding) {
+        return SecureUtil.encryptPin(accNo, pin, encoding, CertUtil
+                .getEncryptCertPublicKey());
+    }
+
+    public static String encryptData(String data, String encoding) {
+        return SecureUtil.encryptData(data, encoding, CertUtil
+                .getEncryptCertPublicKey());
+    }
+
+    /**
+     * 敏感信息解密，使用配置文件acp_sdk.properties解密
+     *
+     * @param base64EncryptedInfo 加密信息
+     * @param encoding            编码格式
+     * @return 解密后的明文
+     */
+    public static String decryptData(String base64EncryptedInfo, String encoding) {
+        return SecureUtil.decryptData(base64EncryptedInfo, encoding, CertUtil.getSignCertPrivateKey());
+    }
+
+    public static String decryptData(String base64EncryptedInfo, String certPath, String certPwd, String encoding) {
+        return SecureUtil.decryptData(base64EncryptedInfo, encoding, CertUtil.getSignCertPrivateKeyByStoreMap(certPath, certPwd));
+    }
+
+    public static String getEncryptCertId() {
+        return CertUtil.getEncryptCertId();
+    }
+
+    public static String base64Encode(String rawStr, String encoding) throws IOException {
+        byte[] rawByte = rawStr.getBytes(encoding);
+        return new String(SecureUtil.base64Encode(rawByte), encoding);
+    }
+
+    public static String base64Decode(String base64Str, String encoding) throws IOException {
+        byte[] rawByte = base64Str.getBytes(encoding);
+        return new String(SecureUtil.base64Decode(rawByte), encoding);
+    }
+
+
+    public static String getCardTransData(Map<String, String> cardTransDataMap, Map<String, String> requestData, String encoding) {
+        StringBuffer cardTransDataBuffer = new StringBuffer();
+
+        if (cardTransDataMap.containsKey("track2Data")) {
+            StringBuffer track2Buffer = new StringBuffer();
+            track2Buffer.append(requestData.get("merId"))
+                    .append(SDKConstants.COLON).append(requestData.get("orderId"))
+                    .append(SDKConstants.COLON).append(requestData.get("txnTime"))
+                    .append(SDKConstants.COLON).append(requestData.get("txnAmt") == null ? 0 : requestData.get("txnAmt"))
+                    .append(SDKConstants.COLON).append(cardTransDataMap.get("track2Data"));
+            cardTransDataMap.put("track2Data",
+                    AcpService.encryptData(track2Buffer.toString(), encoding));
+        }
+
+        if (cardTransDataMap.containsKey("track3Data")) {
+            StringBuffer track3Buffer = new StringBuffer();
+            track3Buffer.append(requestData.get("merId"))
+                    .append(SDKConstants.COLON).append(requestData.get("orderId"))
+                    .append(SDKConstants.COLON).append(requestData.get("txnTime"))
+                    .append(SDKConstants.COLON).append(requestData.get("txnAmt") == null ? 0 : requestData.get("txnAmt"))
+                    .append(SDKConstants.COLON).append(cardTransDataMap.get("track3Data"));
+            cardTransDataMap.put("track3Data",
+                    AcpService.encryptData(track3Buffer.toString(), encoding));
+        }
+
+        return cardTransDataBuffer.append(SDKConstants.LEFT_BRACE)
+                .append(SDKUtil.coverMap2String(cardTransDataMap))
+                .append(SDKConstants.RIGHT_BRACE).toString();
+
+    }
+
+    public static int updateEncryptCert(Map<String, String> resData, String encoding) {
+        return SDKUtil.getEncryptCert(resData, encoding);
+    }
+
+    public static int genLuHn(String number) {
+        return SecureUtil.genLuHn(number);
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/CertUtil.java b/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/CertUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..67f3ffa9c8e61adf92e14453c45841acd6a63ac5
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/CertUtil.java
@@ -0,0 +1,612 @@
+package com.zscat.mallplus.unionpay;
+
+import java.io.*;
+import java.math.BigInteger;
+import java.security.*;
+import java.security.cert.*;
+import java.security.spec.RSAPublicKeySpec;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+import static com.zscat.mallplus.unionpay.SDKConstants.UNIONPAY_CNNAME;
+import static com.zscat.mallplus.unionpay.SDKUtil.isEmpty;
+
+/**
+ * @author UnionPay
+ */
+public class CertUtil {
+    /**
+     * 商户私钥存储Map
+     */
+    private final static Map<String, KeyStore> keyStoreMap = new ConcurrentHashMap<String, KeyStore>();
+    /**
+     * 证书容器，存储对商户请求报文签名私钥证书.
+     */
+    private static KeyStore keyStore = null;
+    /**
+     * 敏感信息加密公钥证书
+     */
+    private static X509Certificate encryptCert = null;
+    /**
+     * 磁道加密公钥
+     */
+    private static PublicKey encryptTrackKey = null;
+    /**
+     * 验证银联返回报文签名证书.
+     */
+    private static X509Certificate validateCert = null;
+    /**
+     * 验签中级证书
+     */
+    private static X509Certificate middleCert = null;
+    /**
+     * 验签根证书
+     */
+    private static X509Certificate rootCert = null;
+    /**
+     * 验证银联返回报文签名的公钥证书存储Map.
+     */
+    private static Map<String, X509Certificate> certMap = new HashMap<String, X509Certificate>();
+
+    static {
+        init();
+    }
+
+    private static void init() {
+        try {
+            addProvider();//向系统添加BC provider
+            initSignCert();//初始化签名私钥证书
+            initMiddleCert();//初始化验签证书的中级证书
+            initRootCert();//初始化验签证书的根证书
+            initEncryptCert();//初始化加密公钥
+            initTrackKey();//构建磁道加密公钥
+            initValidateCertFromDir();//初始化所有的验签证书
+        } catch (Exception e) {
+            LogUtil.writeErrorLog("init失败。（如果是用对称密钥签名的可无视此异常。）", e);
+        }
+    }
+
+    private static void addProvider() {
+        if (Security.getProvider("BC") == null) {
+            LogUtil.writeLog("add BC provider");
+            Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
+        } else {
+            Security.removeProvider("BC"); //解决eclipse调试时tomcat自动重新加载时，BC存在不明原因异常的问题。
+            Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
+            LogUtil.writeLog("re-add BC provider");
+        }
+        printSysInfo();
+    }
+
+    private static void initSignCert() {
+        if (!"01".equals(SDKConfig.getConfig().getSignMethod())) {
+            LogUtil.writeLog("非rsa签名方式，不加载签名证书。");
+            return;
+        }
+        if (SDKConfig.getConfig().getSignCertPath() == null
+                || SDKConfig.getConfig().getSignCertPwd() == null
+                || SDKConfig.getConfig().getSignCertType() == null) {
+            LogUtil.writeErrorLog("WARN: " + SDKConfig.SDK_SIGNCERT_PATH + "或" + SDKConfig.SDK_SIGNCERT_PWD
+                    + "或" + SDKConfig.SDK_SIGNCERT_TYPE + "为空。 停止加载签名证书。");
+            return;
+        }
+        if (null != keyStore) {
+            keyStore = null;
+        }
+        try {
+            keyStore = getKeyInfo(SDKConfig.getConfig().getSignCertPath(),
+                    SDKConfig.getConfig().getSignCertPwd(), SDKConfig
+                            .getConfig().getSignCertType());
+            LogUtil.writeLog("InitSignCert Successful. CertId=["
+                    + getSignCertId() + "]");
+        } catch (IOException e) {
+            LogUtil.writeErrorLog("InitSignCert Error", e);
+        }
+    }
+
+    private static void initMiddleCert() {
+        LogUtil.writeLog("加载中级证书==>" + SDKConfig.getConfig().getMiddleCertPath());
+        if (!isEmpty(SDKConfig.getConfig().getMiddleCertPath())) {
+            middleCert = initCert(SDKConfig.getConfig().getMiddleCertPath());
+            LogUtil.writeLog("Load MiddleCert Successful");
+        } else {
+            LogUtil.writeLog("WARN: acpsdk.middle.path is empty");
+        }
+    }
+
+    private static void initRootCert() {
+        LogUtil.writeLog("加载根证书==>" + SDKConfig.getConfig().getRootCertPath());
+        if (!isEmpty(SDKConfig.getConfig().getRootCertPath())) {
+            rootCert = initCert(SDKConfig.getConfig().getRootCertPath());
+            LogUtil.writeLog("Load RootCert Successful");
+        } else {
+            LogUtil.writeLog("WARN: acpsdk.rootCert.path is empty");
+        }
+    }
+
+    private static void initEncryptCert() {
+        LogUtil.writeLog("加载敏感信息加密证书==>" + SDKConfig.getConfig().getEncryptCertPath());
+        if (!isEmpty(SDKConfig.getConfig().getEncryptCertPath())) {
+            encryptCert = initCert(SDKConfig.getConfig().getEncryptCertPath());
+            LogUtil.writeLog("Load EncryptCert Successful");
+        } else {
+            LogUtil.writeLog("WARN: acpsdk.encryptCert.path is empty");
+        }
+    }
+
+    private static void initTrackKey() {
+        if (!isEmpty(SDKConfig.getConfig().getEncryptTrackKeyModulus())
+                && !isEmpty(SDKConfig.getConfig().getEncryptTrackKeyExponent())) {
+            encryptTrackKey = getPublicKey(SDKConfig.getConfig().getEncryptTrackKeyModulus(),
+                    SDKConfig.getConfig().getEncryptTrackKeyExponent());
+            LogUtil.writeLog("LoadEncryptTrackKey Successful");
+        } else {
+            LogUtil.writeLog("WARN: acpsdk.encryptTrackKey.modulus or acpsdk.encryptTrackKey.exponent is empty");
+        }
+    }
+
+    private static void initValidateCertFromDir() {
+        if (!"01".equals(SDKConfig.getConfig().getSignMethod())) {
+            LogUtil.writeLog("非rsa签名方式，不加载验签证书。");
+            return;
+        }
+        certMap.clear();
+        String dir = SDKConfig.getConfig().getValidateCertDir();
+        LogUtil.writeLog("加载验证签名证书目录==>" + dir + " 注：如果请求报文中version=5.1.0那么此验签证书目录使用不到，可以不需要设置（version=5.0.0必须设置）。");
+        if (isEmpty(dir)) {
+            LogUtil.writeErrorLog("WARN: acpsdk.validateCert.dir is empty");
+            return;
+        }
+        CertificateFactory cf = null;
+        FileInputStream in = null;
+        try {
+            cf = CertificateFactory.getInstance("X.509", "BC");
+        } catch (NoSuchProviderException e) {
+            LogUtil.writeErrorLog("LoadVerifyCert Error: No BC Provider", e);
+            return;
+        } catch (CertificateException e) {
+            LogUtil.writeErrorLog("LoadVerifyCert Error", e);
+            return;
+        }
+        File fileDir = new File(dir);
+        File[] files = fileDir.listFiles(new CerFilter());
+        for (int i = 0; i < files.length; i++) {
+            File file = files[i];
+            try {
+                in = new FileInputStream(file.getAbsolutePath());
+                validateCert = (X509Certificate) cf.generateCertificate(in);
+                if (validateCert == null) {
+                    LogUtil.writeErrorLog("Load verify cert error, " + file.getAbsolutePath() + " has error cert content.");
+                    continue;
+                }
+                certMap.put(validateCert.getSerialNumber().toString(),
+                        validateCert);
+                // 打印证书加载信息,供测试阶段调试
+                LogUtil.writeLog("[" + file.getAbsolutePath() + "][CertId="
+                        + validateCert.getSerialNumber().toString() + "]");
+            } catch (CertificateException e) {
+                LogUtil.writeErrorLog("LoadVerifyCert Error", e);
+            } catch (FileNotFoundException e) {
+                LogUtil.writeErrorLog("LoadVerifyCert Error File Not Found", e);
+            } finally {
+                if (null != in) {
+                    try {
+                        in.close();
+                    } catch (IOException e) {
+                        LogUtil.writeErrorLog(e.toString());
+                    }
+                }
+            }
+        }
+        LogUtil.writeLog("LoadVerifyCert Finish");
+    }
+
+    private static void loadSignCert(String certFilePath, String certPwd) {
+        KeyStore keyStore = null;
+        try {
+            keyStore = getKeyInfo(certFilePath, certPwd, "PKCS12");
+            keyStoreMap.put(certFilePath, keyStore);
+            LogUtil.writeLog("LoadRsaCert Successful");
+        } catch (IOException e) {
+            LogUtil.writeErrorLog("LoadRsaCert Error", e);
+        }
+    }
+
+    private static X509Certificate initCert(String path) {
+        X509Certificate encryptCertTemp = null;
+        CertificateFactory cf = null;
+        FileInputStream in = null;
+        try {
+            cf = CertificateFactory.getInstance("X.509", "BC");
+            in = new FileInputStream(path);
+            encryptCertTemp = (X509Certificate) cf.generateCertificate(in);
+            // 打印证书加载信息,供测试阶段调试
+            LogUtil.writeLog("[" + path + "][CertId="
+                    + encryptCertTemp.getSerialNumber().toString() + "]");
+        } catch (CertificateException e) {
+            LogUtil.writeErrorLog("InitCert Error", e);
+        } catch (FileNotFoundException e) {
+            LogUtil.writeErrorLog("InitCert Error File Not Found", e);
+        } catch (NoSuchProviderException e) {
+            LogUtil.writeErrorLog("LoadVerifyCert Error No BC Provider", e);
+        } finally {
+            if (null != in) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    LogUtil.writeErrorLog(e.toString());
+                }
+            }
+        }
+        return encryptCertTemp;
+    }
+
+    public static PrivateKey getSignCertPrivateKey() {
+        try {
+            Enumeration<String> aliasenum = keyStore.aliases();
+            String keyAlias = null;
+            if (aliasenum.hasMoreElements()) {
+                keyAlias = aliasenum.nextElement();
+            }
+            PrivateKey privateKey = (PrivateKey) keyStore.getKey(keyAlias,
+                    SDKConfig.getConfig().getSignCertPwd().toCharArray());
+            return privateKey;
+        } catch (KeyStoreException e) {
+            LogUtil.writeErrorLog("getSignCertPrivateKey Error", e);
+            return null;
+        } catch (UnrecoverableKeyException e) {
+            LogUtil.writeErrorLog("getSignCertPrivateKey Error", e);
+            return null;
+        } catch (NoSuchAlgorithmException e) {
+            LogUtil.writeErrorLog("getSignCertPrivateKey Error", e);
+            return null;
+        }
+    }
+
+    public static PrivateKey getSignCertPrivateKeyByStoreMap(String certPath, String certPwd) {
+        if (!keyStoreMap.containsKey(certPath)) {
+            loadSignCert(certPath, certPwd);
+        }
+        try {
+            Enumeration<String> aliasenum = keyStoreMap.get(certPath)
+                    .aliases();
+            String keyAlias = null;
+            if (aliasenum.hasMoreElements()) {
+                keyAlias = aliasenum.nextElement();
+            }
+            PrivateKey privateKey = (PrivateKey) keyStoreMap.get(certPath)
+                    .getKey(keyAlias, certPwd.toCharArray());
+            return privateKey;
+        } catch (KeyStoreException e) {
+            LogUtil.writeErrorLog("getSignCertPrivateKeyByStoreMap Error", e);
+            return null;
+        } catch (UnrecoverableKeyException e) {
+            LogUtil.writeErrorLog("getSignCertPrivateKeyByStoreMap Error", e);
+            return null;
+        } catch (NoSuchAlgorithmException e) {
+            LogUtil.writeErrorLog("getSignCertPrivateKeyByStoreMap Error", e);
+            return null;
+        }
+    }
+
+    public static PublicKey getEncryptCertPublicKey() {
+        if (null == encryptCert) {
+            String path = SDKConfig.getConfig().getEncryptCertPath();
+            if (!isEmpty(path)) {
+                encryptCert = initCert(path);
+                return encryptCert.getPublicKey();
+            } else {
+                LogUtil.writeErrorLog("acpsdk.encryptCert.path is empty");
+                return null;
+            }
+        } else {
+            return encryptCert.getPublicKey();
+        }
+    }
+
+    public static void resetEncryptCertPublicKey() {
+        encryptCert = null;
+    }
+
+    public static PublicKey getEncryptTrackPublicKey() {
+        if (null == encryptTrackKey) {
+            initTrackKey();
+        }
+        return encryptTrackKey;
+    }
+
+    public static PublicKey getValidatePublicKey(String certId) {
+        X509Certificate cf = null;
+        if (certMap.containsKey(certId)) {
+            // 存在certId对应的证书对象
+            cf = certMap.get(certId);
+            return cf.getPublicKey();
+        } else {
+            // 不存在则重新Load证书文件目录
+            initValidateCertFromDir();
+            if (certMap.containsKey(certId)) {
+                // 存在certId对应的证书对象
+                cf = certMap.get(certId);
+                return cf.getPublicKey();
+            } else {
+                LogUtil.writeErrorLog("缺少certId=[" + certId + "]对应的验签证书.");
+                return null;
+            }
+        }
+    }
+
+    public static String getSignCertId() {
+        try {
+            Enumeration<String> aliasenum = keyStore.aliases();
+            String keyAlias = null;
+            if (aliasenum.hasMoreElements()) {
+                keyAlias = aliasenum.nextElement();
+            }
+            X509Certificate cert = (X509Certificate) keyStore
+                    .getCertificate(keyAlias);
+            return cert.getSerialNumber().toString();
+        } catch (Exception e) {
+            LogUtil.writeErrorLog("getSignCertId Error", e);
+            return null;
+        }
+    }
+
+    public static String getEncryptCertId() {
+        if (null == encryptCert) {
+            String path = SDKConfig.getConfig().getEncryptCertPath();
+            if (!isEmpty(path)) {
+                encryptCert = initCert(path);
+                return encryptCert.getSerialNumber().toString();
+            } else {
+                LogUtil.writeErrorLog("acpsdk.encryptCert.path is empty");
+                return null;
+            }
+        } else {
+            return encryptCert.getSerialNumber().toString();
+        }
+    }
+
+    private static KeyStore getKeyInfo(String pfxkeyfile, String keypwd, String type) throws IOException {
+        LogUtil.writeLog("加载签名证书==>" + pfxkeyfile);
+        FileInputStream fis = null;
+        try {
+            KeyStore ks = KeyStore.getInstance(type, "BC");
+            LogUtil.writeLog("Load RSA CertPath=[" + pfxkeyfile + "],Pwd=[" + keypwd + "],type=[" + type + "]");
+            fis = new FileInputStream(pfxkeyfile);
+            char[] nPassword = null;
+            nPassword = null == keypwd || "".equals(keypwd.trim()) ? null : keypwd.toCharArray();
+            if (null != ks) {
+                ks.load(fis, nPassword);
+            }
+            return ks;
+        } catch (Exception e) {
+            LogUtil.writeErrorLog("getKeyInfo Error", e);
+            return null;
+        } finally {
+            if (null != fis)
+                fis.close();
+        }
+    }
+
+    public static String getCertIdByKeyStoreMap(String certPath, String certPwd) {
+        if (!keyStoreMap.containsKey(certPath)) {
+            // 缓存中未查询到,则加载RSA证书
+            loadSignCert(certPath, certPwd);
+        }
+        return getCertIdIdByStore(keyStoreMap.get(certPath));
+    }
+
+    private static String getCertIdIdByStore(KeyStore keyStore) {
+        Enumeration<String> aliasenum = null;
+        try {
+            aliasenum = keyStore.aliases();
+            String keyAlias = null;
+            if (aliasenum.hasMoreElements()) {
+                keyAlias = aliasenum.nextElement();
+            }
+            X509Certificate cert = (X509Certificate) keyStore
+                    .getCertificate(keyAlias);
+            return cert.getSerialNumber().toString();
+        } catch (KeyStoreException e) {
+            LogUtil.writeErrorLog("getCertIdIdByStore Error", e);
+            return null;
+        }
+    }
+
+    private static PublicKey getPublicKey(String modulus, String exponent) {
+        try {
+            BigInteger b1 = new BigInteger(modulus);
+            BigInteger b2 = new BigInteger(exponent);
+            KeyFactory keyFactory = KeyFactory.getInstance("RSA", "BC");
+            RSAPublicKeySpec keySpec = new RSAPublicKeySpec(b1, b2);
+            return keyFactory.generatePublic(keySpec);
+        } catch (Exception e) {
+            LogUtil.writeErrorLog("构造RSA公钥失败：" + e);
+            return null;
+        }
+    }
+
+    public static X509Certificate genCertificateByStr(String x509CertString) {
+        X509Certificate x509Cert = null;
+        try {
+            CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
+            InputStream tIn = new ByteArrayInputStream(
+                    x509CertString.getBytes("ISO-8859-1"));
+            x509Cert = (X509Certificate) cf.generateCertificate(tIn);
+        } catch (Exception e) {
+            LogUtil.writeErrorLog("gen certificate error", e);
+        }
+        return x509Cert;
+    }
+
+    public static X509Certificate getMiddleCert() {
+        if (null == middleCert) {
+            String path = SDKConfig.getConfig().getMiddleCertPath();
+            if (!isEmpty(path)) {
+                initMiddleCert();
+            } else {
+                LogUtil.writeErrorLog(SDKConfig.SDK_MIDDLECERT_PATH + " not set in " + SDKConfig.FILE_NAME);
+                return null;
+            }
+        }
+        return middleCert;
+    }
+
+    public static X509Certificate getRootCert() {
+        if (null == rootCert) {
+            String path = SDKConfig.getConfig().getRootCertPath();
+            if (!isEmpty(path)) {
+                initRootCert();
+            } else {
+                LogUtil.writeErrorLog(SDKConfig.SDK_ROOTCERT_PATH + " not set in " + SDKConfig.FILE_NAME);
+                return null;
+            }
+        }
+        return rootCert;
+    }
+
+    private static String getIdentitiesFromCertficate(X509Certificate aCert) {
+        String tDN = aCert.getSubjectDN().toString();
+        String tPart = "";
+        if ((tDN != null)) {
+            String tSplitStr[] = tDN.substring(tDN.indexOf("CN=")).split("@");
+            if (tSplitStr != null && tSplitStr.length > 2
+                    && tSplitStr[2] != null)
+                tPart = tSplitStr[2];
+        }
+        return tPart;
+    }
+
+    private static boolean verifyCertificateChain(X509Certificate cert) {
+
+        if (null == cert) {
+            LogUtil.writeErrorLog("cert must Not null");
+            return false;
+        }
+
+        X509Certificate middleCert = CertUtil.getMiddleCert();
+        if (null == middleCert) {
+            LogUtil.writeErrorLog("middleCert must Not null");
+            return false;
+        }
+
+        X509Certificate rootCert = CertUtil.getRootCert();
+        if (null == rootCert) {
+            LogUtil.writeErrorLog("rootCert or cert must Not null");
+            return false;
+        }
+
+        try {
+
+            X509CertSelector selector = new X509CertSelector();
+            selector.setCertificate(cert);
+
+            Set<TrustAnchor> trustAnchors = new HashSet<TrustAnchor>();
+            trustAnchors.add(new TrustAnchor(rootCert, null));
+            PKIXBuilderParameters pkixParams = new PKIXBuilderParameters(
+                    trustAnchors, selector);
+
+            Set<X509Certificate> intermediateCerts = new HashSet<X509Certificate>();
+            intermediateCerts.add(rootCert);
+            intermediateCerts.add(middleCert);
+            intermediateCerts.add(cert);
+
+            pkixParams.setRevocationEnabled(false);
+
+            CertStore intermediateCertStore = CertStore.getInstance("Collection",
+                    new CollectionCertStoreParameters(intermediateCerts), "BC");
+            pkixParams.addCertStore(intermediateCertStore);
+
+            CertPathBuilder builder = CertPathBuilder.getInstance("PKIX", "BC");
+
+            @SuppressWarnings("unused")
+            PKIXCertPathBuilderResult result = (PKIXCertPathBuilderResult) builder
+                    .build(pkixParams);
+            LogUtil.writeLog("verify certificate chain succeed.");
+            return true;
+        } catch (java.security.cert.CertPathBuilderException e) {
+            LogUtil.writeErrorLog("verify certificate chain fail.", e);
+        } catch (Exception e) {
+            LogUtil.writeErrorLog("verify certificate chain exception: ", e);
+        }
+        return false;
+    }
+
+    public static boolean verifyCertificate(X509Certificate cert) {
+
+        if (null == cert) {
+            LogUtil.writeErrorLog("cert must Not null");
+            return false;
+        }
+        try {
+            cert.checkValidity();//验证有效期
+//			cert.verify(middleCert.getPublicKey());
+            if (!verifyCertificateChain(cert)) {
+                return false;
+            }
+        } catch (Exception e) {
+            LogUtil.writeErrorLog("verifyCertificate fail", e);
+            return false;
+        }
+
+        if (SDKConfig.getConfig().isIfValidateCNName()) {
+            // 验证公钥是否属于银联
+            if (!UNIONPAY_CNNAME.equals(CertUtil.getIdentitiesFromCertficate(cert))) {
+                LogUtil.writeErrorLog("cer owner is not CUP:" + CertUtil.getIdentitiesFromCertficate(cert));
+                return false;
+            }
+        } else {
+            // 验证公钥是否属于银联
+            if (!UNIONPAY_CNNAME.equals(CertUtil.getIdentitiesFromCertficate(cert))
+                    && !"00040000:SIGN".equals(CertUtil.getIdentitiesFromCertficate(cert))) {
+                LogUtil.writeErrorLog("cer owner is not CUP:" + CertUtil.getIdentitiesFromCertficate(cert));
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private static void printSysInfo() {
+        LogUtil.writeLog("================= SYS INFO begin====================");
+        LogUtil.writeLog("os_name:" + System.getProperty("os.name"));
+        LogUtil.writeLog("os_arch:" + System.getProperty("os.arch"));
+        LogUtil.writeLog("os_version:" + System.getProperty("os.version"));
+        LogUtil.writeLog("java_vm_specification_version:"
+                + System.getProperty("java.vm.specification.version"));
+        LogUtil.writeLog("java_vm_specification_vendor:"
+                + System.getProperty("java.vm.specification.vendor"));
+        LogUtil.writeLog("java_vm_specification_name:"
+                + System.getProperty("java.vm.specification.name"));
+        LogUtil.writeLog("java_vm_version:"
+                + System.getProperty("java.vm.version"));
+        LogUtil.writeLog("java_vm_name:" + System.getProperty("java.vm.name"));
+        LogUtil.writeLog("java.version:" + System.getProperty("java.version"));
+        LogUtil.writeLog("java.vm.vendor=[" + System.getProperty("java.vm.vendor") + "]");
+        LogUtil.writeLog("java.version=[" + System.getProperty("java.version") + "]");
+        printProviders();
+        LogUtil.writeLog("================= SYS INFO end=====================");
+    }
+
+    private static void printProviders() {
+        LogUtil.writeLog("Providers List:");
+        Provider[] providers = Security.getProviders();
+        for (int i = 0; i < providers.length; i++) {
+            LogUtil.writeLog(i + 1 + "." + providers[i].getName());
+        }
+    }
+
+    static class CerFilter implements FilenameFilter {
+        public boolean isCer(String name) {
+            if (name.toLowerCase().endsWith(".cer")) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        public boolean accept(File dir, String name) {
+            return isCer(name);
+        }
+    }
+
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/LogUtil.java b/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/LogUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..98ae17d12f54dda69ba81bb40c1ceb08290f9418
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/LogUtil.java
@@ -0,0 +1,60 @@
+package com.zscat.mallplus.unionpay;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * @author UnionPay
+ */
+public class LogUtil {
+
+    final static String LOG_STRING_REQ_MSG_BEGIN = "============================== SDK REQ MSG BEGIN ==============================";
+    final static String LOG_STRING_REQ_MSG_END = "==============================  SDK REQ MSG END  ==============================";
+    final static String LOG_STRING_RSP_MSG_BEGIN = "============================== SDK RSP MSG BEGIN ==============================";
+    final static String LOG_STRING_RSP_MSG_END = "==============================  SDK RSP MSG END  ==============================";
+    private final static Logger GATE_LOG = LoggerFactory.getLogger("ACP_SDK_LOG");
+    private final static Logger GATE_LOG_ERROR = LoggerFactory.getLogger("SDK_ERR_LOG");
+    private final static Logger GATE_LOG_MESSAGE = LoggerFactory.getLogger("SDK_MSG_LOG");
+
+    public static void writeLog(String cont) {
+        GATE_LOG.info(cont);
+    }
+
+    public static void writeErrorLog(String cont) {
+        GATE_LOG_ERROR.error(cont);
+    }
+
+    public static void writeErrorLog(String cont, Throwable ex) {
+        GATE_LOG_ERROR.error(cont, ex);
+    }
+
+    public static void writeMessage(String msg) {
+        GATE_LOG_MESSAGE.info(msg);
+    }
+
+    public static void printRequestLog(Map<String, String> reqParam) {
+        writeMessage(LOG_STRING_REQ_MSG_BEGIN);
+        Iterator<Entry<String, String>> it = reqParam.entrySet().iterator();
+        while (it.hasNext()) {
+            Entry<String, String> en = it.next();
+            writeMessage("[" + en.getKey() + "] = [" + en.getValue() + "]");
+        }
+        writeMessage(LOG_STRING_REQ_MSG_END);
+    }
+
+    public static void printResponseLog(String res) {
+        writeMessage(LOG_STRING_RSP_MSG_BEGIN);
+        writeMessage(res);
+        writeMessage(LOG_STRING_RSP_MSG_END);
+    }
+
+    public static void debug(String cont) {
+        if (GATE_LOG.isDebugEnabled()) {
+            GATE_LOG.debug(cont);
+        }
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/SDKConfig.java b/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/SDKConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..782ee1fc3c66fe7346850f5b31ede09e1ef98d13
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/SDKConfig.java
@@ -0,0 +1,911 @@
+package com.zscat.mallplus.unionpay;
+
+import java.io.*;
+import java.util.Properties;
+
+/**
+ * @author UnionPay
+ */
+public class SDKConfig {
+    public static final String FILE_NAME = "acp_sdk.properties";
+    /**
+     * 配置文件中的前台URL常量.
+     */
+    public static final String SDK_FRONT_URL = "acpsdk.frontTransUrl";
+    /**
+     * 配置文件中的后台URL常量.
+     */
+    public static final String SDK_BACK_URL = "acpsdk.backTransUrl";
+    /**
+     * 配置文件中的统一下单URL常量.
+     */
+    public static final String SDK_ORDER_URL = "acpsdk.orderTransUrl";
+    /**
+     * 配置文件中的单笔交易查询URL常量.
+     */
+    public static final String SDK_SIGNQ_URL = "acpsdk.singleQueryUrl";
+    /**
+     * 配置文件中的批量交易查询URL常量.
+     */
+    public static final String SDK_BATQ_URL = "acpsdk.batchQueryUrl";
+    /**
+     * 配置文件中的批量交易URL常量.
+     */
+    public static final String SDK_BATTRANS_URL = "acpsdk.batchTransUrl";
+    /**
+     * 配置文件中的文件类交易URL常量.
+     */
+    public static final String SDK_FILETRANS_URL = "acpsdk.fileTransUrl";
+    /**
+     * 配置文件中的有卡交易URL常量.
+     */
+    public static final String SDK_CARD_URL = "acpsdk.cardTransUrl";
+    /**
+     * 配置文件中的app交易URL常量.
+     */
+    public static final String SDK_APP_URL = "acpsdk.appTransUrl";
+    /**
+     * 以下缴费产品使用，其余产品用不到，无视即可
+     */
+    // 前台请求地址
+    public static final String JF_SDK_FRONT_TRANS_URL = "acpsdk.jfFrontTransUrl";
+    // 后台请求地址
+    public static final String JF_SDK_BACK_TRANS_URL = "acpsdk.jfBackTransUrl";
+    // 单笔查询请求地址
+    public static final String JF_SDK_SINGLE_QUERY_URL = "acpsdk.jfSingleQueryUrl";
+    // 有卡交易地址
+    public static final String JF_SDK_CARD_TRANS_URL = "acpsdk.jfCardTransUrl";
+    // App交易地址
+    public static final String JF_SDK_APP_TRANS_URL = "acpsdk.jfAppTransUrl";
+    // 人到人
+    public static final String QRC_BACK_TRANS_URL = "acpsdk.qrcBackTransUrl";
+    // 人到人
+    public static final String QRC_B2C_ISS_BACK_TRANS_URL = "acpsdk.qrcB2cIssBackTransUrl";
+    // 人到人
+    public static final String QRC_B2C_MER_BACK_TRANS_URL = "acpsdk.qrcB2cMerBackTransUrl";
+    /**
+     * 以下综合认证产品使用，其余产品用不到，无视即可
+     */
+    // 前台请求地址
+    public static final String ZHRZ_SDK_FRONT_TRANS_URL = "acpsdk.zhrzFrontTransUrl";
+    // 后台请求地址
+    public static final String ZHRZ_SDK_BACK_TRANS_URL = "acpsdk.zhrzBackTransUrl";
+    // 单笔查询请求地址
+    public static final String ZHRZ_SDK_SINGLE_QUERY_URL = "acpsdk.zhrzSingleQueryUrl";
+    // 有卡交易地址
+    public static final String ZHRZ_SDK_CARD_TRANS_URL = "acpsdk.zhrzCardTransUrl";
+    // App交易地址
+    public static final String ZHRZ_SDK_APP_TRANS_URL = "acpsdk.zhrzAppTransUrl";
+    // 图片识别交易地址
+    public static final String ZHRZ_SDK_FACE_TRANS_URL = "acpsdk.zhrzFaceTransUrl";
+    /**
+     * 配置文件中签名证书路径常量.
+     */
+    public static final String SDK_SIGNCERT_PATH = "acpsdk.signCert.path";
+    /**
+     * 配置文件中签名证书密码常量.
+     */
+    public static final String SDK_SIGNCERT_PWD = "acpsdk.signCert.pwd";
+    /**
+     * 配置文件中签名证书类型常量.
+     */
+    public static final String SDK_SIGNCERT_TYPE = "acpsdk.signCert.type";
+    /**
+     * 配置文件中密码加密证书路径常量.
+     */
+    public static final String SDK_ENCRYPTCERT_PATH = "acpsdk.encryptCert.path";
+    /**
+     * 配置文件中磁道加密证书路径常量.
+     */
+    public static final String SDK_ENCRYPTTRACKCERT_PATH = "acpsdk.encryptTrackCert.path";
+    /**
+     * 配置文件中磁道加密公钥模数常量.
+     */
+    public static final String SDK_ENCRYPTTRACKKEY_MODULUS = "acpsdk.encryptTrackKey.modulus";
+    /**
+     * 配置文件中磁道加密公钥指数常量.
+     */
+    public static final String SDK_ENCRYPTTRACKKEY_EXPONENT = "acpsdk.encryptTrackKey.exponent";
+    /**
+     * 配置文件中验证签名证书目录常量.
+     */
+    public static final String SDK_VALIDATECERT_DIR = "acpsdk.validateCert.dir";
+    /**
+     * 配置文件中是否加密cvn2常量.
+     */
+    public static final String SDK_CVN_ENC = "acpsdk.cvn2.enc";
+    /**
+     * 配置文件中是否加密cvn2有效期常量.
+     */
+    public static final String SDK_DATE_ENC = "acpsdk.date.enc";
+    /**
+     * 配置文件中是否加密卡号常量.
+     */
+    public static final String SDK_PAN_ENC = "acpsdk.pan.enc";
+    /**
+     * 配置文件中证书使用模式
+     */
+    public static final String SDK_SINGLEMODE = "acpsdk.singleMode";
+    /**
+     * 配置文件中安全密钥
+     */
+    public static final String SDK_SECURITYKEY = "acpsdk.secureKey";
+    /**
+     * 配置文件中根证书路径常量
+     */
+    public static final String SDK_ROOTCERT_PATH = "acpsdk.rootCert.path";
+    /**
+     * 配置文件中根证书路径常量
+     */
+    public static final String SDK_MIDDLECERT_PATH = "acpsdk.middleCert.path";
+    /**
+     * 配置是否需要验证验签证书CN，除了false之外的值都当true处理
+     */
+    public static final String SDK_IF_VALIDATE_CN_NAME = "acpsdk.ifValidateCNName";
+    /**
+     * 配置是否需要验证https证书，除了true之外的值都当false处理
+     */
+    public static final String SDK_IF_VALIDATE_REMOTE_CERT = "acpsdk.ifValidateRemoteCert";
+    /**
+     * signmethod
+     */
+    public static final String SDK_SIGN_METHOD = "acpsdk.signMethod";
+    /**
+     * version
+     */
+    public static final String SDK_VERSION = "acpsdk.version";
+    /**
+     * 后台通知地址
+     */
+    public static final String SDK_BACKURL = "acpsdk.backUrl";
+    /**
+     * 前台通知地址
+     */
+    public static final String SDK_FRONTURL = "acpsdk.frontUrl";
+    /**
+     * 前台失败通知地址
+     */
+    public static final String SDK_FRONT_FAIL_URL = "acpsdk.frontFailUrl";
+    /**
+     * 操作对象.
+     */
+    private static SDKConfig config = new SDKConfig();
+    /**
+     * 前台请求URL.
+     */
+    private String frontRequestUrl;
+    /**
+     * 后台请求URL.
+     */
+    private String backRequestUrl;
+    /**
+     * 二维码统一下单请求URL.
+     */
+    private String orderRequestUrl;
+    /**
+     * 单笔查询
+     */
+    private String singleQueryUrl;
+    /**
+     * 批量查询
+     */
+    private String batchQueryUrl;
+    /**
+     * 批量交易
+     */
+    private String batchTransUrl;
+    /**
+     * 文件传输
+     */
+    private String fileTransUrl;
+    /**
+     * 签名证书路径.
+     */
+    private String signCertPath;
+    /**
+     * 签名证书密码.
+     */
+    private String signCertPwd;
+    /**
+     * 签名证书类型.
+     */
+    private String signCertType;
+    /**
+     * 加密公钥证书路径.
+     */
+    private String encryptCertPath;
+    /**
+     * 验证签名公钥证书目录.
+     */
+    private String validateCertDir;
+    /**
+     * 按照商户代码读取指定签名证书目录.
+     */
+    private String signCertDir;
+    /**
+     * 磁道加密证书路径.
+     */
+    private String encryptTrackCertPath;
+    /**
+     * 磁道加密公钥模数.
+     */
+    private String encryptTrackKeyModulus;
+    /**
+     * 磁道加密公钥指数.
+     */
+    private String encryptTrackKeyExponent;
+    /**
+     * 有卡交易.
+     */
+    private String cardRequestUrl;
+    /**
+     * app交易
+     */
+    private String appRequestUrl;
+    /**
+     * 证书使用模式(单证书/多证书)
+     */
+    private String singleMode;
+    /**
+     * 安全密钥(SHA256和SM3计算时使用)
+     */
+    private String secureKey;
+    /**
+     * 中级证书路径
+     */
+    private String middleCertPath;
+    /**
+     * 根证书路径
+     */
+    private String rootCertPath;
+    /**
+     * 是否验证验签证书CN，除了false都验
+     */
+    private boolean ifValidateCNName = true;
+    /**
+     * 是否验证https证书，默认都不验
+     */
+    private boolean ifValidateRemoteCert = false;
+    /**
+     * signMethod，没配按01吧
+     */
+    private String signMethod = "01";
+    /**
+     * version，没配按5.0.0
+     */
+    private String version = "5.0.0";
+    /**
+     * frontUrl
+     */
+    private String frontUrl;
+    /**
+     * backUrl
+     */
+    private String backUrl;
+    /**
+     * frontFailUrl
+     */
+    private String frontFailUrl;
+    /*缴费相关地址*/
+    private String jfFrontRequestUrl;
+    private String jfBackRequestUrl;
+    private String jfSingleQueryUrl;
+    private String jfCardRequestUrl;
+    private String jfAppRequestUrl;
+    private String qrcBackTransUrl;
+    private String qrcB2cIssBackTransUrl;
+    private String qrcB2cMerBackTransUrl;
+    //综合认证
+    private String zhrzFrontRequestUrl;
+    private String zhrzBackRequestUrl;
+    private String zhrzSingleQueryUrl;
+    private String zhrzCardRequestUrl;
+    private String zhrzAppRequestUrl;
+    private String zhrzFaceRequestUrl;
+    /**
+     * 属性文件对象.
+     */
+    private Properties properties;
+
+    private SDKConfig() {
+        super();
+    }
+
+    public static SDKConfig getConfig() {
+        return config;
+    }
+
+    public void loadPropertiesFromPath(String rootPath) {
+        if (rootPath != null && !"".equals(rootPath.trim())) {
+            LogUtil.writeLog("从路径读取配置文件: " + rootPath + File.separator + FILE_NAME);
+            File file = new File(rootPath + File.separator + FILE_NAME);
+            InputStream in = null;
+            if (file.exists()) {
+                try {
+                    in = new FileInputStream(file);
+                    properties = new Properties();
+                    properties.load(in);
+                    loadProperties(properties);
+                } catch (FileNotFoundException e) {
+                    LogUtil.writeErrorLog(e.getMessage(), e);
+                } catch (IOException e) {
+                    LogUtil.writeErrorLog(e.getMessage(), e);
+                } finally {
+                    if (null != in) {
+                        try {
+                            in.close();
+                        } catch (IOException e) {
+                            LogUtil.writeErrorLog(e.getMessage(), e);
+                        }
+                    }
+                }
+            } else {
+                // 由于此时可能还没有完成LOG的加载，因此采用标准输出来打印日志信息
+                LogUtil.writeErrorLog(rootPath + FILE_NAME + "不存在,加载参数失败");
+            }
+        } else {
+            loadPropertiesFromSrc();
+        }
+
+    }
+
+    public void loadPropertiesFromSrc() {
+        InputStream in = null;
+        try {
+            LogUtil.writeLog("从classpath: " + SDKConfig.class.getClassLoader().getResource("").getPath() + " 获取属性文件" + FILE_NAME);
+            in = SDKConfig.class.getClassLoader().getResourceAsStream(FILE_NAME);
+            if (null != in) {
+                properties = new Properties();
+                try {
+                    properties.load(in);
+                } catch (IOException e) {
+                    throw e;
+                }
+            } else {
+                LogUtil.writeErrorLog(FILE_NAME + "属性文件未能在classpath指定的目录下 " + SDKConfig.class.getClassLoader().getResource("").getPath() + " 找到!");
+                return;
+            }
+            loadProperties(properties);
+        } catch (IOException e) {
+            LogUtil.writeErrorLog(e.getMessage(), e);
+        } finally {
+            if (null != in) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    LogUtil.writeErrorLog(e.getMessage(), e);
+                }
+            }
+        }
+    }
+
+    public void loadProperties(Properties pro) {
+        LogUtil.writeLog("开始从属性文件中加载配置项");
+        String value = null;
+
+        value = pro.getProperty(SDK_SIGNCERT_PATH);
+        if (!SDKUtil.isEmpty(value)) {
+            this.signCertPath = value.trim();
+            LogUtil.writeLog("配置项：私钥签名证书路径==>" + SDK_SIGNCERT_PATH + "==>" + value + " 已加载");
+        }
+        value = pro.getProperty(SDK_SIGNCERT_PWD);
+        if (!SDKUtil.isEmpty(value)) {
+            this.signCertPwd = value.trim();
+            LogUtil.writeLog("配置项：私钥签名证书密码==>" + SDK_SIGNCERT_PWD + " 已加载");
+        }
+        value = pro.getProperty(SDK_SIGNCERT_TYPE);
+        if (!SDKUtil.isEmpty(value)) {
+            this.signCertType = value.trim();
+            LogUtil.writeLog("配置项：私钥签名证书类型==>" + SDK_SIGNCERT_TYPE + "==>" + value + " 已加载");
+        }
+        value = pro.getProperty(SDK_ENCRYPTCERT_PATH);
+        if (!SDKUtil.isEmpty(value)) {
+            this.encryptCertPath = value.trim();
+            LogUtil.writeLog("配置项：敏感信息加密证书==>" + SDK_ENCRYPTCERT_PATH + "==>" + value + " 已加载");
+        }
+        value = pro.getProperty(SDK_VALIDATECERT_DIR);
+        if (!SDKUtil.isEmpty(value)) {
+            this.validateCertDir = value.trim();
+            LogUtil.writeLog("配置项：验证签名证书路径(这里配置的是目录，不要指定到公钥文件)==>" + SDK_VALIDATECERT_DIR + "==>" + value + " 已加载");
+        }
+        value = pro.getProperty(SDK_FRONT_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.frontRequestUrl = value.trim();
+        }
+        value = pro.getProperty(SDK_BACK_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.backRequestUrl = value.trim();
+        }
+        value = pro.getProperty(SDK_ORDER_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.orderRequestUrl = value.trim();
+        }
+        value = pro.getProperty(SDK_BATQ_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.batchQueryUrl = value.trim();
+        }
+        value = pro.getProperty(SDK_BATTRANS_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.batchTransUrl = value.trim();
+        }
+        value = pro.getProperty(SDK_FILETRANS_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.fileTransUrl = value.trim();
+        }
+        value = pro.getProperty(SDK_SIGNQ_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.singleQueryUrl = value.trim();
+        }
+        value = pro.getProperty(SDK_CARD_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.cardRequestUrl = value.trim();
+        }
+        value = pro.getProperty(SDK_APP_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.appRequestUrl = value.trim();
+        }
+        value = pro.getProperty(SDK_ENCRYPTTRACKCERT_PATH);
+        if (!SDKUtil.isEmpty(value)) {
+            this.encryptTrackCertPath = value.trim();
+        }
+
+        value = pro.getProperty(SDK_SECURITYKEY);
+        if (!SDKUtil.isEmpty(value)) {
+            this.secureKey = value.trim();
+        }
+        value = pro.getProperty(SDK_ROOTCERT_PATH);
+        if (!SDKUtil.isEmpty(value)) {
+            this.rootCertPath = value.trim();
+        }
+        value = pro.getProperty(SDK_MIDDLECERT_PATH);
+        if (!SDKUtil.isEmpty(value)) {
+            this.middleCertPath = value.trim();
+        }
+
+        /**缴费部分**/
+        value = pro.getProperty(JF_SDK_FRONT_TRANS_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.jfFrontRequestUrl = value.trim();
+        }
+
+        value = pro.getProperty(JF_SDK_BACK_TRANS_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.jfBackRequestUrl = value.trim();
+        }
+
+        value = pro.getProperty(JF_SDK_SINGLE_QUERY_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.jfSingleQueryUrl = value.trim();
+        }
+
+        value = pro.getProperty(JF_SDK_CARD_TRANS_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.jfCardRequestUrl = value.trim();
+        }
+
+        value = pro.getProperty(JF_SDK_APP_TRANS_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.jfAppRequestUrl = value.trim();
+        }
+
+        value = pro.getProperty(QRC_BACK_TRANS_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.qrcBackTransUrl = value.trim();
+        }
+
+        value = pro.getProperty(QRC_B2C_ISS_BACK_TRANS_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.qrcB2cIssBackTransUrl = value.trim();
+        }
+
+        value = pro.getProperty(QRC_B2C_MER_BACK_TRANS_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.qrcB2cMerBackTransUrl = value.trim();
+        }
+
+        /**综合认证**/
+        value = pro.getProperty(ZHRZ_SDK_FRONT_TRANS_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.zhrzFrontRequestUrl = value.trim();
+        }
+
+        value = pro.getProperty(ZHRZ_SDK_BACK_TRANS_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.zhrzBackRequestUrl = value.trim();
+        }
+
+        value = pro.getProperty(ZHRZ_SDK_SINGLE_QUERY_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.zhrzSingleQueryUrl = value.trim();
+        }
+
+        value = pro.getProperty(ZHRZ_SDK_CARD_TRANS_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.zhrzCardRequestUrl = value.trim();
+        }
+
+        value = pro.getProperty(ZHRZ_SDK_APP_TRANS_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.zhrzAppRequestUrl = value.trim();
+        }
+
+        value = pro.getProperty(ZHRZ_SDK_FACE_TRANS_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.zhrzFaceRequestUrl = value.trim();
+        }
+
+        value = pro.getProperty(SDK_ENCRYPTTRACKKEY_EXPONENT);
+        if (!SDKUtil.isEmpty(value)) {
+            this.encryptTrackKeyExponent = value.trim();
+        }
+
+        value = pro.getProperty(SDK_ENCRYPTTRACKKEY_MODULUS);
+        if (!SDKUtil.isEmpty(value)) {
+            this.encryptTrackKeyModulus = value.trim();
+        }
+
+        value = pro.getProperty(SDK_IF_VALIDATE_CN_NAME);
+        if (!SDKUtil.isEmpty(value)) {
+            if (SDKConstants.FALSE_STRING.equals(value.trim()))
+                this.ifValidateCNName = false;
+        }
+
+        value = pro.getProperty(SDK_IF_VALIDATE_REMOTE_CERT);
+        if (!SDKUtil.isEmpty(value)) {
+            if (SDKConstants.TRUE_STRING.equals(value.trim()))
+                this.ifValidateRemoteCert = true;
+        }
+
+        value = pro.getProperty(SDK_SIGN_METHOD);
+        if (!SDKUtil.isEmpty(value)) {
+            this.signMethod = value.trim();
+        }
+
+        value = pro.getProperty(SDK_SIGN_METHOD);
+        if (!SDKUtil.isEmpty(value)) {
+            this.signMethod = value.trim();
+        }
+        value = pro.getProperty(SDK_VERSION);
+        if (!SDKUtil.isEmpty(value)) {
+            this.version = value.trim();
+        }
+        value = pro.getProperty(SDK_FRONTURL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.frontUrl = value.trim();
+        }
+        value = pro.getProperty(SDK_BACKURL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.backUrl = value.trim();
+        }
+        value = pro.getProperty(SDK_FRONT_FAIL_URL);
+        if (!SDKUtil.isEmpty(value)) {
+            this.frontFailUrl = value.trim();
+        }
+    }
+
+
+    public String getFrontRequestUrl() {
+        return frontRequestUrl;
+    }
+
+    public void setFrontRequestUrl(String frontRequestUrl) {
+        this.frontRequestUrl = frontRequestUrl;
+    }
+
+    public String getBackRequestUrl() {
+        return backRequestUrl;
+    }
+
+    public void setBackRequestUrl(String backRequestUrl) {
+        this.backRequestUrl = backRequestUrl;
+    }
+
+    public String getOrderRequestUrl() {
+        return orderRequestUrl;
+    }
+
+    public void setOrderRequestUrl(String orderRequestUrl) {
+        this.orderRequestUrl = orderRequestUrl;
+    }
+
+    public String getSignCertPath() {
+        return signCertPath;
+    }
+
+    public void setSignCertPath(String signCertPath) {
+        this.signCertPath = signCertPath;
+    }
+
+    public String getSignCertPwd() {
+        return signCertPwd;
+    }
+
+    public void setSignCertPwd(String signCertPwd) {
+        this.signCertPwd = signCertPwd;
+    }
+
+    public String getSignCertType() {
+        return signCertType;
+    }
+
+    public void setSignCertType(String signCertType) {
+        this.signCertType = signCertType;
+    }
+
+    public String getEncryptCertPath() {
+        return encryptCertPath;
+    }
+
+    public void setEncryptCertPath(String encryptCertPath) {
+        this.encryptCertPath = encryptCertPath;
+    }
+
+    public String getValidateCertDir() {
+        return validateCertDir;
+    }
+
+    public void setValidateCertDir(String validateCertDir) {
+        this.validateCertDir = validateCertDir;
+    }
+
+    public String getSingleQueryUrl() {
+        return singleQueryUrl;
+    }
+
+    public void setSingleQueryUrl(String singleQueryUrl) {
+        this.singleQueryUrl = singleQueryUrl;
+    }
+
+    public String getBatchQueryUrl() {
+        return batchQueryUrl;
+    }
+
+    public void setBatchQueryUrl(String batchQueryUrl) {
+        this.batchQueryUrl = batchQueryUrl;
+    }
+
+    public String getBatchTransUrl() {
+        return batchTransUrl;
+    }
+
+    public void setBatchTransUrl(String batchTransUrl) {
+        this.batchTransUrl = batchTransUrl;
+    }
+
+    public String getFileTransUrl() {
+        return fileTransUrl;
+    }
+
+    public void setFileTransUrl(String fileTransUrl) {
+        this.fileTransUrl = fileTransUrl;
+    }
+
+    public String getSignCertDir() {
+        return signCertDir;
+    }
+
+    public void setSignCertDir(String signCertDir) {
+        this.signCertDir = signCertDir;
+    }
+
+    public Properties getProperties() {
+        return properties;
+    }
+
+    public void setProperties(Properties properties) {
+        this.properties = properties;
+    }
+
+    public String getCardRequestUrl() {
+        return cardRequestUrl;
+    }
+
+    public void setCardRequestUrl(String cardRequestUrl) {
+        this.cardRequestUrl = cardRequestUrl;
+    }
+
+    public String getAppRequestUrl() {
+        return appRequestUrl;
+    }
+
+    public void setAppRequestUrl(String appRequestUrl) {
+        this.appRequestUrl = appRequestUrl;
+    }
+
+    public String getEncryptTrackCertPath() {
+        return encryptTrackCertPath;
+    }
+
+    public void setEncryptTrackCertPath(String encryptTrackCertPath) {
+        this.encryptTrackCertPath = encryptTrackCertPath;
+    }
+
+    public String getJfFrontRequestUrl() {
+        return jfFrontRequestUrl;
+    }
+
+    public void setJfFrontRequestUrl(String jfFrontRequestUrl) {
+        this.jfFrontRequestUrl = jfFrontRequestUrl;
+    }
+
+    public String getJfBackRequestUrl() {
+        return jfBackRequestUrl;
+    }
+
+    public void setJfBackRequestUrl(String jfBackRequestUrl) {
+        this.jfBackRequestUrl = jfBackRequestUrl;
+    }
+
+    public String getJfSingleQueryUrl() {
+        return jfSingleQueryUrl;
+    }
+
+    public void setJfSingleQueryUrl(String jfSingleQueryUrl) {
+        this.jfSingleQueryUrl = jfSingleQueryUrl;
+    }
+
+    public String getJfCardRequestUrl() {
+        return jfCardRequestUrl;
+    }
+
+    public void setJfCardRequestUrl(String jfCardRequestUrl) {
+        this.jfCardRequestUrl = jfCardRequestUrl;
+    }
+
+    public String getJfAppRequestUrl() {
+        return jfAppRequestUrl;
+    }
+
+    public void setJfAppRequestUrl(String jfAppRequestUrl) {
+        this.jfAppRequestUrl = jfAppRequestUrl;
+    }
+
+    public String getSingleMode() {
+        return singleMode;
+    }
+
+    public void setSingleMode(String singleMode) {
+        this.singleMode = singleMode;
+    }
+
+    public String getEncryptTrackKeyExponent() {
+        return encryptTrackKeyExponent;
+    }
+
+    public void setEncryptTrackKeyExponent(String encryptTrackKeyExponent) {
+        this.encryptTrackKeyExponent = encryptTrackKeyExponent;
+    }
+
+    public String getEncryptTrackKeyModulus() {
+        return encryptTrackKeyModulus;
+    }
+
+    public void setEncryptTrackKeyModulus(String encryptTrackKeyModulus) {
+        this.encryptTrackKeyModulus = encryptTrackKeyModulus;
+    }
+
+    public String getSecureKey() {
+        return secureKey;
+    }
+
+    public void setSecureKey(String securityKey) {
+        this.secureKey = securityKey;
+    }
+
+    public String getMiddleCertPath() {
+        return middleCertPath;
+    }
+
+    public void setMiddleCertPath(String middleCertPath) {
+        this.middleCertPath = middleCertPath;
+    }
+
+    public boolean isIfValidateCNName() {
+        return ifValidateCNName;
+    }
+
+    public void setIfValidateCNName(boolean ifValidateCNName) {
+        this.ifValidateCNName = ifValidateCNName;
+    }
+
+    public boolean isIfValidateRemoteCert() {
+        return ifValidateRemoteCert;
+    }
+
+    public void setIfValidateRemoteCert(boolean ifValidateRemoteCert) {
+        this.ifValidateRemoteCert = ifValidateRemoteCert;
+    }
+
+    public String getSignMethod() {
+        return signMethod;
+    }
+
+    public void setSignMethod(String signMethod) {
+        this.signMethod = signMethod;
+    }
+
+    public String getQrcBackTransUrl() {
+        return qrcBackTransUrl;
+    }
+
+    public void setQrcBackTransUrl(String qrcBackTransUrl) {
+        this.qrcBackTransUrl = qrcBackTransUrl;
+    }
+
+    public String getQrcB2cIssBackTransUrl() {
+        return qrcB2cIssBackTransUrl;
+    }
+
+    public void setQrcB2cIssBackTransUrl(String qrcB2cIssBackTransUrl) {
+        this.qrcB2cIssBackTransUrl = qrcB2cIssBackTransUrl;
+    }
+
+    public String getQrcB2cMerBackTransUrl() {
+        return qrcB2cMerBackTransUrl;
+    }
+
+    public void setQrcB2cMerBackTransUrl(String qrcB2cMerBackTransUrl) {
+        this.qrcB2cMerBackTransUrl = qrcB2cMerBackTransUrl;
+    }
+
+    public String getZhrzFrontRequestUrl() {
+        return zhrzFrontRequestUrl;
+    }
+
+    public String getZhrzBackRequestUrl() {
+        return zhrzBackRequestUrl;
+    }
+
+    public String getZhrzSingleQueryUrl() {
+        return zhrzSingleQueryUrl;
+    }
+
+    public String getZhrzCardRequestUrl() {
+        return zhrzCardRequestUrl;
+    }
+
+    public String getZhrzAppRequestUrl() {
+        return zhrzAppRequestUrl;
+    }
+
+    public String getZhrzFaceRequestUrl() {
+        return zhrzFaceRequestUrl;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public String getFrontUrl() {
+        return frontUrl;
+    }
+
+    public void setFrontUrl(String frontUrl) {
+        this.frontUrl = frontUrl;
+    }
+
+    public String getBackUrl() {
+        return backUrl;
+    }
+
+    public void setBackUrl(String backUrl) {
+        this.backUrl = backUrl;
+    }
+
+    public String getFrontFailUrl() {
+        return frontFailUrl;
+    }
+
+    public String getRootCertPath() {
+        return rootCertPath;
+    }
+
+    public void setRootCertPath(String rootCertPath) {
+        this.rootCertPath = rootCertPath;
+    }
+
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/SDKConstants.java b/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/SDKConstants.java
new file mode 100644
index 0000000000000000000000000000000000000000..2f2fae2a0bbb4e96fed5dc7a70502e207047c90f
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/SDKConstants.java
@@ -0,0 +1,663 @@
+package com.zscat.mallplus.unionpay;
+
+/**
+ * @author UnionPay
+ */
+public class SDKConstants {
+
+    public final static String COLUMN_DEFAULT = "-";
+
+    public final static String KEY_DELIMITER = "#";
+
+    /**
+     * memeber variable: blank.
+     */
+    public static final String BLANK = "";
+
+    /**
+     * member variabel: space.
+     */
+    public static final String SPACE = " ";
+
+    /**
+     * memeber variable: unline.
+     */
+    public static final String UNLINE = "_";
+
+    /**
+     * memeber varibale: star.
+     */
+    public static final String STAR = "*";
+
+    /**
+     * memeber variable: line.
+     */
+    public static final String LINE = "-";
+
+    /**
+     * memeber variable: add.
+     */
+    public static final String ADD = "+";
+
+    /**
+     * memeber variable: colon.
+     */
+    public final static String COLON = "|";
+
+    /**
+     * memeber variable: point.
+     */
+    public final static String POINT = ".";
+
+    /**
+     * memeber variable: comma.
+     */
+    public final static String COMMA = ",";
+
+    /**
+     * memeber variable: slash.
+     */
+    public final static String SLASH = "/";
+
+    /**
+     * memeber variable: div.
+     */
+    public final static String DIV = "/";
+
+    /**
+     * memeber variable: left .
+     */
+    public final static String LB = "(";
+
+    /**
+     * memeber variable: right.
+     */
+    public final static String RB = ")";
+
+    /**
+     * memeber variable: rmb.
+     */
+    public final static String CUR_RMB = "RMB";
+
+    /**
+     * memeber variable: .page size
+     */
+    public static final int PAGE_SIZE = 10;
+
+    /**
+     * memeber variable: String ONE.
+     */
+    public static final String ONE = "1";
+
+    /**
+     * memeber variable: String ZERO.
+     */
+    public static final String ZERO = "0";
+
+    /**
+     * memeber variable: number six.
+     */
+    public static final int NUM_SIX = 6;
+
+    /**
+     * memeber variable: equal mark.
+     */
+    public static final String EQUAL = "=";
+
+    /**
+     * memeber variable: operation ne.
+     */
+    public static final String NE = "!=";
+
+    /**
+     * memeber variable: operation le.
+     */
+    public static final String LE = "<=";
+
+    /**
+     * memeber variable: operation ge.
+     */
+    public static final String GE = ">=";
+
+    /**
+     * memeber variable: operation lt.
+     */
+    public static final String LT = "<";
+
+    /**
+     * memeber variable: operation gt.
+     */
+    public static final String GT = ">";
+
+    /**
+     * memeber variable: list separator.
+     */
+    public static final String SEP = "./";
+
+    /**
+     * memeber variable: Y.
+     */
+    public static final String Y = "Y";
+
+    /**
+     * memeber variable: AMPERSAND.
+     */
+    public static final String AMPERSAND = "&";
+
+    /**
+     * memeber variable: SQL_LIKE_TAG.
+     */
+    public static final String SQL_LIKE_TAG = "%";
+
+    /**
+     * memeber variable: @.
+     */
+    public static final String MAIL = "@";
+
+    /**
+     * memeber variable: number zero.
+     */
+    public static final int NZERO = 0;
+
+    public static final String LEFT_BRACE = "{";
+
+    public static final String RIGHT_BRACE = "}";
+
+    /**
+     * memeber variable: string true.
+     */
+    public static final String TRUE_STRING = "true";
+    /**
+     * memeber variable: string false.
+     */
+    public static final String FALSE_STRING = "false";
+
+    /**
+     * memeber variable: forward success.
+     */
+    public static final String SUCCESS = "success";
+    /**
+     * memeber variable: forward fail.
+     */
+    public static final String FAIL = "fail";
+    /**
+     * memeber variable: global forward success.
+     */
+    public static final String GLOBAL_SUCCESS = "$success";
+    /**
+     * memeber variable: global forward fail.
+     */
+    public static final String GLOBAL_FAIL = "$fail";
+
+    public static final String UTF_8_ENCODING = "UTF-8";
+    public static final String GBK_ENCODING = "GBK";
+    public static final String CONTENT_TYPE = "Content-type";
+    public static final String APP_XML_TYPE = "application/xml;charset=utf-8";
+    public static final String APP_FORM_TYPE = "application/x-www-form-urlencoded;charset=";
+
+    public static final String VERSION_1_0_0 = "1.0.0";
+    public static final String VERSION_5_0_0 = "5.0.0";
+    public static final String VERSION_5_0_1 = "5.0.1";
+    public static final String VERSION_5_1_0 = "5.1.0";
+    public static final String SIGNMETHOD_RSA = "01";
+    public static final String SIGNMETHOD_SHA256 = "11";
+    public static final String SIGNMETHOD_SM3 = "12";
+    public static final String UNIONPAY_CNNAME = "中国银联股份有限公司";
+    public static final String CERTTYPE_01 = "01";// 敏感信息加密公钥
+    public static final String CERTTYPE_02 = "02";// 磁道加密公钥
+
+    /******************************************** 5.0报文接口定义 ********************************************/
+    /**
+     * 版本号.
+     */
+    public static final String param_version = "version";
+    /**
+     * 证书ID.
+     */
+    public static final String param_certId = "certId";
+    /**
+     * 签名.
+     */
+    public static final String param_signature = "signature";
+    /**
+     * 签名方法.
+     */
+    public static final String param_signMethod = "signMethod";
+    /**
+     * 编码方式.
+     */
+    public static final String param_encoding = "encoding";
+    /**
+     * 交易类型.
+     */
+    public static final String param_txnType = "txnType";
+    /**
+     * 交易子类.
+     */
+    public static final String param_txnSubType = "txnSubType";
+    /**
+     * 业务类型.
+     */
+    public static final String param_bizType = "bizType";
+    /**
+     * 前台通知地址 .
+     */
+    public static final String param_frontUrl = "frontUrl";
+    /**
+     * 后台通知地址.
+     */
+    public static final String param_backUrl = "backUrl";
+    /**
+     * 接入类型.
+     */
+    public static final String param_accessType = "accessType";
+    /**
+     * 收单机构代码.
+     */
+    public static final String param_acqInsCode = "acqInsCode";
+    /**
+     * 商户类别.
+     */
+    public static final String param_merCatCode = "merCatCode";
+    /**
+     * 商户类型.
+     */
+    public static final String param_merType = "merType";
+    /**
+     * 商户代码.
+     */
+    public static final String param_merId = "merId";
+    /**
+     * 商户名称.
+     */
+    public static final String param_merName = "merName";
+    /**
+     * 商户简称.
+     */
+    public static final String param_merAbbr = "merAbbr";
+    /**
+     * 二级商户代码.
+     */
+    public static final String param_subMerId = "subMerId";
+    /**
+     * 二级商户名称.
+     */
+    public static final String param_subMerName = "subMerName";
+    /**
+     * 二级商户简称.
+     */
+    public static final String param_subMerAbbr = "subMerAbbr";
+    /**
+     * Cupsecure 商户代码.
+     */
+    public static final String param_csMerId = "csMerId";
+    /**
+     * 商户订单号.
+     */
+    public static final String param_orderId = "orderId";
+    /**
+     * 交易时间.
+     */
+    public static final String param_txnTime = "txnTime";
+    /**
+     * 发送时间.
+     */
+    public static final String param_txnSendTime = "txnSendTime";
+    /**
+     * 订单超时时间间隔.
+     */
+    public static final String param_orderTimeoutInterval = "orderTimeoutInterval";
+    /**
+     * 支付超时时间.
+     */
+    public static final String param_payTimeoutTime = "payTimeoutTime";
+    /**
+     * 默认支付方式.
+     */
+    public static final String param_defaultPayType = "defaultPayType";
+    /**
+     * 支持支付方式.
+     */
+    public static final String param_supPayType = "supPayType";
+    /**
+     * 支付方式.
+     */
+    public static final String param_payType = "payType";
+    /**
+     * 自定义支付方式.
+     */
+    public static final String param_customPayType = "customPayType";
+    /**
+     * 物流标识.
+     */
+    public static final String param_shippingFlag = "shippingFlag";
+    /**
+     * 收货地址-国家.
+     */
+    public static final String param_shippingCountryCode = "shippingCountryCode";
+    /**
+     * 收货地址-省.
+     */
+    public static final String param_shippingProvinceCode = "shippingProvinceCode";
+    /**
+     * 收货地址-市.
+     */
+    public static final String param_shippingCityCode = "shippingCityCode";
+    /**
+     * 收货地址-地区.
+     */
+    public static final String param_shippingDistrictCode = "shippingDistrictCode";
+    /**
+     * 收货地址-详细.
+     */
+    public static final String param_shippingStreet = "shippingStreet";
+    /**
+     * 商品总类.
+     */
+    public static final String param_commodityCategory = "commodityCategory";
+    /**
+     * 商品名称.
+     */
+    public static final String param_commodityName = "commodityName";
+    /**
+     * 商品URL.
+     */
+    public static final String param_commodityUrl = "commodityUrl";
+    /**
+     * 商品单价.
+     */
+    public static final String param_commodityUnitPrice = "commodityUnitPrice";
+    /**
+     * 商品数量.
+     */
+    public static final String param_commodityQty = "commodityQty";
+    /**
+     * 是否预授权.
+     */
+    public static final String param_isPreAuth = "isPreAuth";
+    /**
+     * 币种.
+     */
+    public static final String param_currencyCode = "currencyCode";
+    /**
+     * 账户类型.
+     */
+    public static final String param_accType = "accType";
+    /**
+     * 账号.
+     */
+    public static final String param_accNo = "accNo";
+    /**
+     * 支付卡类型.
+     */
+    public static final String param_payCardType = "payCardType";
+    /**
+     * 发卡机构代码.
+     */
+    public static final String param_issInsCode = "issInsCode";
+    /**
+     * 持卡人信息.
+     */
+    public static final String param_customerInfo = "customerInfo";
+    /**
+     * 交易金额.
+     */
+    public static final String param_txnAmt = "txnAmt";
+    /**
+     * 余额.
+     */
+    public static final String param_balance = "balance";
+    /**
+     * 地区代码.
+     */
+    public static final String param_districtCode = "districtCode";
+    /**
+     * 附加地区代码.
+     */
+    public static final String param_additionalDistrictCode = "additionalDistrictCode";
+    /**
+     * 账单类型.
+     */
+    public static final String param_billType = "billType";
+    /**
+     * 账单号码.
+     */
+    public static final String param_billNo = "billNo";
+    /**
+     * 账单月份.
+     */
+    public static final String param_billMonth = "billMonth";
+    /**
+     * 账单查询要素.
+     */
+    public static final String param_billQueryInfo = "billQueryInfo";
+    /**
+     * 账单详情.
+     */
+    public static final String param_billDetailInfo = "billDetailInfo";
+    /**
+     * 账单金额.
+     */
+    public static final String param_billAmt = "billAmt";
+    /**
+     * 账单金额符号.
+     */
+    public static final String param_billAmtSign = "billAmtSign";
+    /**
+     * 绑定标识号.
+     */
+    public static final String param_bindId = "bindId";
+    /**
+     * 风险级别.
+     */
+    public static final String param_riskLevel = "riskLevel";
+    /**
+     * 绑定信息条数.
+     */
+    public static final String param_bindInfoQty = "bindInfoQty";
+    /**
+     * 绑定信息集.
+     */
+    public static final String param_bindInfoList = "bindInfoList";
+    /**
+     * 批次号.
+     */
+    public static final String param_batchNo = "batchNo";
+    /**
+     * 总笔数.
+     */
+    public static final String param_totalQty = "totalQty";
+    /**
+     * 总金额.
+     */
+    public static final String param_totalAmt = "totalAmt";
+    /**
+     * 文件类型.
+     */
+    public static final String param_fileType = "fileType";
+    /**
+     * 文件名称.
+     */
+    public static final String param_fileName = "fileName";
+    /**
+     * 批量文件内容.
+     */
+    public static final String param_fileContent = "fileContent";
+    /**
+     * 商户摘要.
+     */
+    public static final String param_merNote = "merNote";
+    /** 商户自定义域. */
+    // public static final String param_merReserved = "merReserved";//接口变更删除
+    /**
+     * 请求方保留域.
+     */
+    public static final String param_reqReserved = "reqReserved";// 新增接口
+    /**
+     * 保留域.
+     */
+    public static final String param_reserved = "reserved";
+    /**
+     * 终端号.
+     */
+    public static final String param_termId = "termId";
+    /**
+     * 终端类型.
+     */
+    public static final String param_termType = "termType";
+    /**
+     * 交互模式.
+     */
+    public static final String param_interactMode = "interactMode";
+    /**
+     * 发卡机构识别模式.
+     */
+    // public static final String param_recognitionMode = "recognitionMode";
+    public static final String param_issuerIdentifyMode = "issuerIdentifyMode";// 接口名称变更
+    /**
+     * 商户端用户号.
+     */
+    public static final String param_merUserId = "merUserId";
+    /**
+     * 持卡人IP.
+     */
+    public static final String param_customerIp = "customerIp";
+    /**
+     * 查询流水号.
+     */
+    public static final String param_queryId = "queryId";
+    /**
+     * 原交易查询流水号.
+     */
+    public static final String param_origQryId = "origQryId";
+    /**
+     * 系统跟踪号.
+     */
+    public static final String param_traceNo = "traceNo";
+    /**
+     * 交易传输时间.
+     */
+    public static final String param_traceTime = "traceTime";
+    /**
+     * 清算日期.
+     */
+    public static final String param_settleDate = "settleDate";
+    /**
+     * 清算币种.
+     */
+    public static final String param_settleCurrencyCode = "settleCurrencyCode";
+    /**
+     * 清算金额.
+     */
+    public static final String param_settleAmt = "settleAmt";
+    /**
+     * 清算汇率.
+     */
+    public static final String param_exchangeRate = "exchangeRate";
+    /**
+     * 兑换日期.
+     */
+    public static final String param_exchangeDate = "exchangeDate";
+    /**
+     * 响应时间.
+     */
+    public static final String param_respTime = "respTime";
+    /**
+     * 原交易应答码.
+     */
+    public static final String param_origRespCode = "origRespCode";
+    /**
+     * 原交易应答信息.
+     */
+    public static final String param_origRespMsg = "origRespMsg";
+    /**
+     * 应答码.
+     */
+    public static final String param_respCode = "respCode";
+    /**
+     * 应答码信息.
+     */
+    public static final String param_respMsg = "respMsg";
+    // 新增四个报文字段merUserRegDt merUserEmail checkFlag activateStatus
+    /**
+     * 商户端用户注册时间.
+     */
+    public static final String param_merUserRegDt = "merUserRegDt";
+    /**
+     * 商户端用户注册邮箱.
+     */
+    public static final String param_merUserEmail = "merUserEmail";
+    /**
+     * 验证标识.
+     */
+    public static final String param_checkFlag = "checkFlag";
+    /**
+     * 开通状态.
+     */
+    public static final String param_activateStatus = "activateStatus";
+    /**
+     * 加密证书ID.
+     */
+    public static final String param_encryptCertId = "encryptCertId";
+    /**
+     * 用户MAC、IMEI串号、SSID.
+     */
+    public static final String param_userMac = "userMac";
+    /** 关联交易. */
+    // public static final String param_relationTxnType = "relationTxnType";
+    /**
+     * 短信类型
+     */
+    public static final String param_smsType = "smsType";
+
+    /**
+     * 风控信息域
+     */
+    public static final String param_riskCtrlInfo = "riskCtrlInfo";
+
+    /**
+     * IC卡交易信息域
+     */
+    public static final String param_ICTransData = "ICTransData";
+
+    /**
+     * VPC交易信息域
+     */
+    public static final String param_VPCTransData = "VPCTransData";
+
+    /**
+     * 安全类型
+     */
+    public static final String param_securityType = "securityType";
+
+    /**
+     * 银联订单号
+     */
+    public static final String param_tn = "tn";
+
+    /**
+     * 分期付款手续费率
+     */
+    public static final String param_instalRate = "instalRate";
+
+    /**
+     * 分期付款手续费率
+     */
+    public static final String param_mchntFeeSubsidy = "mchntFeeSubsidy";
+
+    /**
+     * 签名公钥证书
+     */
+    public static final String param_signPubKeyCert = "signPubKeyCert";
+
+    /**
+     * 加密公钥证书
+     */
+    public static final String param_encryptPubKeyCert = "encryptPubKeyCert";
+
+    /**
+     * 证书类型
+     */
+    public static final String param_certType = "certType";
+
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/SDKUtil.java b/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/SDKUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..5cd5ae7366241c909ecc38ee19682460e2a41c5b
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/SDKUtil.java
@@ -0,0 +1,655 @@
+package com.zscat.mallplus.unionpay;
+
+import java.io.*;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.security.cert.X509Certificate;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.zip.Deflater;
+import java.util.zip.Inflater;
+
+import static com.zscat.mallplus.unionpay.SDKConstants.*;
+
+/**
+ * @author UnionPay
+ */
+public class SDKUtil {
+
+    public static boolean sign(Map<String, String> data, String encoding) {
+
+        if (isEmpty(encoding)) {
+            encoding = "UTF-8";
+        }
+        String signMethod = data.get(param_signMethod);
+        String version = data.get(SDKConstants.param_version);
+        if (!VERSION_1_0_0.equals(version) && !VERSION_5_0_1.equals(version) && isEmpty(signMethod)) {
+            LogUtil.writeErrorLog("signMethod must Not null");
+            return false;
+        }
+
+        if (isEmpty(version)) {
+            LogUtil.writeErrorLog("version must Not null");
+            return false;
+        }
+        if (SIGNMETHOD_RSA.equals(signMethod) || VERSION_1_0_0.equals(version) || VERSION_5_0_1.equals(version)) {
+            if (VERSION_5_0_0.equals(version) || VERSION_1_0_0.equals(version) || VERSION_5_0_1.equals(version)) {
+                // 设置签名证书序列号
+                data.put(SDKConstants.param_certId, CertUtil.getSignCertId());
+                // 将Map信息转换成key1=value1&key2=value2的形式
+                String stringData = coverMap2String(data);
+                LogUtil.writeLog("打印排序后待签名请求报文串（交易返回11验证签名失败时可以用来同正确的进行比对）:[" + stringData + "]");
+                byte[] byteSign = null;
+                String stringSign = null;
+                try {
+                    // 通过SHA1进行摘要并转16进制
+                    byte[] signDigest = SecureUtil.sha1X16(stringData, encoding);
+                    LogUtil.writeLog("打印摘要（交易返回11验证签名失败可以用来同正确的进行比对）:[" + new String(signDigest) + "]");
+                    byteSign = SecureUtil.base64Encode(SecureUtil.signBySoft(CertUtil.getSignCertPrivateKey(), signDigest));
+                    stringSign = new String(byteSign);
+                    // 设置签名域值
+                    data.put(SDKConstants.param_signature, stringSign);
+                    return true;
+                } catch (Exception e) {
+                    LogUtil.writeErrorLog("Sign Error", e);
+                    return false;
+                }
+            } else if (VERSION_5_1_0.equals(version)) {
+                // 设置签名证书序列号
+                data.put(SDKConstants.param_certId, CertUtil.getSignCertId());
+                // 将Map信息转换成key1=value1&key2=value2的形式
+                String stringData = coverMap2String(data);
+                LogUtil.writeLog("打印待签名请求报文串（交易返回11验证签名失败时可以用来同正确的进行比对）:[" + stringData + "]");
+                byte[] byteSign = null;
+                String stringSign = null;
+                try {
+                    // 通过SHA256进行摘要并转16进制
+                    byte[] signDigest = SecureUtil.sha256X16(stringData, encoding);
+                    LogUtil.writeLog("打印摘要（交易返回11验证签名失败可以用来同正确的进行比对）:[" + new String(signDigest) + "]");
+                    byteSign = SecureUtil.base64Encode(SecureUtil.signBySoft256(CertUtil.getSignCertPrivateKey(), signDigest));
+                    stringSign = new String(byteSign);
+                    // 设置签名域值
+                    data.put(SDKConstants.param_signature, stringSign);
+                    return true;
+                } catch (Exception e) {
+                    LogUtil.writeErrorLog("Sign Error", e);
+                    return false;
+                }
+            }
+        } else if (SIGNMETHOD_SHA256.equals(signMethod)) {
+            return signBySecureKey(data, SDKConfig.getConfig().getSecureKey(), encoding);
+        } else if (SIGNMETHOD_SM3.equals(signMethod)) {
+            return signBySecureKey(data, SDKConfig.getConfig().getSecureKey(), encoding);
+        }
+        return false;
+    }
+
+    public static boolean signBySecureKey(Map<String, String> data, String secureKey, String encoding) {
+
+        if (isEmpty(encoding)) {
+            encoding = "UTF-8";
+        }
+        if (isEmpty(secureKey)) {
+            LogUtil.writeErrorLog("secureKey is empty");
+            return false;
+        }
+        String signMethod = data.get(param_signMethod);
+        if (isEmpty(signMethod)) {
+            LogUtil.writeErrorLog("signMethod must Not null");
+            return false;
+        }
+
+        if (SIGNMETHOD_SHA256.equals(signMethod)) {
+            // 将Map信息转换成key1=value1&key2=value2的形式
+            String stringData = coverMap2String(data);
+            LogUtil.writeLog("待签名请求报文串:[" + stringData + "]");
+            String strBeforeSha256 = stringData + SDKConstants.AMPERSAND + SecureUtil.sha256X16Str(secureKey, encoding);
+            String strAfterSha256 = SecureUtil.sha256X16Str(strBeforeSha256, encoding);
+            // 设置签名域值
+            data.put(SDKConstants.param_signature, strAfterSha256);
+            return true;
+        } else if (SIGNMETHOD_SM3.equals(signMethod)) {
+            String stringData = coverMap2String(data);
+            LogUtil.writeLog("待签名请求报文串:[" + stringData + "]");
+            String strBeforeSM3 = stringData + SDKConstants.AMPERSAND + SecureUtil.sm3X16Str(secureKey, encoding);
+            String strAfterSM3 = SecureUtil.sm3X16Str(strBeforeSM3, encoding);
+            // 设置签名域值
+            data.put(SDKConstants.param_signature, strAfterSM3);
+            return true;
+        }
+        return false;
+    }
+
+    public static boolean signByCertInfo(Map<String, String> data, String certPath, String certPwd, String encoding) {
+
+        if (isEmpty(encoding)) {
+            encoding = "UTF-8";
+        }
+        if (isEmpty(certPath) || isEmpty(certPwd)) {
+            LogUtil.writeErrorLog("CertPath or CertPwd is empty");
+            return false;
+        }
+        String signMethod = data.get(param_signMethod);
+        String version = data.get(SDKConstants.param_version);
+        if (!VERSION_1_0_0.equals(version) && !VERSION_5_0_1.equals(version) && isEmpty(signMethod)) {
+            LogUtil.writeErrorLog("signMethod must Not null");
+            return false;
+        }
+        if (isEmpty(version)) {
+            LogUtil.writeErrorLog("version must Not null");
+            return false;
+        }
+
+        if (SIGNMETHOD_RSA.equals(signMethod) || VERSION_1_0_0.equals(version) || VERSION_5_0_1.equals(version)) {
+            if (VERSION_5_0_0.equals(version) || VERSION_1_0_0.equals(version) || VERSION_5_0_1.equals(version)) {
+                // 设置签名证书序列号
+                data.put(SDKConstants.param_certId, CertUtil.getCertIdByKeyStoreMap(certPath, certPwd));
+                // 将Map信息转换成key1=value1&key2=value2的形式
+                String stringData = coverMap2String(data);
+                LogUtil.writeLog("待签名请求报文串:[" + stringData + "]");
+                byte[] byteSign = null;
+                String stringSign = null;
+                try {
+                    // 通过SHA1进行摘要并转16进制
+                    byte[] signDigest = SecureUtil.sha1X16(stringData, encoding);
+                    byteSign = SecureUtil.base64Encode(SecureUtil.signBySoft(CertUtil.getSignCertPrivateKeyByStoreMap(certPath, certPwd), signDigest));
+                    stringSign = new String(byteSign);
+                    // 设置签名域值
+                    data.put(SDKConstants.param_signature, stringSign);
+                    return true;
+                } catch (Exception e) {
+                    LogUtil.writeErrorLog("Sign Error", e);
+                    return false;
+                }
+            } else if (VERSION_5_1_0.equals(version)) {
+                // 设置签名证书序列号
+                data.put(SDKConstants.param_certId, CertUtil.getCertIdByKeyStoreMap(certPath, certPwd));
+                // 将Map信息转换成key1=value1&key2=value2的形式
+                String stringData = coverMap2String(data);
+                LogUtil.writeLog("待签名请求报文串:[" + stringData + "]");
+                byte[] byteSign = null;
+                String stringSign = null;
+                try {
+                    // 通过SHA256进行摘要并转16进制
+                    byte[] signDigest = SecureUtil.sha256X16(stringData, encoding);
+                    byteSign = SecureUtil.base64Encode(SecureUtil.signBySoft256(CertUtil.getSignCertPrivateKeyByStoreMap(certPath, certPwd), signDigest));
+                    stringSign = new String(byteSign);
+                    // 设置签名域值
+                    data.put(SDKConstants.param_signature, stringSign);
+                    return true;
+                } catch (Exception e) {
+                    LogUtil.writeErrorLog("Sign Error", e);
+                    return false;
+                }
+            }
+
+        }
+        return false;
+    }
+
+    public static boolean validateBySecureKey(Map<String, String> resData, String secureKey, String encoding) {
+        LogUtil.writeLog("验签处理开始");
+        if (isEmpty(encoding)) {
+            encoding = "UTF-8";
+        }
+        String signMethod = resData.get(param_signMethod);
+        if (SIGNMETHOD_SHA256.equals(signMethod)) {
+            // 1.进行SHA256验证
+            String stringSign = resData.get(SDKConstants.param_signature);
+            LogUtil.writeLog("签名原文：[" + stringSign + "]");
+            // 将Map信息转换成key1=value1&key2=value2的形式
+            String stringData = coverMap2String(resData);
+            LogUtil.writeLog("待验签返回报文串：[" + stringData + "]");
+            String strBeforeSha256 = stringData + SDKConstants.AMPERSAND + SecureUtil.sha256X16Str(secureKey, encoding);
+            String strAfterSha256 = SecureUtil.sha256X16Str(strBeforeSha256, encoding);
+            return stringSign.equals(strAfterSha256);
+        } else if (SIGNMETHOD_SM3.equals(signMethod)) {
+            // 1.进行SM3验证
+            String stringSign = resData.get(SDKConstants.param_signature);
+            LogUtil.writeLog("签名原文：[" + stringSign + "]");
+            // 将Map信息转换成key1=value1&key2=value2的形式
+            String stringData = coverMap2String(resData);
+            LogUtil.writeLog("待验签返回报文串：[" + stringData + "]");
+            String strBeforeSM3 = stringData + SDKConstants.AMPERSAND + SecureUtil.sm3X16Str(secureKey, encoding);
+            String strAfterSM3 = SecureUtil.sm3X16Str(strBeforeSM3, encoding);
+            return stringSign.equals(strAfterSM3);
+        }
+        return false;
+    }
+
+    public static boolean validate(Map<String, String> resData, String encoding) {
+        LogUtil.writeLog("验签处理开始");
+        if (isEmpty(encoding)) {
+            encoding = "UTF-8";
+        }
+        String signMethod = resData.get(param_signMethod);
+        String version = resData.get(SDKConstants.param_version);
+        if (SIGNMETHOD_RSA.equals(signMethod) || VERSION_1_0_0.equals(version) || VERSION_5_0_1.equals(version)) {
+            // 获取返回报文的版本号
+            if (VERSION_5_0_0.equals(version) || VERSION_1_0_0.equals(version) || VERSION_5_0_1.equals(version)) {
+                String stringSign = resData.get(SDKConstants.param_signature);
+                LogUtil.writeLog("签名原文：[" + stringSign + "]");
+                // 从返回报文中获取certId ，然后去证书静态Map中查询对应验签证书对象
+                String certId = resData.get(SDKConstants.param_certId);
+                LogUtil.writeLog("对返回报文串验签使用的验签公钥序列号：[" + certId + "]");
+                // 将Map信息转换成key1=value1&key2=value2的形式
+                String stringData = coverMap2String(resData);
+                LogUtil.writeLog("待验签返回报文串：[" + stringData + "]");
+                try {
+                    // 验证签名需要用银联发给商户的公钥证书.
+                    return SecureUtil.validateSignBySoft(CertUtil
+                                    .getValidatePublicKey(certId), SecureUtil
+                                    .base64Decode(stringSign.getBytes(encoding)),
+                            SecureUtil.sha1X16(stringData, encoding));
+                } catch (UnsupportedEncodingException e) {
+                    LogUtil.writeErrorLog(e.getMessage(), e);
+                } catch (Exception e) {
+                    LogUtil.writeErrorLog(e.getMessage(), e);
+                }
+            } else if (VERSION_5_1_0.equals(version)) {
+                // 1.从返回报文中获取公钥信息转换成公钥对象
+                String strCert = resData.get(SDKConstants.param_signPubKeyCert);
+//				LogUtil.writeLog("验签公钥证书：["+strCert+"]");
+                X509Certificate x509Cert = CertUtil.genCertificateByStr(strCert);
+                if (x509Cert == null) {
+                    LogUtil.writeErrorLog("convert signPubKeyCert failed");
+                    return false;
+                }
+                // 2.验证证书链
+                if (!CertUtil.verifyCertificate(x509Cert)) {
+                    LogUtil.writeErrorLog("验证公钥证书失败，证书信息：[" + strCert + "]");
+                    return false;
+                }
+
+                // 3.验签
+                String stringSign = resData.get(SDKConstants.param_signature);
+                LogUtil.writeLog("签名原文：[" + stringSign + "]");
+                // 将Map信息转换成key1=value1&key2=value2的形式
+                String stringData = coverMap2String(resData);
+                LogUtil.writeLog("待验签返回报文串：[" + stringData + "]");
+                try {
+                    // 验证签名需要用银联发给商户的公钥证书.
+                    boolean result = SecureUtil.validateSignBySoft256(x509Cert
+                            .getPublicKey(), SecureUtil.base64Decode(stringSign
+                            .getBytes(encoding)), SecureUtil.sha256X16(
+                            stringData, encoding));
+                    LogUtil.writeLog("验证签名" + (result ? "成功" : "失败"));
+                    return result;
+                } catch (UnsupportedEncodingException e) {
+                    LogUtil.writeErrorLog(e.getMessage(), e);
+                } catch (Exception e) {
+                    LogUtil.writeErrorLog(e.getMessage(), e);
+                }
+            }
+
+        } else if (SIGNMETHOD_SHA256.equals(signMethod)) {
+            // 1.进行SHA256验证
+            String stringSign = resData.get(SDKConstants.param_signature);
+            LogUtil.writeLog("签名原文：[" + stringSign + "]");
+            // 将Map信息转换成key1=value1&key2=value2的形式
+            String stringData = coverMap2String(resData);
+            LogUtil.writeLog("待验签返回报文串：[" + stringData + "]");
+            String strBeforeSha256 = stringData
+                    + SDKConstants.AMPERSAND
+                    + SecureUtil.sha256X16Str(SDKConfig.getConfig()
+                    .getSecureKey(), encoding);
+            String strAfterSha256 = SecureUtil.sha256X16Str(strBeforeSha256,
+                    encoding);
+            boolean result = stringSign.equals(strAfterSha256);
+            LogUtil.writeLog("验证签名" + (result ? "成功" : "失败"));
+            return result;
+        } else if (SIGNMETHOD_SM3.equals(signMethod)) {
+            // 1.进行SM3验证
+            String stringSign = resData.get(SDKConstants.param_signature);
+            LogUtil.writeLog("签名原文：[" + stringSign + "]");
+            // 将Map信息转换成key1=value1&key2=value2的形式
+            String stringData = coverMap2String(resData);
+            LogUtil.writeLog("待验签返回报文串：[" + stringData + "]");
+            String strBeforeSM3 = stringData
+                    + SDKConstants.AMPERSAND
+                    + SecureUtil.sm3X16Str(SDKConfig.getConfig()
+                    .getSecureKey(), encoding);
+            String strAfterSM3 = SecureUtil
+                    .sm3X16Str(strBeforeSM3, encoding);
+            boolean result = stringSign.equals(strAfterSM3);
+            LogUtil.writeLog("验证签名" + (result ? "成功" : "失败"));
+            return result;
+        }
+        return false;
+    }
+
+    public static String coverMap2String(Map<String, String> data) {
+        TreeMap<String, String> tree = new TreeMap<String, String>();
+        Iterator<Entry<String, String>> it = data.entrySet().iterator();
+        while (it.hasNext()) {
+            Entry<String, String> en = it.next();
+            if (SDKConstants.param_signature.equals(en.getKey().trim())) {
+                continue;
+            }
+            tree.put(en.getKey(), en.getValue());
+        }
+        it = tree.entrySet().iterator();
+        StringBuffer sf = new StringBuffer();
+        while (it.hasNext()) {
+            Entry<String, String> en = it.next();
+            sf.append(en.getKey() + SDKConstants.EQUAL + en.getValue()
+                    + SDKConstants.AMPERSAND);
+        }
+        return sf.substring(0, sf.length() - 1);
+    }
+
+
+    public static Map<String, String> coverResultString2Map(String result) {
+        return convertResultStringToMap(result);
+    }
+
+    public static Map<String, String> convertResultStringToMap(String result) {
+        Map<String, String> map = null;
+
+        if (result != null && !"".equals(result.trim())) {
+            if (result.startsWith("{") && result.endsWith("}")) {
+                result = result.substring(1, result.length() - 1);
+            }
+            map = parseQString(result);
+        }
+
+        return map;
+    }
+
+
+    public static Map<String, String> parseQString(String str) {
+
+        Map<String, String> map = new HashMap<String, String>();
+        int len = str.length();
+        StringBuilder temp = new StringBuilder();
+        char curChar;
+        String key = null;
+        boolean isKey = true;
+        boolean isOpen = false;//值里有嵌套
+        char openName = 0;
+        if (len > 0) {
+            for (int i = 0; i < len; i++) {// 遍历整个带解析的字符串
+                curChar = str.charAt(i);// 取当前字符
+                if (isKey) {// 如果当前生成的是key
+
+                    if (curChar == '=') {// 如果读取到=分隔符
+                        key = temp.toString();
+                        temp.setLength(0);
+                        isKey = false;
+                    } else {
+                        temp.append(curChar);
+                    }
+                } else {// 如果当前生成的是value
+                    if (isOpen) {
+                        if (curChar == openName) {
+                            isOpen = false;
+                        }
+
+                    } else {//如果没开启嵌套
+                        if (curChar == '{') {//如果碰到，就开启嵌套
+                            isOpen = true;
+                            openName = '}';
+                        }
+                        if (curChar == '[') {
+                            isOpen = true;
+                            openName = ']';
+                        }
+                    }
+
+                    if (curChar == '&' && !isOpen) {// 如果读取到&分割符,同时这个分割符不是值域，这时将map里添加
+                        putKeyValueToMap(temp, isKey, key, map);
+                        temp.setLength(0);
+                        isKey = true;
+                    } else {
+                        temp.append(curChar);
+                    }
+                }
+
+            }
+            putKeyValueToMap(temp, isKey, key, map);
+        }
+        return map;
+    }
+
+    private static void putKeyValueToMap(StringBuilder temp, boolean isKey,
+                                         String key, Map<String, String> map) {
+        if (isKey) {
+            key = temp.toString();
+            if (key.length() == 0) {
+                throw new RuntimeException("QString format illegal");
+            }
+            map.put(key, "");
+        } else {
+            if (key.length() == 0) {
+                throw new RuntimeException("QString format illegal");
+            }
+            map.put(key, temp.toString());
+        }
+    }
+
+    public static int getEncryptCert(Map<String, String> resData, String encoding) {
+        String strCert = resData.get(SDKConstants.param_encryptPubKeyCert);
+        String certType = resData.get(SDKConstants.param_certType);
+        if (isEmpty(strCert) || isEmpty(certType))
+            return -1;
+        X509Certificate x509Cert = CertUtil.genCertificateByStr(strCert);
+        if (CERTTYPE_01.equals(certType)) {
+            // 更新敏感信息加密公钥
+            if (!CertUtil.getEncryptCertId().equals(
+                    x509Cert.getSerialNumber().toString())) {
+                // ID不同时进行本地证书更新操作
+                String localCertPath = SDKConfig.getConfig().getEncryptCertPath();
+                String newLocalCertPath = genBackupName(localCertPath);
+                // 1.将本地证书进行备份存储
+                if (!copyFile(localCertPath, newLocalCertPath))
+                    return -1;
+                // 2.备份成功,进行新证书的存储
+                if (!writeFile(localCertPath, strCert, encoding))
+                    return -1;
+                LogUtil.writeLog("save new encryptPubKeyCert success");
+                CertUtil.resetEncryptCertPublicKey();
+                return 1;
+            } else {
+                return 0;
+            }
+
+        } else if (CERTTYPE_02.equals(certType)) {
+            return 0;
+        } else {
+            LogUtil.writeLog("unknown cerType:" + certType);
+            return -1;
+        }
+    }
+
+    public static boolean copyFile(String srcFile, String destFile) {
+        boolean flag = false;
+        FileInputStream fin = null;
+        FileOutputStream fout = null;
+        FileChannel fcin = null;
+        FileChannel fcout = null;
+        try {
+            // 获取源文件和目标文件的输入输出流
+            fin = new FileInputStream(srcFile);
+            fout = new FileOutputStream(destFile);
+            // 获取输入输出通道
+            fcin = fin.getChannel();
+            fcout = fout.getChannel();
+            // 创建缓冲区
+            ByteBuffer buffer = ByteBuffer.allocate(1024);
+            while (true) {
+                // clear方法重设缓冲区，使它可以接受读入的数据
+                buffer.clear();
+                // 从输入通道中将数据读到缓冲区
+                int r = fcin.read(buffer);
+                // read方法返回读取的字节数，可能为零，如果该通道已到达流的末尾，则返回-1
+                if (r == -1) {
+                    flag = true;
+                    break;
+                }
+                // flip方法让缓冲区可以将新读入的数据写入另一个通道
+                buffer.flip();
+                // 从输出通道中将数据写入缓冲区
+                fcout.write(buffer);
+            }
+            fout.flush();
+        } catch (IOException e) {
+            LogUtil.writeErrorLog("CopyFile fail", e);
+        } finally {
+            try {
+                if (null != fin)
+                    fin.close();
+                if (null != fout)
+                    fout.close();
+                if (null != fcin)
+                    fcin.close();
+                if (null != fcout)
+                    fcout.close();
+            } catch (IOException ex) {
+                LogUtil.writeErrorLog("Releases any system resources fail", ex);
+            }
+        }
+        return flag;
+    }
+
+    public static boolean writeFile(String filePath, String fileContent, String encoding) {
+        FileOutputStream fout = null;
+        FileChannel fcout = null;
+        File file = new File(filePath);
+        if (file.exists()) {
+            file.delete();
+        }
+
+        try {
+            fout = new FileOutputStream(filePath);
+            // 获取输出通道
+            fcout = fout.getChannel();
+            // 创建缓冲区
+            // ByteBuffer buffer = ByteBuffer.allocate(1024);
+            ByteBuffer buffer = ByteBuffer.wrap(fileContent.getBytes(encoding));
+            fcout.write(buffer);
+            fout.flush();
+        } catch (FileNotFoundException e) {
+            LogUtil.writeErrorLog("WriteFile fail", e);
+            return false;
+        } catch (IOException ex) {
+            LogUtil.writeErrorLog("WriteFile fail", ex);
+            return false;
+        } finally {
+            try {
+                if (null != fout)
+                    fout.close();
+                if (null != fcout)
+                    fcout.close();
+            } catch (IOException ex) {
+                LogUtil.writeErrorLog("Releases any system resources fail", ex);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static String genBackupName(String fileName) {
+        if (isEmpty(fileName))
+            return "";
+        int i = fileName.lastIndexOf(POINT);
+        String leftFileName = fileName.substring(0, i);
+        String rightFileName = fileName.substring(i + 1);
+        String newFileName = leftFileName + "_backup" + POINT + rightFileName;
+        return newFileName;
+    }
+
+
+    public static byte[] readFileByNIO(String filePath) {
+        FileInputStream in = null;
+        FileChannel fc = null;
+        ByteBuffer bf = null;
+        try {
+            in = new FileInputStream(filePath);
+            fc = in.getChannel();
+            bf = ByteBuffer.allocate((int) fc.size());
+            fc.read(bf);
+            return bf.array();
+        } catch (Exception e) {
+            LogUtil.writeErrorLog(e.getMessage());
+            return null;
+        } finally {
+            try {
+                if (null != fc) {
+                    fc.close();
+                }
+                if (null != in) {
+                    in.close();
+                }
+            } catch (Exception e) {
+                LogUtil.writeErrorLog(e.getMessage());
+                return null;
+            }
+        }
+    }
+
+    public static Map<String, String> filterBlank(Map<String, String> contentData) {
+        LogUtil.writeLog("打印请求报文域 :");
+        Map<String, String> submitFromData = new HashMap<String, String>();
+        Set<String> keySet = contentData.keySet();
+
+        for (String key : keySet) {
+            String value = contentData.get(key);
+            if (value != null && !"".equals(value.trim())) {
+                // 对value值进行去除前后空处理
+                submitFromData.put(key, value.trim());
+                LogUtil.writeLog(key + "-->" + String.valueOf(value));
+            }
+        }
+        return submitFromData;
+    }
+
+    public static byte[] inflater(final byte[] inputByte) throws IOException {
+        int compressedDataLength = 0;
+        Inflater compresser = new Inflater(false);
+        compresser.setInput(inputByte, 0, inputByte.length);
+        ByteArrayOutputStream o = new ByteArrayOutputStream(inputByte.length);
+        byte[] result = new byte[1024];
+        try {
+            while (!compresser.finished()) {
+                compressedDataLength = compresser.inflate(result);
+                if (compressedDataLength == 0) {
+                    break;
+                }
+                o.write(result, 0, compressedDataLength);
+            }
+        } catch (Exception ex) {
+            System.err.println("Data format error!\n");
+            ex.printStackTrace();
+        } finally {
+            o.close();
+        }
+        compresser.end();
+        return o.toByteArray();
+    }
+
+
+    public static byte[] deflater(final byte[] inputByte) throws IOException {
+        int compressedDataLength = 0;
+        Deflater compresser = new Deflater();
+        compresser.setInput(inputByte);
+        compresser.finish();
+        ByteArrayOutputStream o = new ByteArrayOutputStream(inputByte.length);
+        byte[] result = new byte[1024];
+        try {
+            while (!compresser.finished()) {
+                compressedDataLength = compresser.deflate(result);
+                o.write(result, 0, compressedDataLength);
+            }
+        } finally {
+            o.close();
+        }
+        compresser.end();
+        return o.toByteArray();
+    }
+
+
+    public static boolean isEmpty(String s) {
+        return null == s || "".equals(s.trim());
+    }
+
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/SecureUtil.java b/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/SecureUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..9e644cffe3665aafb6fb90fc0c96ab4d06e19491
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/SecureUtil.java
@@ -0,0 +1,371 @@
+package com.zscat.mallplus.unionpay;
+
+import org.apache.commons.codec.binary.Base64;
+import org.bouncycastle.crypto.digests.SM3Digest;
+
+import javax.crypto.Cipher;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.Signature;
+
+/**
+ * @author UnionPay
+ */
+public class SecureUtil {
+    /**
+     * 算法常量： SHA1
+     */
+    private static final String ALGORITHM_SHA1 = "SHA-1";
+    /**
+     * 算法常量： SHA256
+     */
+    private static final String ALGORITHM_SHA256 = "SHA-256";
+    /**
+     * 算法常量：SHA1withRSA
+     */
+    private static final String BC_PROV_ALGORITHM_SHA1RSA = "SHA1withRSA";
+    /**
+     * 算法常量：SHA256withRSA
+     */
+    private static final String BC_PROV_ALGORITHM_SHA256RSA = "SHA256withRSA";
+
+    public static String sm3X16Str(String data, String encoding) {
+        byte[] bytes = sm3(data, encoding);
+        StringBuilder sm3StrBuff = new StringBuilder();
+        for (int i = 0; i < bytes.length; i++) {
+            if (Integer.toHexString(0xFF & bytes[i]).length() == 1) {
+                sm3StrBuff.append("0").append(
+                        Integer.toHexString(0xFF & bytes[i]));
+            } else {
+                sm3StrBuff.append(Integer.toHexString(0xFF & bytes[i]));
+            }
+        }
+        return sm3StrBuff.toString();
+    }
+
+    public static byte[] sha1X16(String data, String encoding) {
+        byte[] bytes = sha1(data, encoding);
+        StringBuilder sha1StrBuff = new StringBuilder();
+        for (int i = 0; i < bytes.length; i++) {
+            if (Integer.toHexString(0xFF & bytes[i]).length() == 1) {
+                sha1StrBuff.append("0").append(
+                        Integer.toHexString(0xFF & bytes[i]));
+            } else {
+                sha1StrBuff.append(Integer.toHexString(0xFF & bytes[i]));
+            }
+        }
+        try {
+            return sha1StrBuff.toString().getBytes(encoding);
+        } catch (UnsupportedEncodingException e) {
+            LogUtil.writeErrorLog(e.getMessage(), e);
+            return null;
+        }
+    }
+
+    public static String sha256X16Str(String data, String encoding) {
+        byte[] bytes = sha256(data, encoding);
+        StringBuilder sha256StrBuff = new StringBuilder();
+        for (int i = 0; i < bytes.length; i++) {
+            if (Integer.toHexString(0xFF & bytes[i]).length() == 1) {
+                sha256StrBuff.append("0").append(
+                        Integer.toHexString(0xFF & bytes[i]));
+            } else {
+                sha256StrBuff.append(Integer.toHexString(0xFF & bytes[i]));
+            }
+        }
+        return sha256StrBuff.toString();
+    }
+
+    public static byte[] sha256X16(String data, String encoding) {
+        byte[] bytes = sha256(data, encoding);
+        StringBuilder sha256StrBuff = new StringBuilder();
+        for (int i = 0; i < bytes.length; i++) {
+            if (Integer.toHexString(0xFF & bytes[i]).length() == 1) {
+                sha256StrBuff.append("0").append(
+                        Integer.toHexString(0xFF & bytes[i]));
+            } else {
+                sha256StrBuff.append(Integer.toHexString(0xFF & bytes[i]));
+            }
+        }
+        try {
+            return sha256StrBuff.toString().getBytes(encoding);
+        } catch (UnsupportedEncodingException e) {
+            LogUtil.writeErrorLog(e.getMessage(), e);
+            return null;
+        }
+    }
+
+    private static byte[] sha1(byte[] data) {
+        MessageDigest md = null;
+        try {
+            md = MessageDigest.getInstance(ALGORITHM_SHA1);
+            md.reset();
+            md.update(data);
+            return md.digest();
+        } catch (Exception e) {
+            LogUtil.writeErrorLog("SHA1计算失败", e);
+            return null;
+        }
+    }
+
+    private static byte[] sha256(byte[] data) {
+        MessageDigest md = null;
+        try {
+            md = MessageDigest.getInstance(ALGORITHM_SHA256);
+            md.reset();
+            md.update(data);
+            return md.digest();
+        } catch (Exception e) {
+            LogUtil.writeErrorLog("SHA256计算失败", e);
+            return null;
+        }
+    }
+
+    private static byte[] sm3(byte[] data) {
+        SM3Digest sm3 = new SM3Digest();
+        sm3.update(data, 0, data.length);
+        byte[] result = new byte[sm3.getDigestSize()];
+        sm3.doFinal(result, 0);
+        return result;
+    }
+
+    private static byte[] sha1(String datas, String encoding) {
+        try {
+            return sha1(datas.getBytes(encoding));
+        } catch (UnsupportedEncodingException e) {
+            LogUtil.writeErrorLog("SHA1计算失败", e);
+            return null;
+        }
+    }
+
+    private static byte[] sha256(String datas, String encoding) {
+        try {
+            return sha256(datas.getBytes(encoding));
+        } catch (UnsupportedEncodingException e) {
+            LogUtil.writeErrorLog("SHA256计算失败", e);
+            return null;
+        }
+    }
+
+    private static byte[] sm3(String data, String encoding) {
+        try {
+            return sm3(data.getBytes(encoding));
+        } catch (UnsupportedEncodingException e) {
+            LogUtil.writeErrorLog("SM3计算失败", e);
+            return null;
+        }
+    }
+
+    public static byte[] signBySoft(PrivateKey privateKey, byte[] data)
+            throws Exception {
+        byte[] result = null;
+        Signature st = Signature.getInstance(BC_PROV_ALGORITHM_SHA1RSA, "BC");
+        st.initSign(privateKey);
+        st.update(data);
+        result = st.sign();
+        return result;
+    }
+
+    public static byte[] signBySoft256(PrivateKey privateKey, byte[] data)
+            throws Exception {
+        byte[] result = null;
+        Signature st = Signature.getInstance(BC_PROV_ALGORITHM_SHA256RSA, "BC");
+        st.initSign(privateKey);
+        st.update(data);
+        result = st.sign();
+        return result;
+    }
+
+    public static boolean validateSignBySoft(PublicKey publicKey,
+                                             byte[] signData, byte[] srcData) throws Exception {
+        Signature st = Signature.getInstance(BC_PROV_ALGORITHM_SHA1RSA, "BC");
+        st.initVerify(publicKey);
+        st.update(srcData);
+        return st.verify(signData);
+    }
+
+    public static boolean validateSignBySoft256(PublicKey publicKey,
+                                                byte[] signData, byte[] srcData) throws Exception {
+        Signature st = Signature.getInstance(BC_PROV_ALGORITHM_SHA256RSA, "BC");
+        st.initVerify(publicKey);
+        st.update(srcData);
+        return st.verify(signData);
+    }
+
+    public static String encryptData(String dataString, String encoding,
+                                     PublicKey key) {
+        /** 使用公钥对密码加密 **/
+        byte[] data = null;
+        try {
+            data = encryptData(key, dataString.getBytes(encoding));
+            return new String(SecureUtil.base64Encode(data), encoding);
+        } catch (Exception e) {
+            LogUtil.writeErrorLog(e.getMessage(), e);
+            return "";
+        }
+    }
+
+    public static String encryptPin(String accNo, String pin, String encoding,
+                                    PublicKey key) {
+        /** 使用公钥对密码加密 **/
+        byte[] data = null;
+        try {
+            data = pin2PinBlockWithCardNo(pin, accNo);
+            data = encryptData(key, data);
+            return new String(SecureUtil.base64Encode(data), encoding);
+        } catch (Exception e) {
+            LogUtil.writeErrorLog(e.getMessage(), e);
+            return "";
+        }
+    }
+
+    public static String decryptData(String dataString, String encoding,
+                                     PrivateKey key) {
+        byte[] data = null;
+        try {
+            data = SecureUtil.base64Decode(dataString.getBytes(encoding));
+            data = decryptData(key, data);
+            return new String(data, encoding);
+        } catch (Exception e) {
+            LogUtil.writeErrorLog(e.getMessage(), e);
+            return "";
+        }
+    }
+
+    public static byte[] base64Decode(byte[] inputByte) throws IOException {
+        return Base64.decodeBase64(inputByte);
+    }
+
+    public static byte[] base64Encode(byte[] inputByte) throws IOException {
+        return Base64.encodeBase64(inputByte);
+    }
+
+    private static byte[] encryptData(PublicKey publicKey, byte[] plainData)
+            throws Exception {
+        try {
+            Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding", "BC");
+            cipher.init(Cipher.ENCRYPT_MODE, publicKey);
+            return cipher.doFinal(plainData);
+        } catch (Exception e) {
+            throw new Exception(e.getMessage());
+        }
+    }
+
+    private static byte[] decryptData(PrivateKey privateKey, byte[] data)
+            throws Exception {
+        try {
+            Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding", "BC");
+            cipher.init(Cipher.DECRYPT_MODE, privateKey);
+            return cipher.doFinal(data);
+        } catch (Exception e) {
+            LogUtil.writeErrorLog("解密失败", e);
+        }
+        return null;
+    }
+
+    private static byte[] pin2PinBlock(String aPin) {
+        int tTemp = 1;
+        int tPinLen = aPin.length();
+
+        byte[] tByte = new byte[8];
+        try {
+            tByte[0] = (byte) Integer.parseInt(Integer.toString(tPinLen), 10);
+            if (tPinLen % 2 == 0) {
+                for (int i = 0; i < tPinLen; ) {
+                    String a = aPin.substring(i, i + 2);
+                    tByte[tTemp] = (byte) Integer.parseInt(a, 16);
+                    if (i == (tPinLen - 2)) {
+                        if (tTemp < 7) {
+                            for (int x = (tTemp + 1); x < 8; x++) {
+                                tByte[x] = (byte) 0xff;
+                            }
+                        }
+                    }
+                    tTemp++;
+                    i = i + 2;
+                }
+            } else {
+                for (int i = 0; i < tPinLen - 1; ) {
+                    String a;
+                    a = aPin.substring(i, i + 2);
+                    tByte[tTemp] = (byte) Integer.parseInt(a, 16);
+                    if (i == (tPinLen - 3)) {
+                        String b = aPin.substring(tPinLen - 1) + "F";
+                        tByte[tTemp + 1] = (byte) Integer.parseInt(b, 16);
+                        if ((tTemp + 1) < 7) {
+                            for (int x = (tTemp + 2); x < 8; x++) {
+                                tByte[x] = (byte) 0xff;
+                            }
+                        }
+                    }
+                    tTemp++;
+                    i = i + 2;
+                }
+            }
+        } catch (Exception e) {
+        }
+
+        return tByte;
+    }
+
+    private static byte[] formatPan(String aPan) {
+        int tPanLen = aPan.length();
+        byte[] tByte = new byte[8];
+        ;
+        int temp = tPanLen - 13;
+        try {
+            tByte[0] = (byte) 0x00;
+            tByte[1] = (byte) 0x00;
+            for (int i = 2; i < 8; i++) {
+                String a = aPan.substring(temp, temp + 2);
+                tByte[i] = (byte) Integer.parseInt(a, 16);
+                temp = temp + 2;
+            }
+        } catch (Exception e) {
+        }
+        return tByte;
+    }
+
+    private static byte[] pin2PinBlockWithCardNo(String aPin, String aCardNo) {
+        byte[] tPinByte = pin2PinBlock(aPin);
+        if (aCardNo.length() == 11) {
+            aCardNo = "00" + aCardNo;
+        } else if (aCardNo.length() == 12) {
+            aCardNo = "0" + aCardNo;
+        }
+        byte[] tPanByte = formatPan(aCardNo);
+        byte[] tByte = new byte[8];
+        for (int i = 0; i < 8; i++) {
+            tByte[i] = (byte) (tPinByte[i] ^ tPanByte[i]);
+        }
+        return tByte;
+    }
+
+    public static int genLuHn(String number) {
+        number = number + "0";
+        int s1 = 0, s2 = 0;
+        String reverse = new StringBuffer(number).reverse().toString();
+        for (int i = 0; i < reverse.length(); i++) {
+            int digit = Character.digit(reverse.charAt(i), 10);
+            // this is for odd digits, they are 1-indexed in //
+            if (i % 2 == 0) {
+                // the algorithm
+                s1 += digit;
+            } else {
+                // add 2 * digit for 0-4, add 2 * digit - 9 for 5-9
+                s2 += 2 * digit;
+                if (digit >= 5) {
+                    s2 -= 9;
+                }
+            }
+        }
+        int check = 10 - ((s1 + s2) % 10);
+        if (check == 10) {
+            check = 0;
+        }
+        return check;
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/UnionPayApi.java b/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/UnionPayApi.java
new file mode 100644
index 0000000000000000000000000000000000000000..98ef918ce0e18fd42c3fa70e24bd65a3ad3e36ce
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/UnionPayApi.java
@@ -0,0 +1,213 @@
+package com.zscat.mallplus.unionpay;
+
+
+import com.zscat.mallplus.core.kit.HttpKit;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>银联支付相关接口</p>
+ *
+ * @author Javen
+ */
+public class UnionPayApi {
+    /**
+     * PC网关支付、WAP支付
+     *
+     * @param resp    HttpServletResponse
+     * @param reqData 请求参数
+     * @throws IOException 异常
+     */
+    @Deprecated
+    public static void frontConsume(HttpServletResponse resp, Map<String, String> reqData) throws IOException {
+        String html = AcpService.createAutoFormHtml(SDKConfig.getConfig().getFrontRequestUrl(), reqData, "UTF-8");
+        resp.getWriter().write(html);
+    }
+
+    /**
+     * 前端请求
+     *
+     * @param resp    HttpServletResponse
+     * @param reqData 请求参数
+     * @throws IOException 异常
+     */
+    public static void frontRequest(HttpServletResponse resp, Map<String, String> reqData) throws IOException {
+        String html = AcpService.createAutoFormHtml(SDKConfig.getConfig().getFrontRequestUrl(), reqData, "UTF-8");
+        resp.getWriter().write(html);
+    }
+
+    /**
+     * 退货交易、撤销交易
+     *
+     * @param reqData 请求参数
+     * @return {String}
+     */
+    @Deprecated
+    public static String refund(Map<String, String> reqData) {
+        return doPost(SDKConfig.getConfig().getBackRequestUrl(), reqData);
+    }
+
+    /**
+     * 退货交、撤销交易
+     *
+     * @param reqData 请求参数
+     * @return 转化后的 Map
+     */
+    @Deprecated
+    public static Map<String, String> refundByMap(Map<String, String> reqData) {
+        return SDKUtil.convertResultStringToMap(refund(reqData));
+    }
+
+
+    /**
+     * 后台请求返回String
+     *
+     * @param reqData 请求参数
+     * @return {String}
+     */
+    public static String backRequest(Map<String, String> reqData) {
+        return doPost(SDKConfig.getConfig().getBackRequestUrl(), reqData);
+    }
+
+    /**
+     * 后台请求返回Map
+     *
+     * @param reqData 请求参数
+     * @return 转化后的 Map
+     */
+    public static Map<String, String> backRequestByMap(Map<String, String> reqData) {
+        return SDKUtil.convertResultStringToMap(backRequest(reqData));
+    }
+
+
+    /**
+     * 单订单查询返回String
+     *
+     * @param reqData 请求参数
+     * @return {String}
+     */
+    public static String singleQuery(Map<String, String> reqData) {
+        return doPost(SDKConfig.getConfig().getSingleQueryUrl(), reqData);
+    }
+
+    /**
+     * 单订单查询返回Map
+     *
+     * @param reqData 请求参数
+     * @return 转化后的 Map
+     */
+    public static Map<String, String> singleQueryByMap(Map<String, String> reqData) {
+        return SDKUtil.convertResultStringToMap(singleQuery(reqData));
+    }
+
+    /**
+     * 文件传输类接口
+     *
+     * @param reqData 请求参数
+     * @return {String}
+     */
+    public static String fileTransfer(Map<String, String> reqData) {
+        return doPost(SDKConfig.getConfig().getFileTransUrl(), reqData);
+    }
+
+    /**
+     * 文件传输类接口
+     *
+     * @param reqData 请求参数
+     * @return 转化后的 Map
+     */
+    public static Map<String, String> fileTransferByMap(Map<String, String> reqData) {
+        return SDKUtil.convertResultStringToMap(fileTransfer(reqData));
+    }
+
+    /**
+     * APP控件支付
+     *
+     * @param reqData 请求参数
+     * @return {String}
+     */
+    public static String AppConsume(Map<String, String> reqData) {
+        return doPost(SDKConfig.getConfig().getAppRequestUrl(), reqData);
+    }
+
+    /**
+     * APP控件支付
+     *
+     * @param reqData 请求参数
+     * @return 转化后的 Map
+     */
+    public static Map<String, String> AppConsumeByMap(Map<String, String> reqData) {
+        return SDKUtil.convertResultStringToMap(AppConsume(reqData));
+    }
+
+    /**
+     * 网关缴费
+     *
+     * @param resp    HttpServletResponse
+     * @param reqData 请求参数
+     * @throws IOException 异常
+     */
+    public static void jfFrontConsume(HttpServletResponse resp, Map<String, String> reqData) throws IOException {
+        String html = AcpService.createAutoFormHtml(SDKConfig.getConfig().getJfFrontRequestUrl(), reqData, "UTF-8");
+        resp.getWriter().write(html);
+    }
+
+    /**
+     * APP缴费
+     *
+     * @param reqData 请求参数
+     * @return {String}
+     */
+    public static String jfAppTrans(Map<String, String> reqData) {
+        return doPost(SDKConfig.getConfig().getAppRequestUrl(), reqData);
+    }
+
+    /**
+     * APP缴费
+     *
+     * @param reqData 请求参数
+     * @return 转化后的 Map
+     */
+    public static Map<String, String> jfAppTransByMap(Map<String, String> reqData) {
+        return SDKUtil.convertResultStringToMap(jfAppTrans(reqData));
+    }
+
+    /**
+     * 获取地区列表
+     *
+     * @return {String}
+     */
+    public static String getAllAreas() {
+        return doGet("https://gateway.95516.com/jiaofei/config/s/areas");
+    }
+
+    /**
+     * 获取业务目录
+     *
+     * @return {String}
+     */
+    public static String getAllCategories() {
+        return doGet("https://gateway.95516.com/jiaofei/config/s/categories/00");
+    }
+
+    public static String doGet(String url) {
+        return HttpKit.getDelegate().get(url);
+    }
+
+    public static String doPost(String url, Map<String, String> params) {
+        Map<String, Object> temp = new HashMap<String, Object>(params.size());
+        temp.putAll(params);
+        return HttpKit.getDelegate().post(url, temp);
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/UnionPayApiConfig.java b/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/UnionPayApiConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..64c86b5c07af189438f177255f64107eda86a5f2
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/unionpay/UnionPayApiConfig.java
@@ -0,0 +1,319 @@
+package com.zscat.mallplus.unionpay;
+
+import cn.hutool.core.date.DateUtil;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Javen
+ */
+public class UnionPayApiConfig {
+    private UnionPayApiConfig() {
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+        private String version;
+        private String encoding;
+        private String signMethod;
+        private String txnType;
+        private String txnSubType;
+        private String bizType;
+        private String channelType;
+        private String accessType;
+        private String merId;
+        private String frontUrl;
+        private String backUrl;
+        private String orderId;
+        private String currencyCode;
+        private String txnAmt;
+        private String txnTime;
+        private String payTimeout;
+        private String accNo;
+        private String reqReserved;
+        private String orderDesc;
+        private String acqInsCode;
+        private String merCatCode;
+        private String merName;
+        private String merAbbr;
+        private String origQryId;
+        private String settleDate;
+        private String fileType;
+        private String bussCode;
+        private String billQueryInfo;
+        private String qrNo;
+        private String termId;
+        private String accType;
+        private String encryptCertId;
+        private String customerInfo;
+
+        public Map<String, String> createMap() {
+            Map<String, String> map = new HashMap<String, String>();
+            if (SDKUtil.isEmpty(version)) {
+                version = "5.1.0";
+            }
+            if (SDKUtil.isEmpty(encoding)) {
+                encoding = "UTF-8";
+            }
+            if (SDKUtil.isEmpty(signMethod)) {
+                signMethod = "01";
+            }
+            if (SDKUtil.isEmpty(txnType)) {
+                txnType = "01";
+            }
+            if (SDKUtil.isEmpty(txnSubType)) {
+                txnSubType = "01";
+            }
+            if (SDKUtil.isEmpty(bizType)) {
+                bizType = "000201";
+            }
+            if (SDKUtil.isEmpty(channelType)) {
+                channelType = "07";
+            }
+            if (SDKUtil.isEmpty(accessType)) {
+                accessType = "0";
+            }
+            if (SDKUtil.isEmpty(merId)) {
+                throw new IllegalArgumentException("merId 值不能为 null");
+            }
+            if (SDKUtil.isEmpty(backUrl)) {
+                backUrl = SDKConfig.getConfig().getBackUrl();
+            }
+            if (SDKUtil.isEmpty(frontUrl)) {
+                frontUrl = SDKConfig.getConfig().getFrontUrl();
+            }
+
+            if (SDKUtil.isEmpty(orderId)) {
+                orderId = String.valueOf(System.currentTimeMillis());
+            }
+            if (orderId.contains("_") || orderId.contains("-")) {
+                throw new IllegalArgumentException("orderId 值不应含“-”或“_”");
+            }
+            if (SDKUtil.isEmpty(currencyCode)) {
+                currencyCode = "156";
+            }
+            if (SDKUtil.isEmpty(txnAmt)) {
+                txnAmt = "1";
+            }
+            if (SDKUtil.isEmpty(txnTime)) {
+                txnTime = DateUtil.format(new Date(), "yyyyMMddHHmmss");
+            }
+            if (SDKUtil.isEmpty(payTimeout)) {
+                payTimeout = DateUtil.format(new Date(new Date().getTime() + 15 * 60 * 1000), "YYYYMMddHHmmss");
+            }
+
+
+            map.put("version", version);
+            map.put("encoding", encoding);
+            map.put("signMethod", signMethod);
+            map.put("txnType", txnType);
+            map.put("txnSubType", txnSubType);
+            map.put("bizType", bizType);
+            map.put("channelType", channelType);
+            map.put("accessType", accessType);
+            map.put("merId", merId);
+            map.put("frontUrl", frontUrl);
+            map.put("backUrl", backUrl);
+            map.put("orderId", orderId);
+            map.put("currencyCode", currencyCode);
+            map.put("txnAmt", txnAmt);
+            map.put("txnTime", txnTime);
+            map.put("payTimeout", payTimeout);
+            map.put("accNo", accNo);
+            map.put("reqReserved", reqReserved);
+            map.put("orderDesc", orderDesc);
+            map.put("acqInsCode", acqInsCode);
+            map.put("merCatCode", merCatCode);
+            map.put("merName", merName);
+            map.put("merAbbr", merAbbr);
+            map.put("origQryId", origQryId);
+            map.put("settleDate", settleDate);
+            map.put("fileType", fileType);
+            map.put("bussCode", bussCode);
+            map.put("billQueryInfo", billQueryInfo);
+            map.put("qrNo", qrNo);
+            map.put("termId", termId);
+            map.put("accType", accType);
+            map.put("encryptCertId", encryptCertId);
+            map.put("customerInfo", customerInfo);
+
+            return setSignMap(map);
+        }
+
+        public Map<String, String> setSignMap(Map<String, String> map) {
+            // 报文中certId,signature的值是在signData方法中获取并自动赋值的，只要证书配置正确即可。
+            return AcpService.sign(map, encoding);
+        }
+
+
+        public Builder setVersion(String version) {
+            this.version = version;
+            return this;
+        }
+
+        public Builder setEncoding(String encoding) {
+            this.encoding = encoding;
+            return this;
+        }
+
+        public Builder setSignMethod(String signMethod) {
+            this.signMethod = signMethod;
+            return this;
+        }
+
+        public Builder setTxnType(String txnType) {
+            this.txnType = txnType;
+            return this;
+        }
+
+        public Builder setTxnSubType(String txnSubType) {
+            this.txnSubType = txnSubType;
+            return this;
+        }
+
+        public Builder setBizType(String bizType) {
+            this.bizType = bizType;
+            return this;
+        }
+
+        public Builder setChannelType(String channelType) {
+            this.channelType = channelType;
+            return this;
+        }
+
+        public Builder setAccessType(String accessType) {
+            this.accessType = accessType;
+            return this;
+        }
+
+        public Builder setMerId(String merId) {
+            this.merId = merId;
+            return this;
+        }
+
+        public Builder setFrontUrl(String frontUrl) {
+            this.frontUrl = frontUrl;
+            return this;
+        }
+
+        public Builder setBackUrl(String backUrl) {
+            this.backUrl = backUrl;
+            return this;
+        }
+
+        public Builder setOrderId(String orderId) {
+            this.orderId = orderId;
+            return this;
+        }
+
+        public Builder setCurrencyCode(String currencyCode) {
+            this.currencyCode = currencyCode;
+            return this;
+        }
+
+        public Builder setTxnAmt(String txnAmt) {
+            this.txnAmt = txnAmt;
+            return this;
+        }
+
+        public Builder setTxnTime(String txnTime) {
+            this.txnTime = txnTime;
+            return this;
+        }
+
+        public Builder setPayTimeout(String payTimeout) {
+            this.payTimeout = payTimeout;
+            return this;
+        }
+
+        public Builder setAccNo(String accNo) {
+            this.accNo = accNo;
+            return this;
+        }
+
+        public Builder setReqReserved(String reqReserved) {
+            this.reqReserved = reqReserved;
+            return this;
+        }
+
+        public Builder setOrderDesc(String orderDesc) {
+            this.orderDesc = orderDesc;
+            return this;
+        }
+
+        public Builder setAcqInsCode(String acqInsCode) {
+            this.acqInsCode = acqInsCode;
+            return this;
+        }
+
+        public Builder setMerCatCode(String merCatCode) {
+            this.merCatCode = merCatCode;
+            return this;
+        }
+
+        public Builder setMerName(String merName) {
+            this.merName = merName;
+            return this;
+        }
+
+        public Builder setMerAbbr(String merAbbr) {
+            this.merAbbr = merAbbr;
+            return this;
+        }
+
+        public Builder setOrigQryId(String origQryId) {
+            this.origQryId = origQryId;
+            return this;
+        }
+
+        public Builder setSettleDate(String settleDate) {
+            this.settleDate = settleDate;
+            return this;
+        }
+
+        public Builder setFileType(String fileType) {
+            this.fileType = fileType;
+            return this;
+        }
+
+        public Builder setBussCode(String bussCode) {
+            this.bussCode = bussCode;
+            return this;
+        }
+
+        public Builder setBillQueryInfo(String billQueryInfo) {
+            this.billQueryInfo = billQueryInfo;
+            return this;
+        }
+
+        public Builder setQrNo(String qrNo) {
+            this.qrNo = qrNo;
+            return this;
+        }
+
+        public Builder setTermId(String termId) {
+            this.termId = termId;
+            return this;
+        }
+
+        public Builder setAccType(String accType) {
+            this.accType = accType;
+            return this;
+        }
+
+        public Builder setEncryptCertId(String encryptCertId) {
+            this.encryptCertId = encryptCertId;
+            return this;
+        }
+
+        public Builder setCustomerInfo(String customerInfo) {
+            this.customerInfo = customerInfo;
+            return this;
+        }
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/WxPayApi.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/WxPayApi.java
new file mode 100644
index 0000000000000000000000000000000000000000..69034849fae3d89019db3debaf313c14422f712b
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/WxPayApi.java
@@ -0,0 +1,1079 @@
+package com.zscat.mallplus.wxpay;
+
+
+import com.zscat.mallplus.core.enums.PayModel;
+import com.zscat.mallplus.core.enums.SignType;
+import com.zscat.mallplus.core.kit.HttpKit;
+import com.zscat.mallplus.core.kit.WxPayKit;
+import com.zscat.mallplus.wxpay.enums.WxApiType;
+import com.zscat.mallplus.wxpay.enums.WxDomain;
+
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>微信支付相关接口</p>
+ *
+ * @author Javen
+ */
+public class WxPayApi {
+
+    private WxPayApi() {
+    }
+
+    /**
+     * 获取接口请求的 URL
+     *
+     * @param wxApiType {@link WxApiType} 支付 API 接口枚举
+     * @return {@link String} 返回完整的接口请求URL
+     */
+    public static String getReqUrl(WxApiType wxApiType) {
+        return getReqUrl(wxApiType, null, false);
+    }
+
+    /**
+     * 获取接口请求的 URL
+     *
+     * @param wxApiType {@link WxApiType} 支付 API 接口枚举
+     * @param isSandBox 是否是沙箱环境
+     * @return {@link String} 返回完整的接口请求URL
+     */
+    public static String getReqUrl(WxApiType wxApiType, boolean isSandBox) {
+        return getReqUrl(wxApiType, null, isSandBox);
+    }
+
+    /**
+     * 获取接口请求的 URL
+     *
+     * @param wxApiType {@link WxApiType} 支付 API 接口枚举
+     * @param wxDomain  {@link WxDomain} 支付 API 接口域名枚举
+     * @param isSandBox 是否是沙箱环境
+     * @return {@link String} 返回完整的接口请求URL
+     */
+    public static String getReqUrl(WxApiType wxApiType, WxDomain wxDomain, boolean isSandBox) {
+        if (wxDomain == null) {
+            wxDomain = WxDomain.CHINA;
+        }
+        return wxDomain.getType()
+                .concat(isSandBox ? WxApiType.SAND_BOX_NEW.getType() : "")
+                .concat(wxApiType.getType());
+    }
+
+    /**
+     * 发起请求
+     *
+     * @param apiUrl 接口 URL
+     *               通过 {@link WxPayApi#getReqUrl(WxApiType)}
+     *               或者 {@link WxPayApi#getReqUrl(WxApiType, WxDomain, boolean)} 来获取
+     * @param params 接口请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String execution(String apiUrl, Map<String, String> params) {
+        return doPost(apiUrl, params);
+    }
+
+    /**
+     * 发起请求
+     *
+     * @param apiUrl 接口 URL
+     *               通过 {@link WxPayApi#getReqUrl(WxApiType)}
+     *               或者 {@link WxPayApi#getReqUrl(WxApiType, WxDomain, boolean)} 来获取
+     * @param params 接口请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String executionByGet(String apiUrl, Map<String, Object> params) {
+        return doGet(apiUrl, params);
+    }
+
+    /**
+     * 发起请求
+     *
+     * @param apiUrl   接口 URL
+     *                 通过 {@link WxPayApi#getReqUrl(WxApiType)}
+     *                 或者 {@link WxPayApi#getReqUrl(WxApiType, WxDomain, boolean)} 来获取
+     * @param params   接口请求参数
+     * @param certPath 证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String execution(String apiUrl, Map<String, String> params, String certPath, String certPass) {
+        return doPostSSL(apiUrl, params, certPath, certPass);
+    }
+
+    /**
+     * 发起请求
+     *
+     * @param apiUrl   接口 URL
+     *                 通过 {@link WxPayApi#getReqUrl(WxApiType)}
+     *                 或者 {@link WxPayApi#getReqUrl(WxApiType, WxDomain, boolean)} 来获取
+     * @param params   接口请求参数
+     * @param certFile 证书文件输入流
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String execution(String apiUrl, Map<String, String> params, InputStream certFile, String certPass) {
+        return doPostSSL(apiUrl, params, certFile, certPass);
+    }
+
+    /**
+     * 获取验签秘钥API
+     *
+     * @param mch_id     商户号
+     * @param partnerKey API 密钥
+     * @param signType   签名方式
+     * @return {@link String} 请求返回的结果
+     */
+    public static String getSignKey(String mch_id, String partnerKey, SignType signType) {
+        Map<String, String> map = new HashMap<String, String>(3);
+        String nonce_str = WxPayKit.generateStr();
+        map.put("mch_id", mch_id);
+        map.put("nonce_str", nonce_str);
+        map.put("sign", WxPayKit.createSign(map, partnerKey, signType));
+        return execution(getReqUrl(WxApiType.GET_SIGN_KEY), map);
+    }
+
+    /**
+     * 统一下单
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String pushOrder(Map<String, String> params) {
+        return pushOrder(false, null, params);
+    }
+
+    /**
+     * 统一下单
+     *
+     * @param isSandbox 是否是沙盒环境
+     * @param params    请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String pushOrder(boolean isSandbox, Map<String, String> params) {
+        return pushOrder(isSandbox, null, params);
+    }
+
+    /**
+     * 统一下单
+     *
+     * @param isSandbox 是否是沙盒环境
+     * @param wxDomain  {@link WxDomain} 支付 API 接口域名枚举
+     * @param params    请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String pushOrder(boolean isSandbox, WxDomain wxDomain, Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.UNIFIED_ORDER, wxDomain, isSandbox), params);
+    }
+
+    /**
+     * 订单查询
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String orderQuery(Map<String, String> params) {
+        return orderQuery(false, null, params);
+    }
+
+    /**
+     * 订单查询
+     *
+     * @param isSandbox 是否是沙盒环境
+     * @param params    请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String orderQuery(boolean isSandbox, Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.ORDER_QUERY, null, isSandbox), params);
+    }
+
+    /**
+     * 订单查询
+     *
+     * @param isSandbox 是否是沙盒环境
+     * @param params    请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String orderQuery(boolean isSandbox, WxDomain wxDomain, Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.ORDER_QUERY, wxDomain, isSandbox), params);
+    }
+
+    /**
+     * 关闭订单
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String closeOrder(Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.CLOSE_ORDER), params);
+    }
+
+    /**
+     * 撤销订单
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String orderReverse(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.REVERSE), params, certPath, certPass);
+    }
+
+    /**
+     * 撤销订单
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String orderReverse(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.REVERSE), params, certFile, certPass);
+    }
+
+    /**
+     * 申请退款
+     *
+     * @param isSandbox 是否是沙盒环境
+     * @param params    请求参数
+     * @param certPath  证书文件目录
+     * @param certPass  证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String orderRefund(boolean isSandbox, Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.REFUND, null, isSandbox), params, certPath, certPass);
+    }
+
+    /**
+     * 申请退款
+     *
+     * @param isSandbox 是否是沙盒环境
+     * @param params    请求参数
+     * @param certFile  证书文件的 InputStream
+     * @param certPass  证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String orderRefund(boolean isSandbox, Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.REFUND, null, isSandbox), params, certFile, certPass);
+    }
+
+    /**
+     * 查询退款
+     *
+     * @param isSandbox 是否是沙盒环境
+     * @param params    请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String orderRefundQuery(boolean isSandbox, Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.REFUND_QUERY, null, isSandbox), params);
+    }
+
+    /**
+     * 下载对账单
+     *
+     * @param isSandbox 是否是沙盒环境
+     * @param params    请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String downloadBill(boolean isSandbox, Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.DOWNLOAD_BILL, null, isSandbox), params);
+    }
+
+    /**
+     * 交易保障
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String orderReport(Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.REPORT, null, false), params);
+    }
+
+    /**
+     * 转换短链接
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String toShortUrl(Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.SHORT_URL, null, false), params);
+    }
+
+    /**
+     * 授权码查询 openId
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String authCodeToOpenid(Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.AUTH_CODE_TO_OPENID, null, false), params);
+    }
+
+    /**
+     * 刷卡支付
+     *
+     * @param isSandbox 是否是沙盒环境
+     * @param params    请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String microPay(boolean isSandbox, Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.MICRO_PAY, null, isSandbox), params);
+    }
+
+    /**
+     * 企业付款到零钱
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String transfers(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.TRANSFER, null, false), params, certPath, certPass);
+    }
+
+    /**
+     * 企业付款到零钱
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String transfers(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.TRANSFER, null, false), params, certFile, certPass);
+    }
+
+    /**
+     * 查询企业付款到零钱
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String getTransferInfo(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.GET_TRANSFER_INFO, null, false), params, certPath, certPass);
+    }
+
+    /**
+     * 查询企业付款到零钱
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String getTransferInfo(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.GET_TRANSFER_INFO, null, false), params, certFile, certPass);
+    }
+
+    /**
+     * 企业付款到银行
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String payBank(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.TRANSFER_BANK, null, false), params, certPath, certPass);
+    }
+
+    /**
+     * 企业付款到银行
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String payBank(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.TRANSFER_BANK, null, false), params, certFile, certPass);
+    }
+
+    /**
+     * 查询企业付款到银行
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String queryBank(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.GET_TRANSFER_BANK_INFO, null, false), params, certPath, certPass);
+    }
+
+    /**
+     * 查询企业付款到银行
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的  InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String queryBank(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.GET_TRANSFER_BANK_INFO, null, false), params, certFile, certPass);
+    }
+
+    /**
+     * 获取 RSA 加密公钥
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String getPublicKey(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.GET_PUBLIC_KEY, null, false), params, certPath, certPass);
+    }
+
+    /**
+     * 获取 RSA 加密公钥
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的   InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String getPublicKey(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.GET_PUBLIC_KEY, null, false), params, certFile, certPass);
+    }
+
+    /**
+     * 公众号纯签约
+     *
+     * @param params   请求参数
+     * @param payModel 商户平台模式
+     * @return {@link String} 请求返回的结果
+     */
+    public static String entrustWeb(Map<String, Object> params, PayModel payModel) {
+        if (payModel == PayModel.BUSINESS_MODEL) {
+            return executionByGet(getReqUrl(WxApiType.ENTRUST_WEB), params);
+        } else {
+            return executionByGet(getReqUrl(WxApiType.PARTNER_ENTRUST_WEB), params);
+        }
+    }
+
+
+    /**
+     * APP 纯签约
+     *
+     * @param params   请求参数
+     * @param payModel 商户平台模式
+     * @return {@link String} 请求返回的结果
+     */
+    public static String preEntrustWeb(Map<String, Object> params, PayModel payModel) {
+        if (payModel == PayModel.BUSINESS_MODEL) {
+            return executionByGet(getReqUrl(WxApiType.PRE_ENTRUST_WEB), params);
+        } else {
+            return executionByGet(getReqUrl(WxApiType.PARTNER_PRE_ENTRUST_WEB), params);
+        }
+    }
+
+
+    /**
+     * H5 纯签约
+     *
+     * @param params   请求参数
+     * @param payModel 商户平台模式
+     * @return {@link String} 请求返回的结果
+     */
+    public static String h5EntrustWeb(Map<String, Object> params, PayModel payModel) {
+        if (payModel == PayModel.BUSINESS_MODEL) {
+            return executionByGet(getReqUrl(WxApiType.H5_ENTRUST_WEB), params);
+        } else {
+            return executionByGet(getReqUrl(WxApiType.PARTNER_H5_ENTRUST_WEB), params);
+        }
+    }
+
+    /**
+     * 支付中签约
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String contractOrder(Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.PAY_CONTRACT_ORDER), params);
+    }
+
+    /**
+     * 查询签约关系
+     *
+     * @param params   请求参数
+     * @param payModel 商户平台模式
+     * @return {@link String} 请求返回的结果
+     */
+    public static String queryContract(Map<String, String> params, PayModel payModel) {
+        if (payModel == PayModel.BUSINESS_MODEL) {
+            return execution(getReqUrl(WxApiType.QUERY_ENTRUST_CONTRACT), params);
+        } else {
+            return execution(getReqUrl(WxApiType.PARTNER_QUERY_ENTRUST_CONTRACT), params);
+        }
+    }
+
+    /**
+     * 申请扣款
+     *
+     * @param params   请求参数
+     * @param payModel 商户平台模式
+     * @return {@link String} 请求返回的结果
+     */
+    public static String papPayApply(Map<String, String> params, PayModel payModel) {
+        if (payModel == PayModel.BUSINESS_MODEL) {
+            return execution(getReqUrl(WxApiType.PAP_PAY_APPLY), params);
+        } else {
+            return execution(getReqUrl(WxApiType.PARTNER_PAP_PAY_APPLY), params);
+        }
+    }
+
+    /**
+     * 申请解约
+     *
+     * @param params   请求参数
+     * @param payModel 商户平台模式
+     * @return {@link String} 请求返回的结果
+     */
+    public static String deleteContract(Map<String, String> params, PayModel payModel) {
+        if (payModel == PayModel.BUSINESS_MODEL) {
+            return execution(getReqUrl(WxApiType.DELETE_ENTRUST_CONTRACT), params);
+        } else {
+            return execution(getReqUrl(WxApiType.PARTNER_DELETE_ENTRUST_CONTRACT), params);
+        }
+    }
+
+    /**
+     * 查询签约关系对账单
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String contractBill(Map<String, String> params, PayModel payModel) {
+        if (payModel == PayModel.BUSINESS_MODEL) {
+            return execution(getReqUrl(WxApiType.QUERY_ENTRUST_CONTRACT), params);
+        } else {
+            return execution(getReqUrl(WxApiType.PARTNER_QUERY_ENTRUST_CONTRACT), params);
+        }
+    }
+
+    /**
+     * 查询代扣订单
+     *
+     * @param params   请求参数
+     * @param payModel 商户平台模式
+     * @return {@link String} 请求返回的结果
+     */
+    public static String papOrderQuery(Map<String, String> params, PayModel payModel) {
+        if (payModel == PayModel.BUSINESS_MODEL) {
+            return execution(getReqUrl(WxApiType.PAP_ORDER_QUERY), params);
+        } else {
+            return execution(getReqUrl(WxApiType.PARTNER_PAP_ORDER_QUERY), params);
+        }
+    }
+
+    /**
+     * 请求单次分账
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String profitSharing(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.PROFIT_SHARING), params, certPath, certPass);
+    }
+
+    /**
+     * 请求单次分账
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的  InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String profitSharing(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.PROFIT_SHARING), params, certFile, certPass);
+    }
+
+    /**
+     * 请求多次分账
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String multiProfitSharing(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.MULTI_PROFIT_SHARING), params, certPath, certPass);
+    }
+
+    /**
+     * 请求多次分账
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的  InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String multiProfitSharing(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.MULTI_PROFIT_SHARING), params, certFile, certPass);
+    }
+
+    /**
+     * 查询分账结果
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String profitSharingQuery(Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.PROFIT_SHARING_QUERY), params);
+    }
+
+    /**
+     * 添加分账接收方
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String profitSharingAddReceiver(Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.PROFITS_HARING_ADD_RECEIVER), params);
+    }
+
+    /**
+     * 删除分账接收方
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String profitSharingRemoveReceiver(Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.PROFIT_SHARING_REMOVE_RECEIVER), params);
+    }
+
+    /**
+     * 完结分账
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String profitSharingFinish(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.PROFIT_SHARING_FINISH), params, certPath, certPass);
+    }
+
+    /**
+     * 完结分账
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String profitSharingFinish(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.PROFIT_SHARING_FINISH), params, certFile, certPass);
+    }
+
+    /**
+     * 分账回退
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String profitSharingReturn(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.PROFIT_SHARING_RETURN), params, certPath, certPass);
+    }
+
+    /**
+     * 分账回退
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String profitSharingReturn(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.PROFIT_SHARING_RETURN), params, certFile, certPass);
+    }
+
+    /**
+     * 分账回退结果查询
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String profitSharingReturnQuery(Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.PROFIT_SHARING_RETURN_QUERY), params);
+    }
+
+    /**
+     * 发放代金券
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String sendCoupon(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.SEND_COUPON), params, certPath, certPass);
+    }
+
+    /**
+     * 发放代金券
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String sendCoupon(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.SEND_COUPON), params, certFile, certPass);
+    }
+
+    /**
+     * 查询代金券批次
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String queryCouponStock(Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.QUERY_COUPON_STOCK), params);
+    }
+
+    /**
+     * 查询代金券信息
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String queryCouponsInfo(Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.QUERY_COUPONS_INFO), params);
+    }
+
+    /**
+     * 拉取订单评价数据
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String batchQueryComment(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.BATCH_QUERY_COMMENT), params, certPath, certPass);
+    }
+
+    /**
+     * 拉取订单评价数据
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String batchQueryComment(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.BATCH_QUERY_COMMENT), params, certFile, certPass);
+    }
+
+    /**
+     * 支付押金（人脸支付）
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String depositFacePay(Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.DEPOSIT_FACE_PAY), params);
+    }
+
+    /**
+     * 支付押金（付款码支付）
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String depositMicroPay(Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.DEPOSIT_MICRO_PAY), params);
+    }
+
+    /**
+     * 查询订单
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String depositOrderQuery(Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.DEPOSIT_ORDER_QUERY), params);
+    }
+
+    /**
+     * 撤销订单
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String depositReverse(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.DEPOSIT_REVERSE), params, certPath, certPass);
+    }
+
+    /**
+     * 撤销订单
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String depositReverse(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.DEPOSIT_REVERSE), params, certFile, certPass);
+    }
+
+    /**
+     * 消费押金
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件的目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String depositConsume(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.DEPOSIT_CONSUME), params, certPath, certPass);
+    }
+
+    /**
+     * 消费押金
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String depositConsume(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.DEPOSIT_CONSUME), params, certFile, certPass);
+    }
+
+    /**
+     * 申请退款（押金）
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件的目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String depositRefund(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.DEPOSIT_REFUND), params, certPath, certPass);
+    }
+
+    /**
+     * 申请退款（押金）
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String depositRefund(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.DEPOSIT_REFUND), params, certFile, certPass);
+    }
+
+    /**
+     * 查询退款（押金）
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String depositRefundQuery(Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.DEPOSIT_REFUND_QUERY), params);
+    }
+
+    /**
+     * 下载资金账单
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String downloadFundFlow(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.DOWNLOAD_FUND_FLOW), params, certPath, certPass);
+    }
+
+    /**
+     * 下载资金账单
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String downloadFundFlow(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.DOWNLOAD_FUND_FLOW), params, certFile, certPass);
+    }
+
+    /**
+     * 刷脸支付
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String facePay(Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.FACE_PAY), params);
+    }
+
+    /**
+     * 查询刷脸支付订单
+     *
+     * @param params 请求参数
+     * @return {@link String} 请求返回的结果
+     */
+    public static String facePayQuery(Map<String, String> params) {
+        return execution(getReqUrl(WxApiType.FACE_PAY_QUERY), params);
+    }
+
+    /**
+     * 刷脸支付撤销订单
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String facePayReverse(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.FACE_PAY_REVERSE), params, certPath, certPass);
+    }
+
+    /**
+     * 刷脸支付撤销订单
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String facePayReverse(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.FACE_PAY_REVERSE), params, certFile, certPass);
+    }
+
+    /**
+     * 发放普通红包
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String sendRedPack(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.SEND_RED_PACK), params, certPath, certPass);
+    }
+
+    /**
+     * 发放普通红包
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String sendRedPack(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.SEND_RED_PACK), params, certFile, certPass);
+    }
+
+    /**
+     * 发放裂变红包
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String sendGroupRedPack(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.SEND_GROUP_RED_PACK), params, certPath, certPass);
+    }
+
+    /**
+     * 发放裂变红包
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String sendGroupRedPack(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.SEND_GROUP_RED_PACK), params, certFile, certPass);
+    }
+
+    /**
+     * 查询红包记录
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String getHbInfo(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.GET_HB_INFO), params, certPath, certPass);
+    }
+
+    /**
+     * 查询红包记录
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String getHbInfo(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.GET_HB_INFO), params, certFile, certPass);
+    }
+
+    /**
+     * 小程序发放红包接口
+     *
+     * @param params   请求参数
+     * @param certPath 证书文件目录
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String sendMiniProgramRedPack(Map<String, String> params, String certPath, String certPass) {
+        return execution(getReqUrl(WxApiType.SEND_MINI_PROGRAM_HB), params, certPath, certPass);
+    }
+
+    /**
+     * 小程序发放红包接口
+     *
+     * @param params   请求参数
+     * @param certFile 证书文件的 InputStream
+     * @param certPass 证书密码
+     * @return {@link String} 请求返回的结果
+     */
+    public static String sendMiniProgramRedPack(Map<String, String> params, InputStream certFile, String certPass) {
+        return execution(getReqUrl(WxApiType.SEND_MINI_PROGRAM_HB), params, certFile, certPass);
+    }
+
+    public static String doGet(String url, Map<String, Object> params) {
+        return HttpKit.getDelegate().get(url, params);
+    }
+
+    public static String doPost(String url, Map<String, String> params) {
+        return HttpKit.getDelegate().post(url, WxPayKit.toXml(params));
+    }
+
+    public static String doPostSSL(String url, Map<String, String> params, String certPath, String certPass) {
+        return HttpKit.getDelegate().post(url, WxPayKit.toXml(params), certPath, certPass);
+    }
+
+    public static String doPostSSL(String url, Map<String, String> params, InputStream certFile, String certPass) {
+        return HttpKit.getDelegate().post(url, WxPayKit.toXml(params), certFile, certPass);
+    }
+
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/WxPayApiConfig.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/WxPayApiConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..ca97c415094cd4d8962bb67fd77ae5e37844df1c
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/WxPayApiConfig.java
@@ -0,0 +1,36 @@
+package com.zscat.mallplus.wxpay;
+
+import lombok.*;
+
+import java.io.Serializable;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>微信支付常用配置</p>
+ *
+ * @author Javen
+ */
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class WxPayApiConfig implements Serializable {
+    private static final long serialVersionUID = -9044503427692786302L;
+
+    private String appId;
+    private String mchId;
+    private String slAppId;
+    private String slMchId;
+    private String partnerKey;
+    private String domain;
+    private String certPath;
+    private Object exParams;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/WxPayApiConfigKit.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/WxPayApiConfigKit.java
new file mode 100644
index 0000000000000000000000000000000000000000..916f6eaef085fe8c3a8b8e6d44016c06be1efaca
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/WxPayApiConfigKit.java
@@ -0,0 +1,87 @@
+package com.zscat.mallplus.wxpay;
+
+import cn.hutool.core.util.StrUtil;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>微信支付常用配置 Kit</p>
+ *
+ * @author Javen
+ */
+public class WxPayApiConfigKit {
+
+    private static final ThreadLocal<String> TL = new ThreadLocal<String>();
+
+    private static final Map<String, WxPayApiConfig> CFG_MAP = new ConcurrentHashMap<String, WxPayApiConfig>();
+    private static final String DEFAULT_CFG_KEY = "_default_key_";
+
+    /**
+     * 添加微信支付配置，每个appId只需添加一次，相同appId将被覆盖
+     *
+     * @param wxPayApiConfig 微信支付配置
+     * @return {WxPayApiConfig} 微信支付配置
+     */
+    public static WxPayApiConfig putApiConfig(WxPayApiConfig wxPayApiConfig) {
+        if (CFG_MAP.size() == 0) {
+            CFG_MAP.put(DEFAULT_CFG_KEY, wxPayApiConfig);
+        }
+        return CFG_MAP.put(wxPayApiConfig.getAppId(), wxPayApiConfig);
+    }
+
+    public static WxPayApiConfig setThreadLocalWxPayApiConfig(WxPayApiConfig wxPayApiConfig) {
+        if (StrUtil.isNotEmpty(wxPayApiConfig.getAppId())) {
+            setThreadLocalAppId(wxPayApiConfig.getAppId());
+        }
+        return putApiConfig(wxPayApiConfig);
+    }
+
+    public static WxPayApiConfig removeApiConfig(WxPayApiConfig wxPayApiConfig) {
+        return removeApiConfig(wxPayApiConfig.getAppId());
+    }
+
+    public static WxPayApiConfig removeApiConfig(String appId) {
+        return CFG_MAP.remove(appId);
+    }
+
+    public static void setThreadLocalAppId(String appId) {
+        if (StrUtil.isEmpty(appId)) {
+            appId = CFG_MAP.get(DEFAULT_CFG_KEY).getAppId();
+        }
+        TL.set(appId);
+    }
+
+    public static void removeThreadLocalAppId() {
+        TL.remove();
+    }
+
+    public static String getAppId() {
+        String appId = TL.get();
+        if (StrUtil.isEmpty(appId)) {
+            appId = CFG_MAP.get(DEFAULT_CFG_KEY).getAppId();
+        }
+        return appId;
+    }
+
+    public static WxPayApiConfig getWxPayApiConfig() {
+        String appId = getAppId();
+        return getApiConfig(appId);
+    }
+
+    public static WxPayApiConfig getApiConfig(String appId) {
+        WxPayApiConfig cfg = CFG_MAP.get(appId);
+        if (cfg == null) {
+            throw new IllegalStateException("需事先调用 WxPayApiConfigKit.putApiConfig(wxPayApiConfig) 将 appId 对应的 WxPayApiConfig 对象存入，才可以使用 WxPayApiConfigKit.getWxPayApiConfig() 的系列方法");
+        }
+        return cfg;
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/enums/ReceiverType.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/enums/ReceiverType.java
new file mode 100644
index 0000000000000000000000000000000000000000..a707b05f4303a0e18c0045ddc126bf95f33eaeed
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/enums/ReceiverType.java
@@ -0,0 +1,49 @@
+package com.zscat.mallplus.wxpay.enums;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>分账接收方类型</p>
+ *
+ * @author Javen
+ */
+
+public enum ReceiverType {
+    /**
+     * 商户ID
+     */
+    MERCHANT("MERCHANT_ID"),
+    /**
+     * 个人微信号
+     */
+    WECHATID("PERSONAL_WECHATID"),
+    /**
+     * 个人 openId（由父商户 appId 转换得到）
+     */
+    OPENID("PERSONAL_OPENID"),
+    /**
+     * 个人 sub_openid（由子商户 appId 转换得到）
+     */
+    SUB_OPENID("PERSONAL_SUB_OPENID");
+
+
+    /**
+     * 类型
+     */
+    private final String type;
+
+    ReceiverType(String type) {
+        this.type = type;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/enums/WxApiType.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/enums/WxApiType.java
new file mode 100644
index 0000000000000000000000000000000000000000..849551a184e442059f26803f947bb0a51d425a50
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/enums/WxApiType.java
@@ -0,0 +1,314 @@
+package com.zscat.mallplus.wxpay.enums;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>微信支付接口枚举</p>
+ *
+ * @author Javen
+ */
+public enum WxApiType {
+    /**
+     * 沙箱环境
+     */
+    SAND_BOX_NEW("/sandboxnew"),
+    /**
+     * 获取沙箱环境验签秘钥
+     */
+    GET_SIGN_KEY("/sandboxnew/pay/getsignkey"),
+    /**
+     * 统一下单
+     */
+    UNIFIED_ORDER("/pay/unifiedorder"),
+    /**
+     * 提交付款码支付
+     */
+    MICRO_PAY("/pay/micropay"),
+    /**
+     * 查询订单
+     */
+    ORDER_QUERY("/pay/orderquery"),
+    /**
+     * 关闭订单
+     */
+    CLOSE_ORDER("/pay/closeorder"),
+    /**
+     * 撤销订单
+     */
+    REVERSE("/secapi/pay/reverse"),
+    /**
+     * 申请退款
+     */
+    REFUND("/secapi/pay/refund"),
+    /**
+     * 查询退款
+     */
+    REFUND_QUERY("/pay/refundquery"),
+    /**
+     * 下载对账单
+     */
+    DOWNLOAD_BILL("/pay/downloadbill"),
+    /**
+     * 下载资金对账单
+     */
+    DOWNLOAD_FUND_FLOW("/pay/downloadfundflow"),
+    /**
+     * 交易保障
+     */
+    REPORT("/payitil/report"),
+    /**
+     * 转换短链接
+     */
+    SHORT_URL("/tools/shorturl"),
+    /**
+     * 授权码查询 openId
+     */
+    AUTH_CODE_TO_OPENID("/tools/authcodetoopenid"),
+    /**
+     * 拉取订单评价数据
+     */
+    BATCH_QUERY_COMMENT("/billcommentsp/batchquerycomment"),
+    /**
+     * 企业付款
+     */
+    TRANSFER("/mmpaymkttransfers/promotion/transfers"),
+    /**
+     * 查询企业付款
+     */
+    GET_TRANSFER_INFO("/mmpaymkttransfers/gettransferinfo"),
+    /**
+     * 企业付款到银行卡
+     */
+    TRANSFER_BANK("/mmpaysptrans/pay_bank"),
+    /**
+     * 查询企业付款到银行卡
+     */
+    GET_TRANSFER_BANK_INFO("/mmpaysptrans/query_bank"),
+    /**
+     * 获取 RSA 加密公钥
+     */
+    GET_PUBLIC_KEY("/risk/getpublickey"),
+    /**
+     * 发放红包
+     */
+    SEND_RED_PACK("/mmpaymkttransfers/sendredpack"),
+    /**
+     * 发放裂变红包
+     */
+    SEND_GROUP_RED_PACK("/mmpaymkttransfers/sendgroupredpack"),
+    /**
+     * 查询红包记录
+     */
+    GET_HB_INFO("/mmpaymkttransfers/gethbinfo"),
+    /**
+     * 小程序发红包
+     */
+    SEND_MINI_PROGRAM_HB("/mmpaymkttransfers/sendminiprogramhb"),
+    /**
+     * 发放代金券
+     */
+    SEND_COUPON("/mmpaymkttransfers/send_coupon"),
+    /**
+     * 查询代金券批次
+     */
+    QUERY_COUPON_STOCK("/mmpaymkttransfers/query_coupon_stock"),
+    /**
+     * 查询代金券信息
+     */
+    QUERY_COUPONS_INFO("/mmpaymkttransfers/querycouponsinfo"),
+    /**
+     * 请求单次分账
+     */
+    PROFIT_SHARING("/secapi/pay/profitsharing"),
+    /**
+     * 请求多次分账
+     */
+    MULTI_PROFIT_SHARING("/secapi/pay/multiprofitsharing"),
+    /**
+     * 查询分账结果
+     */
+    PROFIT_SHARING_QUERY("/pay/profitsharingquery"),
+    /**
+     * 添加分账接收方
+     */
+    PROFITS_HARING_ADD_RECEIVER("/pay/profitsharingaddreceiver"),
+    /**
+     * 删除分账接收方
+     */
+    PROFIT_SHARING_REMOVE_RECEIVER("/pay/profitsharingremovereceiver"),
+    /**
+     * 完结分账
+     */
+    PROFIT_SHARING_FINISH("/secapi/pay/profitsharingfinish"),
+    /**
+     * 分账回退
+     */
+    PROFIT_SHARING_RETURN("/secapi/pay/profitsharingreturn"),
+    /**
+     * 分账回退结果查询
+     */
+    PROFIT_SHARING_RETURN_QUERY("/pay/profitsharingreturnquery"),
+    /**
+     * 支付押金（人脸支付）
+     */
+    DEPOSIT_FACE_PAY("/deposit/facepay"),
+    /**
+     * 支付押金（付款码支付）
+     */
+    DEPOSIT_MICRO_PAY("/deposit/micropay"),
+    /**
+     * 查询订单（押金）
+     */
+    DEPOSIT_ORDER_QUERY("/deposit/orderquery"),
+    /**
+     * 撤销订单（押金）
+     */
+    DEPOSIT_REVERSE("/deposit/reverse"),
+    /**
+     * 消费押金
+     */
+    DEPOSIT_CONSUME("/deposit/consume"),
+    /**
+     * 申请退款（押金）
+     */
+    DEPOSIT_REFUND("/deposit/refund"),
+    /**
+     * 查询退款（押金）
+     */
+    DEPOSIT_REFUND_QUERY("deposit/refundquery"),
+    /**
+     * 公众号纯签约
+     */
+    ENTRUST_WEB("/papay/entrustweb"),
+    /**
+     * 公众号纯签约（服务商模式）
+     */
+    PARTNER_ENTRUST_WEB("/papay/partner/entrustweb"),
+    /**
+     * APP纯签约
+     */
+    PRE_ENTRUST_WEB("/papay/preentrustweb"),
+    /**
+     * APP纯签约（服务商模式）
+     */
+    PARTNER_PRE_ENTRUST_WEB("/papay/partner/preentrustweb"),
+    /**
+     * H5纯签约
+     */
+    H5_ENTRUST_WEB("/papay/h5entrustweb"),
+    /**
+     * H5纯签约（服务商模式）
+     */
+    PARTNER_H5_ENTRUST_WEB("/papay/partner/h5entrustweb"),
+    /**
+     * 支付中签约
+     */
+    PAY_CONTRACT_ORDER("/pay/contractorder"),
+    /**
+     * 查询签约关系
+     */
+    QUERY_ENTRUST_CONTRACT("/papay/querycontract"),
+    /**
+     * 查询签约关系（服务商模式）
+     */
+    PARTNER_QUERY_ENTRUST_CONTRACT("/papay/partner/querycontract"),
+    /**
+     * 代扣申请扣款
+     */
+    PAP_PAY_APPLY("/pay/pappayapply"),
+    /**
+     * 代扣申请扣款（服务商模式）
+     */
+    PARTNER_PAP_PAY_APPLY("/pay/partner/pappayapply"),
+    /**
+     * 查询代扣订单
+     */
+    PAP_ORDER_QUERY("/pay/paporderquery"),
+    /**
+     * 查询代扣订单
+     */
+    PARTNER_PAP_ORDER_QUERY("/pay/partner/paporderquery"),
+    /**
+     * 代扣申请解约
+     */
+    DELETE_ENTRUST_CONTRACT("/papay/deletecontract"),
+    /**
+     * 代扣申请解约（服务商模式）
+     */
+    PARTNER_DELETE_ENTRUST_CONTRACT("/papay/partner/deletecontract"),
+    /**
+     * 刷脸支付
+     */
+    FACE_PAY("/pay/facepay"),
+    /**
+     * 查询刷脸支付订单
+     */
+    FACE_PAY_QUERY("/pay/facepayqueryy"),
+    /**
+     * 撤销刷脸支付订单
+     */
+    FACE_PAY_REVERSE("/secapi/pay/facepayreverse"),
+    /**
+     * 小微商户申请入驻
+     */
+    MICRO_SUBMIT("/applyment/micro/submit"),
+    /**
+     * 查询申请状态
+     */
+    GET_MICRO_SUBMIT_STATE("/applyment/micro/getstate"),
+    /**
+     * 提交升级申请
+     */
+    MICRO_SUBMIT_UPGRADE("/applyment/micro/submitupgrade"),
+    /**
+     * 查询升级申请单状态
+     */
+    GET_MICRO_UPGRADE_STATE("/applyment/micro/getupgradestate"),
+    /**
+     * 查询提现状态
+     */
+    QUERY_AUTO_WITH_DRAW_BY_DATE("/fund/queryautowithdrawbydate"),
+    /**
+     * 修改结算银行卡
+     */
+    MICRO_MODIFY_ARCHIVES("/applyment/micro/modifyarchives"),
+    /**
+     * 重新发起提现
+     */
+    RE_AUTO_WITH_DRAW_BY_DATE("/fund/reautowithdrawbydate"),
+    /**
+     * 修改联系信息
+     */
+    MICRO_MODIFY_CONTACT_INFO("/applyment/micro/modifycontactinfo"),
+    /**
+     * 小微商户关注功能配置
+     */
+    ADD_RECOMMEND_CONF("/secapi/mkt/addrecommendconf"),
+    /**
+     * 小微商户开发配置新增支付目录
+     */
+    ADD_SUB_DEV_CONFIG("/secapi/mch/addsubdevconfig"),
+    /**
+     * 小微商户开发配置查询
+     */
+    QUERY_SUB_DEV_CONFIG("/secapi/mch/querysubdevconfig");
+
+    /**
+     * 类型
+     */
+    private final String type;
+
+    WxApiType(String type) {
+        this.type = type;
+    }
+
+    public String getType() {
+        return type;
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/enums/WxDomain.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/enums/WxDomain.java
new file mode 100644
index 0000000000000000000000000000000000000000..1db492e0ea975764ec78daedc224526b10211433
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/enums/WxDomain.java
@@ -0,0 +1,47 @@
+package com.zscat.mallplus.wxpay.enums;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>微信支付可用域名枚举</p>
+ *
+ * @author Javen
+ */
+public enum WxDomain {
+    /**
+     * 中国国内
+     */
+    CHINA("https://api.mch.weixin.qq.com"),
+    /**
+     * 中国国内(备用域名)
+     */
+    CHINA2("https://api2.mch.weixin.qq.com"),
+    /**
+     * 东南亚
+     */
+    HK("https://apihk.mch.weixin.qq.com"),
+    /**
+     * 其它
+     */
+    US("https://apius.mch.weixin.qq.com");
+
+
+    /**
+     * 域名
+     */
+    private final String domain;
+
+    WxDomain(String domain) {
+        this.domain = domain;
+    }
+
+    public String getType() {
+        return domain;
+    }
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/AuthCodeToOpenIdModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/AuthCodeToOpenIdModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..e4c1b4fcc48113395f550dafd3aef50273140572
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/AuthCodeToOpenIdModel.java
@@ -0,0 +1,35 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>授权码查询 openId Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.wxpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class AuthCodeToOpenIdModel extends BaseModel {
+    private String appid;
+    private String sub_appid;
+    private String mch_id;
+    private String sub_mch_id;
+    private String auth_code;
+    private String nonce_str;
+    private String sign;
+    private String sign_type;
+
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/BatchQueryCommentModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/BatchQueryCommentModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..e92018f7a175ff4dfec1d34035890d32c3426f36
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/BatchQueryCommentModel.java
@@ -0,0 +1,35 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>拉取订单评价数据 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.wxpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class BatchQueryCommentModel extends BaseModel {
+    private String appid;
+    private String mch_id;
+    private String nonce_str;
+    private String sign;
+    private String sign_type;
+    private String begin_time;
+    private String end_time;
+    private String offset;
+    private String limit;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/CloseOrderModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/CloseOrderModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..957128bd59dadf45dbe677a10adcfef12531ac9e
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/CloseOrderModel.java
@@ -0,0 +1,34 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>关闭订单 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.wxpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class CloseOrderModel extends BaseModel {
+    private String appid;
+    private String sub_appid;
+    private String mch_id;
+    private String sub_mch_id;
+    private String out_trade_no;
+    private String nonce_str;
+    private String sign;
+    private String sign_type;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/DepositConsume.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/DepositConsume.java
new file mode 100644
index 0000000000000000000000000000000000000000..b26dee22fc031ebda29ac6de8a69a95884177d37
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/DepositConsume.java
@@ -0,0 +1,38 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>消费押金 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.wxpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class DepositConsume extends BaseModel {
+    private String appid;
+    private String sub_appid;
+    private String mch_id;
+    private String sub_mch_id;
+    private String transaction_id;
+    private String out_trade_no;
+    private String total_fee;
+    private String consume_fee;
+    private String fee_type;
+    private String nonce_str;
+    private String sign;
+    private String sign_type;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/DownloadBillModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/DownloadBillModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..755f4a3979e12859d5a98fb0ed7ab53ccd3fb773
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/DownloadBillModel.java
@@ -0,0 +1,36 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>下载对账单 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.wxpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class DownloadBillModel extends BaseModel {
+    private String appid;
+    private String sub_appid;
+    private String mch_id;
+    private String sub_mch_id;
+    private String nonce_str;
+    private String sign;
+    private String sign_type;
+    private String bill_date;
+    private String bill_type;
+    private String tar_type;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/DownloadFundFlowModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/DownloadFundFlowModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..e78eecc21a51f0f321c09f66e136c76d2740f3c2
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/DownloadFundFlowModel.java
@@ -0,0 +1,34 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>下载资金账单 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.wxpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class DownloadFundFlowModel extends BaseModel {
+    private String appid;
+    private String mch_id;
+    private String nonce_str;
+    private String sign;
+    private String sign_type;
+    private String bill_date;
+    private String account_type;
+    private String tar_type;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/GetHbInfoModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/GetHbInfoModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..60562e4fa8ae1e5bca2b4c730e66eacdbf90cc9a
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/GetHbInfoModel.java
@@ -0,0 +1,32 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>查询红包记录</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.wxpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class GetHbInfoModel extends BaseModel {
+    private String nonce_str;
+    private String sign;
+    private String mch_billno;
+    private String mch_id;
+    private String appid;
+    private String bill_type;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/GetTransferInfoModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/GetTransferInfoModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..94e10f35ae06f19f474b1d97edbcc549e2d95eef
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/GetTransferInfoModel.java
@@ -0,0 +1,32 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>企业付款到零钱 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.wxpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class GetTransferInfoModel extends BaseModel {
+    private String nonce_str;
+    private String sign;
+    private String partner_trade_no;
+    private String mch_id;
+    private String appid;
+
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/MicroPayModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/MicroPayModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..61619ef26e2cfa603f2f5ea56e825fe1f018c945
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/MicroPayModel.java
@@ -0,0 +1,58 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>付款码支付 Model</p>
+ * <p>支持: 付款支付、支付押金（人脸支付）、支付押金（付款码支付）</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.wxpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class MicroPayModel extends BaseModel {
+    /**
+     * 是否押金支付
+     */
+    private String deposit;
+    private String appid;
+    private String sub_appid;
+    private String mch_id;
+    private String sub_mch_id;
+    private String device_info;
+    private String nonce_str;
+    private String sign;
+    private String sign_type;
+    private String body;
+    private String detail;
+    private String attach;
+    private String out_trade_no;
+    private String total_fee;
+    private String fee_type;
+    private String spbill_create_ip;
+    private String goods_tag;
+    private String limit_pay;
+    private String time_start;
+    private String time_expire;
+    private String auth_code;
+    private String receipt;
+    private String scene_info;
+    private String openid;
+    /**
+     * 人脸凭证，用于人脸支付
+     */
+    private String face_code;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/OrderQueryModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/OrderQueryModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..bead3f62e73079168b1902695027e319232ee7b8
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/OrderQueryModel.java
@@ -0,0 +1,39 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>查询订单 Model</p>
+ * <p>支持: 普通订单查询、刷脸支付订单、查询分账结果、回退结果查询</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.wxpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class OrderQueryModel extends BaseModel {
+    private String appid;
+    private String sub_appid;
+    private String mch_id;
+    private String sub_mch_id;
+    private String transaction_id;
+    private String out_trade_no;
+    private String order_id;
+    private String out_order_no;
+    private String out_return_no;
+    private String nonce_str;
+    private String sign;
+    private String sign_type;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/ProfitSharingModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/ProfitSharingModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..d9692d5c0415f7d4c1f58303a2fc2aaf4d7ea4ed
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/ProfitSharingModel.java
@@ -0,0 +1,40 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>分账 Model</p>
+ *
+ * <p>支持: 请求单次分账、请求多次分账、添加分账接收方、删除分账接收方、完结分账</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.wxpay.model;
+
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class ProfitSharingModel extends BaseModel {
+    private String appid;
+    private String sub_appid;
+    private String mch_id;
+    private String sub_mch_id;
+    private String nonce_str;
+    private String sign;
+    private String sign_type;
+    private String transaction_id;
+    private String out_order_no;
+    private String receivers;
+    private String description;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/ProfitSharingReturn.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/ProfitSharingReturn.java
new file mode 100644
index 0000000000000000000000000000000000000000..c36bc2524df1a9af50224997444432ab791a98f8
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/ProfitSharingReturn.java
@@ -0,0 +1,40 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>分账回退 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.wxpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class ProfitSharingReturn extends BaseModel {
+    private String appid;
+    private String sub_appid;
+    private String mch_id;
+    private String sub_mch_id;
+    private String nonce_str;
+    private String sign;
+    private String sign_type;
+    private String order_id;
+    private String out_order_no;
+    private String out_return_no;
+    private String return_account_type;
+    private String return_account;
+    private String return_amount;
+    private String description;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/RefundModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/RefundModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..c0e0379dad032d6d15c5d1cc01fb99d156f6f6a0
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/RefundModel.java
@@ -0,0 +1,43 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>申请退款 Model</p>
+ * <p>支持: 普通接口申请退款、刷脸支付退款、支付押金退款</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.wxpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class RefundModel extends BaseModel {
+    private String appid;
+    private String sub_appid;
+    private String mch_id;
+    private String sub_mch_id;
+    private String nonce_str;
+    private String sign;
+    private String sign_type;
+    private String transaction_id;
+    private String out_trade_no;
+    private String out_refund_no;
+    private String total_fee;
+    private String refund_fee;
+    private String refund_fee_type;
+    private String refund_desc;
+    private String refund_account;
+    private String notify_url;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/RefundQueryModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/RefundQueryModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..ae724642ecf7e09dc133cc753caae418089344cc
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/RefundQueryModel.java
@@ -0,0 +1,40 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>查询退款 Model</p>
+ * <p>支持: 普通接口退款查询、刷脸支付退款查询、支付押金退款查询</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.wxpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class RefundQueryModel extends BaseModel {
+    private String appid;
+    private String sub_appid;
+    private String mch_id;
+    private String sub_mch_id;
+    private String nonce_str;
+    private String sign;
+    private String sign_type;
+    private String transaction_id;
+    private String out_trade_no;
+    private String out_refund_no;
+    private String refund_id;
+    private String offset;
+
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/ReportModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/ReportModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..224bcb8741902fe47bfdd5139fbfc94937c48f2a
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/ReportModel.java
@@ -0,0 +1,44 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>交易保障 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.wxpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class ReportModel extends BaseModel {
+    private String appid;
+    private String sub_appid;
+    private String mch_id;
+    private String sub_mch_id;
+    private String device_info;
+    private String nonce_str;
+    private String sign;
+    private String sign_type;
+    private String interface_url;
+    private String execute_time;
+    private String return_code;
+    private String return_msg;
+    private String result_code;
+    private String err_code;
+    private String err_code_des;
+    private String out_trade_no;
+    private String user_ip;
+    private String time;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/ReverseModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/ReverseModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..97fb302507355961c9fce4502f8b867a265aa52d
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/ReverseModel.java
@@ -0,0 +1,36 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>撤销订单 Model</p>
+ * <p>支持: 普通支付撤销订单、刷脸支付撤销订单</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.wxpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class ReverseModel extends BaseModel {
+    private String appid;
+    private String sub_appid;
+    private String mch_id;
+    private String sub_mch_id;
+    private String transaction_id;
+    private String out_trade_no;
+    private String nonce_str;
+    private String sign;
+    private String sign_type;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/SendReadPackModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/SendReadPackModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..e60c5e1d59356954d5b21a06f2573ebe4c0e6567
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/SendReadPackModel.java
@@ -0,0 +1,43 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p> 微信发送红包 Mode </p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.wxpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class SendReadPackModel extends BaseModel {
+    private String nonce_str;
+    private String sign;
+    private String mch_billno;
+    private String mch_id;
+    private String wxappid;
+    private String send_name;
+    private String re_openid;
+    private String total_amount;
+    private String total_num;
+    private String amt_type;
+    private String wishing;
+    private String client_ip;
+    private String act_name;
+    private String remark;
+    private String scene_id;
+    private String risk_info;
+    private String notify_way;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/ShortUrlModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/ShortUrlModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..f38f960d0a849f62f0dba890a48590858834b6ad
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/ShortUrlModel.java
@@ -0,0 +1,34 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>转换短链接 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.wxpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class ShortUrlModel extends BaseModel {
+    private String appid;
+    private String sub_appid;
+    private String mch_id;
+    private String sub_mch_id;
+    private String long_url;
+    private String nonce_str;
+    private String sign;
+    private String sign_type;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/TransferModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/TransferModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..5d4380dec66aaeab75e6865b06fb31c5430e245c
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/TransferModel.java
@@ -0,0 +1,38 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>企业付款到零钱 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.wxpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class TransferModel extends BaseModel {
+    private String mch_appid;
+    private String mchid;
+    private String device_info;
+    private String nonce_str;
+    private String sign;
+    private String partner_trade_no;
+    private String openid;
+    private String check_name;
+    private String re_user_name;
+    private String amount;
+    private String desc;
+    private String spbill_create_ip;
+}
diff --git a/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/UnifiedOrderModel.java b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/UnifiedOrderModel.java
new file mode 100644
index 0000000000000000000000000000000000000000..6fb4ef5fbcdfc5909739784b95506f8c675b77e4
--- /dev/null
+++ b/mallplus-pay/src/main/java/com/zscat/mallplus/wxpay/model/UnifiedOrderModel.java
@@ -0,0 +1,53 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>统一下单 Model</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.wxpay.model;
+
+import com.zscat.mallplus.core.model.BaseModel;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class UnifiedOrderModel extends BaseModel {
+    private String appid;
+    private String mch_id;
+    private String sub_appid;
+    private String sub_mch_id;
+    private String device_info;
+    private String nonce_str;
+    private String sign;
+    private String sign_type;
+    private String body;
+    private String detail;
+    private String attach;
+    private String out_trade_no;
+    private String fee_type;
+    private String total_fee;
+    private String spbill_create_ip;
+    private String time_start;
+    private String time_expire;
+    private String goods_tag;
+    private String notify_url;
+    private String trade_type;
+    private String product_id;
+    private String limit_pay;
+    private String openid;
+    private String sub_openid;
+    private String receipt;
+    private String scene_info;
+    private String profit_sharing;
+}
diff --git a/mallplus-portal/MP_verify_8U0gHxfvQWhdo4DS.txt b/mallplus-portal/MP_verify_8U0gHxfvQWhdo4DS.txt
new file mode 100644
index 0000000000000000000000000000000000000000..44c83749b77697f009fa01d06e4ed3e14359849c
--- /dev/null
+++ b/mallplus-portal/MP_verify_8U0gHxfvQWhdo4DS.txt
@@ -0,0 +1 @@
+8U0gHxfvQWhdo4DS
\ No newline at end of file
diff --git a/mallplus-portal/pom.xml b/mallplus-portal/pom.xml
index 03a45d06fd10f05b3a51cd4bd9d130208906f91e..25cc6337e51d11ae256f42001c07fbffe6966a7a 100644
--- a/mallplus-portal/pom.xml
+++ b/mallplus-portal/pom.xml
@@ -23,7 +23,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <j2cache.version>2.7.2-release</j2cache.version>
-        <ijapy.version>1.2.0</ijapy.version>
+        <ijapy.version>2.3.2</ijapy.version>
         <zxing.version>3.2.1</zxing.version>
         <weixin.version>1.3.0</weixin.version>
         <enjoy.version>3.5</enjoy.version>
@@ -31,10 +31,11 @@
     </properties>
 
     <dependencies>
+
         <dependency>
-            <groupId>com.github.javen205</groupId>
-            <artifactId>IJPay</artifactId>
-            <version>${ijapy.version}</version>
+            <groupId>com.jfinal</groupId>
+            <artifactId>enjoy</artifactId>
+            <version>${enjoy.version}</version>
         </dependency>
         <!-- 开源多维码生成工具 -->
         <dependency>
@@ -59,18 +60,22 @@
             <artifactId>commons-logging</artifactId>
             <version>1.2</version>
         </dependency>
-        <dependency>
-            <groupId>com.alipay.sdk</groupId>
-            <artifactId>alipay-sdk-java</artifactId>
-            <version>3.0.52.ALL</version>
-        </dependency>
+        <!-- <dependency>
+             <groupId>com.alipay.sdk</groupId>
+             <artifactId>alipay-sdk-java</artifactId>
+             <version>3.0.52.ALL</version>
+         </dependency>-->
         <!-- 支付宝必须 -->
         <dependency>
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
             <version>1.6.1</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.zscat.mallplus</groupId>
+            <artifactId>mallplus-pay</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>com.zscat.mallplus</groupId>
             <artifactId>mallplus-mbg</artifactId>
@@ -128,7 +133,11 @@
             <artifactId>spring-boot-starter-redis</artifactId>
             <version>1.3.8.RELEASE</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.zscat.mallplus</groupId>
+            <artifactId>mallplus-wechat</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
 
         <!--lombok依赖-->
         <dependency>
@@ -161,6 +170,11 @@
             <version>1.0</version>
             <systemPath>${project.basedir}/lib/taobao-sdk-java-auto_1457166217151-20190906.jar</systemPath>
         </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.14.4</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/MallPortalApplication.java b/mallplus-portal/src/main/java/com/zscat/mallplus/MallPortalApplication.java
index d79448f9eeecb2f5132de235fec4ddd030d6b1da..a28b1a67246599fd59818aae8e242e85770ad019 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/MallPortalApplication.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/MallPortalApplication.java
@@ -1,9 +1,11 @@
 package com.zscat.mallplus;
 
+import com.zscat.mallplus.pay.config.StartupRunner;
 import com.zscat.mallplus.pms.mapper.PmsProductMapper;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
@@ -17,10 +19,15 @@ public class MallPortalApplication {
 
     @Resource
     PmsProductMapper mapper;
+
     public static void main(String[] args) {
         System.out.println("start-------------");
         SpringApplication.run(MallPortalApplication.class, args);
         System.out.println("end-------------");
     }
 
+    @Bean
+    public StartupRunner startupRunner() {
+        return new StartupRunner();
+    }
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/MpGenerator.java b/mallplus-portal/src/main/java/com/zscat/mallplus/MpGenerator.java
index 15ff96a5a7e134dcd03f4151818a7ed386753359..5b967283abc6d1e4eaa364f9c84846128017afe7 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/MpGenerator.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/MpGenerator.java
@@ -28,7 +28,7 @@ public class MpGenerator {
         // 全局配置
         GlobalConfig gc = new GlobalConfig();
         gc.setOutputDir("/Users/java/gen");
-      //  gc.setOutputDir("F:\\home");
+        //  gc.setOutputDir("F:\\home");
         gc.setFileOverride(true);
         gc.setActiveRecord(false);// 不需要ActiveRecord特性的请改为false
         gc.setEnableCache(false);// XML 二级缓存
@@ -108,7 +108,7 @@ public class MpGenerator {
 //                    "ums_member_member_tag_relation","ums_member_product_category_relation",
 //                    "ums_member_receive_address", "ums_member_rule_setting","ums_member_statistics_info","ums_member_tag",
 //            "ums_member_task","ums_growth_change_history","ums_integration_change_history","ums_integration_consume_setting"}); // 需要生成的表
-        strategy.setInclude(new String[]{"build_repair","build_type_price","build_wuye_price","build_wuye_company","build_adv","build_apply_room","build_notice","build_group","build_group_member"});
+        strategy.setInclude(new String[]{"sms_group_record"});
         // strategy.setExclude(new String[]{"test"}); // 排除生成的表
         // 自定义实体父类
         // strategy.setSuperEntityClass("com.baomidou.demo.TestEntity");
@@ -133,7 +133,7 @@ public class MpGenerator {
         // 包配置
         PackageConfig pc = new PackageConfig();
         pc.setParent("com.zscat.mallplus");
-        pc.setModuleName("build");
+        pc.setModuleName("sms");
         mpg.setPackageInfo(pc);
 
 
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/MyApplicationRunner.java b/mallplus-portal/src/main/java/com/zscat/mallplus/MyApplicationRunner.java
index d676c028b569a4097783d00a615156d857b805fb..35edf77bc97b301587e1c108489b1c868f6a735b 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/MyApplicationRunner.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/MyApplicationRunner.java
@@ -19,6 +19,7 @@ public class MyApplicationRunner implements ApplicationRunner {
     private RedisService redisService;
     @Resource
     private SysAreaMapper areaMapper;
+
     @Override
     public void run(ApplicationArguments applicationArguments) throws Exception {
         System.out.println("-------------->" + "项目启动，now=" + new Date());
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/Person.java b/mallplus-portal/src/main/java/com/zscat/mallplus/Person.java
index 2274ff88e86fa66e3421864bd04349296f93e74b..3a48b3fc9c5b680602922ddfcdbeba501d16f19d 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/Person.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/Person.java
@@ -21,6 +21,15 @@ public class Person {
         this.age = age;
     }
 
+    public static void main(String[] args) {
+        BeanKv kv = new BeanKv();
+        if (kv == null) {
+            System.out.println("1");
+        } else {
+            System.out.println(2);
+        }
+    }
+
     public String getName() {
         return name;
     }
@@ -44,6 +53,7 @@ public class Person {
     public void setId(int id) {
         this.id = id;
     }
+
     @Override
     public String toString() {
         return "Person{" +
@@ -52,13 +62,4 @@ public class Person {
                 ", age=" + age +
                 '}';
     }
-
-    public static void main(String[] args) {
-        BeanKv kv=new BeanKv();
-        if (kv==null){
-            System.out.println("1");
-        }else {
-            System.out.println(2);
-        }
-    }
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/T.java b/mallplus-portal/src/main/java/com/zscat/mallplus/T.java
index ffb8f404301b219d7d31a3ff5f6024e579348f50..0ad4e4f74bc92c1e60f4f82343dff13fe1b33bca 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/T.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/T.java
@@ -2,14 +2,9 @@ package com.zscat.mallplus;
 
 
 import com.zscat.mallplus.util.DateUtil;
-import com.zscat.mallplus.utils.HttpUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.util.EntityUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * Created by Administrator on 2019/7/3.
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BCmsController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BCmsController.java
index 8f93a2eac8dc7c146151bfe2816478f759c81a6a..2ef61ab13680dab6e265be00f7383a0009dc8f36 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BCmsController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BCmsController.java
@@ -83,7 +83,7 @@ public class BCmsController extends ApiBaseAction {
     private RedisUtil redisUtil;
 
     @Resource
-    private  CmsSubjectProductRelationMapper subjectProductRelationMapper;
+    private CmsSubjectProductRelationMapper subjectProductRelationMapper;
 
     @Autowired
     private IUmsMemberService memberService;
@@ -93,8 +93,8 @@ public class BCmsController extends ApiBaseAction {
     @ApiOperation(value = "查询打赏列表")
     @PostMapping(value = "/reward/list")
     public Object rewardList(UmsRewardLog subject,
-                              @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                              @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
+                             @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                             @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
         return new CommonResult().success(rewardLogService.page(new Page<UmsRewardLog>(pageNum, pageSize), new QueryWrapper<>(subject).orderByDesc("create_time")));
     }
 
@@ -138,6 +138,7 @@ public class BCmsController extends ApiBaseAction {
                               @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
         return new CommonResult().success(topicService.page(new Page<CmsTopic>(pageNum, pageSize), new QueryWrapper<>(topic).orderByDesc("create_time")));
     }
+
     @SysLog(MODULE = "cms", REMARK = "查询专题列表")
     @IgnoreAuth
     @ApiOperation(value = "查询公益评论列表")
@@ -154,77 +155,79 @@ public class BCmsController extends ApiBaseAction {
     @ApiOperation(value = "查询专题详情信息")
     public Object topicDetail(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
         CmsTopic productResult = topicService.getById(id);
-        productResult.setReadCount(productResult.getReadCount()+1);
+        productResult.setReadCount(productResult.getReadCount() + 1);
         topicService.updateById(productResult);
         return new CommonResult().success(productResult);
     }
+
     @SysLog(MODULE = "pms", REMARK = "查询文章详情信息")
     @IgnoreAuth
     @PostMapping(value = "/articles.getArticleDetail")
     @ApiOperation(value = "查询文章详情信息")
     public Object subjectDetail(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
         CmsSubject productResult = subjectService.getById(id);
-        if (productResult==null){
+        if (productResult == null) {
             return new CommonResult().failed();
         }
         List<CmsSubjectProductRelation> list = subjectProductRelationMapper.selectList(new QueryWrapper<CmsSubjectProductRelation>().eq("subject_id", id));
 
-        if(list!=null && list.size()>0){
+        if (list != null && list.size() > 0) {
             List<Long> ids = list.stream()
                     .map(CmsSubjectProductRelation::getProductId)
                     .collect(Collectors.toList());
-            List<PmsProduct> products = (List<PmsProduct>) pmsProductService.list(new QueryWrapper<PmsProduct>().in("id",ids).select(ConstansValue.sampleGoodsList));
+            List<PmsProduct> products = (List<PmsProduct>) pmsProductService.list(new QueryWrapper<PmsProduct>().in("id", ids).select(ConstansValue.sampleGoodsList));
             productResult.setProducts(products);
         }
 
         //记录浏览量到redis,然后定时更新到数据库
-        String key= Rediskey.ARTICLE_VIEWCOUNT_CODE+id;
+        String key = Rediskey.ARTICLE_VIEWCOUNT_CODE + id;
         //找到redis中该篇文章的点赞数，如果不存在则向redis中添加一条
-        Map<Object,Object> viewCountItem=redisUtil.hGetAll(Rediskey.ARTICLE_VIEWCOUNT_KEY);
-        Integer viewCount=0;
-        if(!viewCountItem.isEmpty()){
-            if(viewCountItem.containsKey(key)){
-                viewCount=Integer.parseInt(viewCountItem.get(key).toString())+1;
-                redisUtil.hPut(Rediskey.ARTICLE_VIEWCOUNT_KEY,key,viewCount+"");
-            }else {
-                viewCount=1;
-                redisUtil.hPut(Rediskey.ARTICLE_VIEWCOUNT_KEY,key,1+"");
+        Map<Object, Object> viewCountItem = redisUtil.hGetAll(Rediskey.ARTICLE_VIEWCOUNT_KEY);
+        Integer viewCount = 0;
+        if (!viewCountItem.isEmpty()) {
+            if (viewCountItem.containsKey(key)) {
+                viewCount = Integer.parseInt(viewCountItem.get(key).toString()) + 1;
+                redisUtil.hPut(Rediskey.ARTICLE_VIEWCOUNT_KEY, key, viewCount + "");
+            } else {
+                viewCount = 1;
+                redisUtil.hPut(Rediskey.ARTICLE_VIEWCOUNT_KEY, key, 1 + "");
             }
-        }else{
-            viewCount=1;
-            redisUtil.hPut(Rediskey.ARTICLE_VIEWCOUNT_KEY,key,1+"");
+        } else {
+            viewCount = 1;
+            redisUtil.hPut(Rediskey.ARTICLE_VIEWCOUNT_KEY, key, 1 + "");
         }
         productResult.setReadCount(viewCount);
         return new CommonResult().success(productResult);
     }
+
     @SysLog(MODULE = "cms", REMARK = "创建文章")
     @ApiOperation(value = "创建文章")
     @PostMapping(value = "/createSubject")
     public Object createSubject(CmsSubject subject, BindingResult result) {
         CommonResult commonResult;
         UmsMember member = memberService.getNewCurrentMember();
-        if (member!=null){
+        if (member != null) {
             subject.setMemberId(member.getId());
             subject.setMemberName(member.getNickname());
-        }else {
+        } else {
             return new CommonResult().failed("请先登录");
         }
         if (member.getMemberLevelId() > 0) {
             UmsMemberLevel memberLevel = memberLevelService.getById(member.getMemberLevelId());
 
             int subjectCounts = subjectService.countByToday(member.getId());
-            if (ValidatorUtils.empty(subjectCounts)){
-                subjectCounts=0;
+            if (ValidatorUtils.empty(subjectCounts)) {
+                subjectCounts = 0;
             }
             if (subjectCounts > memberLevel.getArticlecount()) {
                 commonResult = new CommonResult().failed("你今天已经有发" + memberLevel.getArticlecount() + "篇文章");
                 return commonResult;
             }
         }
-        if (subject.getQsType()==1){
+        if (subject.getQsType() == 1) {
             subject.setSchoolName(member.getSchoolName());
             subject.setSchoolId(member.getSchoolId());
-        }else {
+        } else {
             subject.setAreaName(member.getAreaName());
             subject.setAreaId(member.getAreaId());
         }
@@ -249,17 +252,17 @@ public class BCmsController extends ApiBaseAction {
     public Object createTopic(CmsTopic subject, BindingResult result) {
         CommonResult commonResult;
         UmsMember member = memberService.getNewCurrentMember();
-        if (member!=null){
+        if (member != null) {
             subject.setMemberId(member.getId());
             subject.setMemberName(member.getNickname());
-        }else {
+        } else {
             return new CommonResult().failed("请先登录");
         }
 
-        if (subject.getQsType()==1){
+        if (subject.getQsType() == 1) {
             subject.setSchoolName(member.getSchoolName());
             subject.setSchoolId(member.getSchoolId());
-        }else {
+        } else {
             subject.setAreaName(member.getAreaName());
             subject.setAreaId(member.getAreaId());
         }
@@ -286,26 +289,26 @@ public class BCmsController extends ApiBaseAction {
 
         CmsTopic subject = topicService.getById(id);
         Date now = new Date();
-        if (now.getTime()>subject.getEndTime().getTime() || now.getTime()<subject.getStartTime().getTime()){
+        if (now.getTime() > subject.getEndTime().getTime() || now.getTime() < subject.getStartTime().getTime()) {
             return new CommonResult().failed("未开始或者已过期");
         }
-        if (member!=null){
-            if (ValidatorUtils.notEmpty(subject.getAtids())){
+        if (member != null) {
+            if (ValidatorUtils.notEmpty(subject.getAtids())) {
                 String[] values = subject.getAtids().split(",");
                 List<String> list = Arrays.asList(values);
-                if(list.contains(member.getId()+"")){
+                if (list.contains(member.getId() + "")) {
                     return new CommonResult().failed("你已参加该活动");
-                }else{
-                    list.add(member.getId()+"");
+                } else {
+                    list.add(member.getId() + "");
                     subject.setAtids(Arrays.toString(list.toArray()));
                 }
             }
 
-        }else {
+        } else {
             return new CommonResult().failed("请先登录");
         }
-        subject.setReadCount(subject.getReadCount()+1);
-        subject.setAttendCount(subject.getAttendCount()+1);
+        subject.setReadCount(subject.getReadCount() + 1);
+        subject.setAttendCount(subject.getAttendCount() + 1);
 
         boolean count = topicService.updateById(subject);
         if (count) {
@@ -324,21 +327,21 @@ public class BCmsController extends ApiBaseAction {
         UmsMember member = memberService.getNewCurrentMember();
         CmsTopic subject = topicService.getById(id);
 
-        if (member!=null){
-            if (ValidatorUtils.notEmpty(subject.getAtids())){
+        if (member != null) {
+            if (ValidatorUtils.notEmpty(subject.getAtids())) {
                 String[] values = subject.getAtids().split(",");
                 List<String> list = Arrays.asList(values);
-                if(list.contains(member.getId()+"")){
-                    list.remove(member.getId()+"");
+                if (list.contains(member.getId() + "")) {
+                    list.remove(member.getId() + "");
                     subject.setAtids(Arrays.toString(list.toArray()));
                 }
             }
 
-        }else {
+        } else {
             return new CommonResult().failed("请先登录");
         }
-        subject.setReadCount(subject.getReadCount()-1);
-        subject.setAttendCount(subject.getAttendCount()-1);
+        subject.setReadCount(subject.getReadCount() - 1);
+        subject.setAttendCount(subject.getAttendCount() - 1);
 
         boolean count = topicService.updateById(subject);
         if (count) {
@@ -355,7 +358,7 @@ public class BCmsController extends ApiBaseAction {
     public Object favoriteTopic(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
         CommonResult commonResult;
         CmsTopic subject = topicService.getById(id);
-        subject.setAttentionCount(subject.getAttentionCount()+1);
+        subject.setAttentionCount(subject.getAttentionCount() + 1);
         boolean count = topicService.updateById(subject);
         if (count) {
             commonResult = new CommonResult().success(count);
@@ -371,10 +374,10 @@ public class BCmsController extends ApiBaseAction {
     public Object addSubjectCom(CmsSubjectComment subject, BindingResult result) {
         CommonResult commonResult;
         UmsMember member = memberService.getNewCurrentMember();
-        if (member!=null){
+        if (member != null) {
             subject.setMemberIcon(member.getIcon());
             subject.setMemberNickName(member.getNickname());
-        }else {
+        } else {
             return new CommonResult().failed("请先登录");
         }
         subject.setCreateTime(new Date());
@@ -387,16 +390,17 @@ public class BCmsController extends ApiBaseAction {
         }
         return commonResult;
     }
+
     @SysLog(MODULE = "cms", REMARK = "创建文章")
     @ApiOperation(value = "添加公益评论")
     @PostMapping(value = "/addTopicCom")
     public Object addTopicCom(CmsTopicComment subject, BindingResult result) {
         CommonResult commonResult;
         UmsMember member = memberService.getNewCurrentMember();
-        if (member!=null){
+        if (member != null) {
             subject.setMemberIcon(member.getIcon());
             subject.setMemberNickName(member.getNickname());
-        }else {
+        } else {
             return new CommonResult().failed("请先登录");
         }
         subject.setCreateTime(new Date());
@@ -415,7 +419,7 @@ public class BCmsController extends ApiBaseAction {
     @SysLog(MODULE = "ums", REMARK = "打赏文章")
     public Object reward(@RequestParam(value = "articlelId", required = true) Long articlelId,
                          @RequestParam(value = "coin", required = true) int coin) {
-        return subjectService.reward(articlelId,coin);
+        return subjectService.reward(articlelId, coin);
     }
 
     @PostMapping("/listTimeline")
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BHomeController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BHomeController.java
index c1fdef8421bd2dd13f386cf02eb9db72ec0dc2e6..1ba7efd07340b6e1d88f7c213071183635fa8fc6 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BHomeController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BHomeController.java
@@ -28,7 +28,6 @@ import com.zscat.mallplus.util.OssAliyunUtil;
 import com.zscat.mallplus.utils.CommonResult;
 import com.zscat.mallplus.utils.PhoneUtil;
 import com.zscat.mallplus.utils.ValidatorUtils;
-
 import com.zscat.mallplus.vo.Rediskey;
 import com.zscat.mallplus.vo.SmsCode;
 import com.zscat.mallplus.vo.UmsMemberInfoDetail;
@@ -61,11 +60,12 @@ import java.util.Map;
 @Api(tags = "HomeController", description = "首页内容管理")
 public class BHomeController {
 
+    @Autowired
+    OssAliyunUtil aliyunOSSUtil;
     @Value("${jwt.tokenHeader}")
     private String tokenHeader;
     @Value("${jwt.tokenHead}")
     private String tokenHead;
-
     @Autowired
     private IUmsMemberLocationService memberLocationService;
     @Autowired
@@ -78,20 +78,18 @@ public class BHomeController {
     private IOmsOrderService orderService;
     @Resource
     private ISmsCouponService couponService;
-
     @Resource
     private SmsCouponHistoryMapper couponHistoryMapper;
-
     @Resource
     private ISysNoticeService noticeService;
     @Resource
     private ISysMessageService messageService;
-
-
     @Resource
     private TbUserFromIdMapper fromIdMapper;
     @Resource
     private IPmsProductService pmsProductService;
+    @Resource
+    private IPmsSmallNaviconCategoryService IPmsSmallNaviconCategoryService;
 
     @IgnoreAuth
     @ApiOperation("首页内容页信息展示")
@@ -99,20 +97,20 @@ public class BHomeController {
     @RequestMapping(value = "/pc.getpageconfig", method = RequestMethod.POST)
     public Object pc_home() {
         HomeContentResult contentResult = null;
-        String key = Rediskey.HOMEPAGEPC ;
+        String key = Rediskey.HOMEPAGEPC;
         try {
             String json = redisService.get(key);
-            if (ValidatorUtils.empty(json)){
+            if (ValidatorUtils.empty(json)) {
                 contentResult = advertiseService.contentPc();
-                redisService.set(key,JsonUtils.objectToJson(contentResult));
-                redisService.expire(key,3600*5);
-            }else{
+                redisService.set(key, JsonUtils.objectToJson(contentResult));
+                redisService.expire(key, 60);
+            } else {
                 contentResult = JsonUtils.jsonToPojo(json, HomeContentResult.class);
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             contentResult = advertiseService.contentNew1();
-            redisService.set(key,JsonUtils.objectToJson(contentResult));
-            redisService.expire(key,3600*5);
+            redisService.set(key, JsonUtils.objectToJson(contentResult));
+            redisService.expire(key, 60);
         }
         return new CommonResult().success(contentResult);
     }
@@ -124,21 +122,22 @@ public class BHomeController {
     public Object contentNew1() {
 
         HomeContentResult contentResult = null;
-        String key = Rediskey.HOMEPAGE2 ;
+        String key = Rediskey.HOMEPAGE2;
         try {
             String json = redisService.get(key);
-            if (ValidatorUtils.notEmpty(json)){
+            if (ValidatorUtils.empty(json)) {
                 contentResult = advertiseService.contentNew1();
-                redisService.set(key,JsonUtils.objectToJson(contentResult));
-                redisService.expire(key,3600*5);
-            }else{
+                redisService.set(key, JsonUtils.objectToJson(contentResult));
+                redisService.expire(key, 60);
+            } else {
                 contentResult = JsonUtils.jsonToPojo(json, HomeContentResult.class);
-                contentResult = advertiseService.contentNew1();
+              //  contentResult = advertiseService.contentNew1();
             }
-        }catch (Exception e){
+        } catch (Exception e) {
+            log.error(e.getMessage());
             contentResult = advertiseService.contentNew1();
-            redisService.set(key,JsonUtils.objectToJson(contentResult));
-            redisService.expire(key,3600*5);
+            redisService.set(key, JsonUtils.objectToJson(contentResult));
+            redisService.expire(key, 60);
         }
         return new CommonResult().success(contentResult);
     }
@@ -148,21 +147,22 @@ public class BHomeController {
     @SysLog(MODULE = "home", REMARK = "首页内容页信息展示")
     @RequestMapping(value = "/pages.getpageconfig", method = RequestMethod.POST)
     public Object contentNew() {
-        String key = Rediskey.HOMEPAGE ;
+        String key = Rediskey.HOMEPAGE;
         String json = redisService.get(key);
         Pages contentResult = null;
         try {
-            if (ValidatorUtils.empty(json)){
+            if (ValidatorUtils.empty(json)) {
                 contentResult = advertiseService.contentNew();
-                redisService.set(key,JsonUtils.objectToJson(contentResult));
-                redisService.expire(key,3600*5);
-            }else{
+                redisService.set(key, JsonUtils.objectToJson(contentResult));
+                redisService.expire(key, 60);
+            } else {
                 contentResult = JsonUtils.jsonToPojo(json, Pages.class);
             }
-        }catch (Exception e){
+        } catch (Exception e) {
+            log.error(e.getMessage());
             contentResult = advertiseService.contentNew();
-            redisService.set(key,JsonUtils.objectToJson(contentResult));
-            redisService.expire(key,3600*5);
+            redisService.set(key, JsonUtils.objectToJson(contentResult));
+            redisService.expire(key, 60);
         }
 
         return new CommonResult().success(contentResult);
@@ -173,10 +173,10 @@ public class BHomeController {
     @SysLog(MODULE = "home", REMARK = "首页内容页信息展示")
     @RequestMapping(value = "/share", method = RequestMethod.POST)
     public Object share() {
-        Map<String,String> data = new HashedMap();
-        data.put("img","http://yjlive160322.oss-cn-beijing.aliyuncs.com/mall/images/20190807/QQ%E5%9B%BE%E7%89%8720190807191952.jpg");
-        data.put("title","mallplus");
-        data.put("synopsis","mallplus");
+        Map<String, String> data = new HashedMap();
+        data.put("img", "http://yjlive160322.oss-cn-beijing.aliyuncs.com/mall/images/20190807/QQ%E5%9B%BE%E7%89%8720190807191952.jpg");
+        data.put("title", "mallplus");
+        data.put("synopsis", "mallplus");
         return new CommonResult().success(data);
     }
 
@@ -188,6 +188,7 @@ public class BHomeController {
 
         return new Configs();
     }
+
     @IgnoreAuth
     @ApiOperation("注册")
     @PostMapping(value = "/user.reg")
@@ -209,8 +210,9 @@ public class BHomeController {
             return new CommonResult().validateFailed("手机验证码为空");
         }
 
-        return memberService.register(phone, password, confimpassword, authCode,invitecode);
+        return memberService.register(phone, password, confimpassword, authCode, invitecode);
     }
+
     @IgnoreAuth
     @ApiOperation(value = "登录以后返回token")
     @PostMapping(value = "/userLogin")
@@ -230,7 +232,6 @@ public class BHomeController {
 
     }
 
-
     @ApiOperation("修改密码")
     @RequestMapping(value = "/updatePassword", method = RequestMethod.POST)
     public Object updatePassword(@RequestParam String telephone,
@@ -256,7 +257,7 @@ public class BHomeController {
         }
         try {
 
-            Map<String, Object> token = memberService.appLogin(openid, sex,headimgurl,unionid,nickname,city,source);
+            Map<String, Object> token = memberService.appLogin(openid, sex, headimgurl, unionid, nickname, city, source);
             if (token.get("token") == null) {
                 return new CommonResult().validateFailed("用户名或密码错误");
             }
@@ -268,6 +269,7 @@ public class BHomeController {
         }
 
     }
+
     @IgnoreAuth
     @ApiOperation(value = "手机号 密码登录")
     @PostMapping(value = "/user.login")
@@ -293,6 +295,7 @@ public class BHomeController {
         }
 
     }
+
     @IgnoreAuth
     @ApiOperation(value = "手机号 密码登录")
     @PostMapping(value = "/user.logout")
@@ -341,9 +344,9 @@ public class BHomeController {
     public Object userInfo() {
         UmsMemberInfoDetail detail = new UmsMemberInfoDetail();
         UmsMember umsMember = memberService.getNewCurrentMember();
-        if (umsMember!=null && umsMember.getId()!=null){
+        if (umsMember != null && umsMember.getId() != null) {
             umsMember = memberService.getById(umsMember.getId());
-            List<SmsCouponHistory> histories = couponHistoryMapper.selectList(new QueryWrapper<SmsCouponHistory>().eq("member_id",umsMember.getId()));
+            List<SmsCouponHistory> histories = couponHistoryMapper.selectList(new QueryWrapper<SmsCouponHistory>().eq("member_id", umsMember.getId()));
             detail.setHistories(histories);
             detail.setMember(umsMember);
             return new CommonResult().success(detail);
@@ -374,7 +377,6 @@ public class BHomeController {
         }
     }
 
-
     /**
      * banner
      *
@@ -383,7 +385,7 @@ public class BHomeController {
     @IgnoreAuth
     @SysLog(MODULE = "home", REMARK = "bannerList")
     @PostMapping("/advert.getAdvertList")
-    public Object bannerList( SmsHomeAdvertise advertise) {
+    public Object bannerList(SmsHomeAdvertise advertise) {
         advertise.setStatus(1);
         return new CommonResult().success(advertiseService.list(new QueryWrapper<>(advertise)));
     }
@@ -400,6 +402,7 @@ public class BHomeController {
         List<SmsHomeAdvertise> bannerList = advertiseService.getHomeAdvertiseList();
         return new CommonResult().success(bannerList);
     }
+
     /**
      * 获取广告
      *
@@ -424,9 +427,6 @@ public class BHomeController {
         return new CommonResult().success(productResult);
     }
 
-    @Autowired
-    OssAliyunUtil aliyunOSSUtil;
-
     @IgnoreAuth
     @PostMapping("/upload")
     @ApiOperation("上传文件")
@@ -447,7 +447,6 @@ public class BHomeController {
         return new CommonResult().success(stringBuffer);
     }
 
-
     @IgnoreAuth
     @ApiOperation("首页秒杀活动")
     @SysLog(MODULE = "home", REMARK = "首页秒杀活动")
@@ -457,15 +456,13 @@ public class BHomeController {
         return new CommonResult().success(contentResult);
 
     }
-    @Resource
-    private IPmsSmallNaviconCategoryService IPmsSmallNaviconCategoryService;
 
     @SysLog(MODULE = "pms", REMARK = "查询pms_small_navicon_category表")
     @ApiOperation("查询pms_small_navicon_category表")
     @PostMapping(value = "/home.navlist")
     public Object navlist() {
         try {
-            return new CommonResult().success(IPmsSmallNaviconCategoryService.list( new QueryWrapper<>()));
+            return new CommonResult().success(IPmsSmallNaviconCategoryService.list(new QueryWrapper<>()));
         } catch (Exception e) {
             log.error("分页获取pms_small_navicon_category列表：%s", e.getMessage(), e);
         }
@@ -482,6 +479,7 @@ public class BHomeController {
         List<CmsSubject> subjectList = advertiseService.getRecommendSubjectList(pageSize, pageNum);
         return new CommonResult().success(subjectList);
     }
+
     /**
      * 提交小程序推送formid
      *
@@ -500,13 +498,13 @@ public class BHomeController {
         if (ValidatorUtils.empty(formId)) {
             return new CommonResult().validateFailed("前置参数错误，formId不能为空");
         }
-        if ("the formId is a mock one".equals(formId)){
+        if ("the formId is a mock one".equals(formId)) {
             return new CommonResult().success("添加成功");
         }
         entity.setFormId(formId);
         entity.setUserId(memberService.getNewCurrentMember().getId());
         //校验formId是否已经存在
-        if(fromIdMapper.selectCount(new QueryWrapper<>(entity))>0) {
+        if (fromIdMapper.selectCount(new QueryWrapper<>(entity)) > 0) {
             return new CommonResult().validateFailed("前置参数错误，formId已经存在 formId：" + formId);
         }
         entity.setStatus(1);
@@ -522,7 +520,7 @@ public class BHomeController {
             @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
             @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
 
-        return new CommonResult().success(pmsProductService.getRecommendBrandList(1,1));
+        return new CommonResult().success(pmsProductService.getRecommendBrandList(1, 1));
     }
 
     @SysLog(MODULE = "pms", REMARK = "查询首页新品精品、热门、首发列表")
@@ -535,16 +533,16 @@ public class BHomeController {
             @RequestParam(value = "type", required = false, defaultValue = "1") Integer type) {
         List<SmsHomeAdvertise> banner = advertiseService.getHomeAdvertiseList(type);
         List<PmsProduct> list = new ArrayList<>();
-        if (type==1){
-            list = pmsProductService.getHotProductList(1,100);
-        }else  if (type==2){
-            list = advertiseService.getSaleProductList(1,100);
-        }else  if (type==1){
-            list = pmsProductService.getNewProductList(1,100);
+        if (type == 1) {
+            list = pmsProductService.getHotProductList(1, 100);
+        } else if (type == 2) {
+            list = advertiseService.getSaleProductList(1, 100);
+        } else if (type == 1) {
+            list = pmsProductService.getNewProductList(1, 100);
         }
-        Map<String,Object> map = new HashedMap();
-        map.put("banner",banner);
-        map.put("list",list);
+        Map<String, Object> map = new HashedMap();
+        map.put("banner", banner);
+        map.put("list", list);
         return new CommonResult().success(map);
     }
 
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BOmsController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BOmsController.java
index 23711a69f7ed39b853b42ef7640f731f4eb4efe1..a0ced371f011271ccd55453c63480ef9d78e4081 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BOmsController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BOmsController.java
@@ -37,7 +37,6 @@ import com.zscat.mallplus.util.JsonUtils;
 import com.zscat.mallplus.utils.CommonResult;
 import com.zscat.mallplus.utils.HttpUtils;
 import com.zscat.mallplus.utils.ValidatorUtils;
-
 import com.zscat.mallplus.vo.CartParam;
 import com.zscat.mallplus.vo.OrderStatusCount;
 import com.zscat.mallplus.vo.Rediskey;
@@ -69,6 +68,8 @@ import java.util.Map;
 @RestController
 @Api(tags = "OmsController", description = "订单管理系统")
 public class BOmsController extends ApiBaseAction {
+    // 物流信息缓存间隔暂定3个小时
+    private static final Long maxCacheTime = 1000 * 60 * 60 * 3L;
     @Resource
     private UmsMemberMapper memberMapper;
     @Resource
@@ -77,7 +78,6 @@ public class BOmsController extends ApiBaseAction {
     private IOmsOrderService orderService;
     @Resource
     private IOmsOrderItemService orderItemService;
-
     @Autowired
     private IOmsCartItemService cartItemService;
     @Autowired
@@ -94,16 +94,44 @@ public class BOmsController extends ApiBaseAction {
     private UmsMemberReceiveAddressMapper addressMapper;
     @Resource
     private RedisService redisService;
-
-
     @Resource
     private IOmsOrderReturnReasonService IOmsOrderReturnReasonService;
-
     @Autowired
     private IOmsShipService omsShipService;
-
     @Autowired
     private RedisUtil redisUtil;
+    @Resource
+    private IBillAftersalesService billAftersalesService;
+    @Resource
+    private IBillAftersalesItemsService billAftersalesItemsService;
+    @Resource
+    private IOmsOrderReturnApplyService IOmsOrderReturnApplyService;
+
+    @ApiOperation("添加商品到购物车")
+    @RequestMapping(value = "/cart.store.add")
+    @ResponseBody
+    public Object addStoreCart(CartParam cartParam) {
+        try {
+            return orderService.addCart(cartParam);
+        } catch (ApiMallPlusException e) {
+            return new CommonResult().failed(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    @ApiOperation("获取某个会员的购物车列表")
+    @RequestMapping(value = "/cart.getCartlist", method = RequestMethod.POST)
+    @ResponseBody
+    public Object listStoreCart() {
+        UmsMember umsMember = memberService.getNewCurrentMember();
+        if (umsMember != null && umsMember.getId() != null) {
+            return new CommonResult().success(cartItemService.listStoreCart(umsMember.getId()));
+        }
+        return new ArrayList<OmsCartItem>();
+    }
+
     @ApiOperation("添加商品到购物车")
     @RequestMapping(value = "/cart.add")
     @ResponseBody
@@ -117,6 +145,39 @@ public class BOmsController extends ApiBaseAction {
         }
         return null;
     }
+    @ResponseBody
+    @PostMapping("/submitStorePreview")
+    public Object submitStorePreview(OrderParam orderParam) {
+        try {
+            ConfirmListOrderResult result = orderService.submitStorePreview(orderParam);
+            return new CommonResult().success(result);
+        } catch (ApiMallPlusException e) {
+            return new CommonResult().failed(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 提交订单
+     *
+     * @param orderParam
+     * @return
+     */
+    @ApiOperation("根据购物车信息生成订单")
+    @RequestMapping(value = "/order.store.create")
+    @ResponseBody
+    public Object generateStoreOrder(OrderParam orderParam) {
+        try {
+            return orderService.generateStoreOrder(orderParam);
+        } catch (ApiMallPlusException e) {
+            return new CommonResult().failed(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 
     @ApiOperation("获取某个会员的购物车列表")
     @RequestMapping(value = "/cart.getlist", method = RequestMethod.POST)
@@ -125,10 +186,10 @@ public class BOmsController extends ApiBaseAction {
         UmsMember umsMember = memberService.getNewCurrentMember();
         if (umsMember != null && umsMember.getId() != null) {
             List<OmsCartItem> cartItemList = cartItemService.list(umsMember.getId(), null);
-            for (OmsCartItem item : cartItemList){
-                if (ValidatorUtils.notEmpty(item.getProductSkuId())){
+            for (OmsCartItem item : cartItemList) {
+                if (ValidatorUtils.notEmpty(item.getProductSkuId())) {
                     item.setSkuStock(pmsSkuStockService.getById(item.getProductSkuId()));
-                }else {
+                } else {
                     item.setProduct(productMapper.selectById(item.getProductId()));
                 }
             }
@@ -136,16 +197,8 @@ public class BOmsController extends ApiBaseAction {
         }
         return new ArrayList<OmsCartItem>();
     }
-    @ApiOperation("获取某个会员的购物车列表")
-    @RequestMapping(value = "/cart.getCartlist", method = RequestMethod.POST)
-    @ResponseBody
-    public Object listStoreCart() {
-        UmsMember umsMember = memberService.getNewCurrentMember();
-        if (umsMember != null && umsMember.getId() != null) {
-            return new CommonResult().success(cartItemService.listStoreCart(umsMember.getId()));
-        }
-        return new ArrayList<OmsCartItem>();
-    }
+
+
 
     @ApiOperation("修改购物车中某个商品的数量")
     @RequestMapping(value = "/cart.setnums", method = RequestMethod.POST)
@@ -236,12 +289,12 @@ public class BOmsController extends ApiBaseAction {
     public Object update(UmsMemberReceiveAddress address) {
         boolean count = false;
         Long memberId = memberService.getNewCurrentMember().getId();
-        if (ValidatorUtils.empty(memberId)){
+        if (ValidatorUtils.empty(memberId)) {
             return new CommonResult().fail(100);
 
         }
         address.setMemberId(memberId);
-        if (address.getDefaultStatus()==1){
+        if (address.getDefaultStatus() == 1) {
             addressMapper.updateStatusByMember(memberId);
         }
         if (address != null && address.getId() != null) {
@@ -252,14 +305,15 @@ public class BOmsController extends ApiBaseAction {
         if (count) {
             return new CommonResult().success(count);
         }
-        return new CommonResult().failed();    }
+        return new CommonResult().failed();
+    }
 
     @ApiOperation("微信存储收货地址")
     @RequestMapping(value = "/user.saveusership")
     @ResponseBody
     public Object saveusership(UmsMemberReceiveAddress address) {
         boolean count = false;
-        if (address.getDefaultStatus()==1){
+        if (address.getDefaultStatus() == 1) {
             addressMapper.updateStatusByMember(memberService.getNewCurrentMember().getId());
         }
         if (address != null && address.getId() != null) {
@@ -270,7 +324,8 @@ public class BOmsController extends ApiBaseAction {
         if (count) {
             return new CommonResult().success(count);
         }
-        return new CommonResult().failed();    }
+        return new CommonResult().failed();
+    }
 
     @IgnoreAuth
     @ApiOperation("显示所有收货地址")
@@ -279,7 +334,7 @@ public class BOmsController extends ApiBaseAction {
     public Object list() {
         UmsMember umsMember = memberService.getNewCurrentMember();
         if (umsMember != null && umsMember.getId() != null) {
-            List<UmsMemberReceiveAddress> addressList = memberReceiveAddressService.list(new QueryWrapper<UmsMemberReceiveAddress>().eq("member_id",umsMember.getId()));
+            List<UmsMemberReceiveAddress> addressList = memberReceiveAddressService.list(new QueryWrapper<UmsMemberReceiveAddress>().eq("member_id", umsMember.getId()));
             return new CommonResult().success(addressList);
         }
         return new ArrayList<UmsMemberReceiveAddress>();
@@ -293,14 +348,16 @@ public class BOmsController extends ApiBaseAction {
         UmsMemberReceiveAddress address = memberReceiveAddressService.getById(id);
         return new CommonResult().success(address);
     }
+
     @IgnoreAuth
     @ApiOperation("显示所有支付方式")
     @RequestMapping(value = "/payments.getlist", method = RequestMethod.POST)
     @ResponseBody
     public Object getPayments() {
-       List<OmsPayments> paymentss = paymentsService.list(new QueryWrapper<OmsPayments>().eq("status",1));
+        List<OmsPayments> paymentss = paymentsService.list(new QueryWrapper<OmsPayments>().eq("status", 1));
         return new CommonResult().success(paymentss);
     }
+
     @IgnoreAuth
     @ApiOperation("显示支付方式详情")
     @RequestMapping(value = "/payments.getinfo", method = RequestMethod.POST)
@@ -308,6 +365,7 @@ public class BOmsController extends ApiBaseAction {
     public Object getPaymentsInfo(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
         return new CommonResult().success(paymentsService.getById(id));
     }
+
     @IgnoreAuth
     @ApiOperation("显示默认收货地址")
     @RequestMapping(value = "/user.getuserdefaultship", method = RequestMethod.POST)
@@ -317,7 +375,6 @@ public class BOmsController extends ApiBaseAction {
         return new CommonResult().success(address);
     }
 
-
     /**
      * @param id
      * @return
@@ -342,43 +399,42 @@ public class BOmsController extends ApiBaseAction {
                             @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
 
         IPage<OmsOrder> page = null;
-        if (ValidatorUtils.empty(order.getStatus()) || order.getStatus()==0){
-            page = orderService.page(new Page<OmsOrder>(pageNum, pageSize), new QueryWrapper<OmsOrder>().eq("member_id",memberService.getNewCurrentMember().getId()).isNull("pid").orderByDesc("create_time").select(ConstansValue.sampleOrderList)) ;
-        }else {
+        if (ValidatorUtils.empty(order.getStatus()) || order.getStatus() == 0) {
+            page = orderService.page(new Page<OmsOrder>(pageNum, pageSize), new QueryWrapper<OmsOrder>().eq("member_id", memberService.getNewCurrentMember().getId()).isNull("pid").orderByDesc("create_time").select(ConstansValue.sampleOrderList));
+        } else {
             order.setMemberId(memberService.getNewCurrentMember().getId());
-            page = orderService.page(new Page<OmsOrder>(pageNum, pageSize), new QueryWrapper<>(order).isNull("pid").orderByDesc("create_time").select(ConstansValue.sampleOrderList)) ;
+            page = orderService.page(new Page<OmsOrder>(pageNum, pageSize), new QueryWrapper<>(order).isNull("pid").orderByDesc("create_time").select(ConstansValue.sampleOrderList));
 
         }
-        for (OmsOrder omsOrder : page.getRecords()){
-            List<OmsOrderItem> itemList = orderItemService.list(new QueryWrapper<OmsOrderItem>().eq("order_id",omsOrder.getId()).eq("type",AllEnum.OrderItemType.GOODS.code()));
+        for (OmsOrder omsOrder : page.getRecords()) {
+            List<OmsOrderItem> itemList = orderItemService.list(new QueryWrapper<OmsOrderItem>().eq("order_id", omsOrder.getId()).eq("type", AllEnum.OrderItemType.GOODS.code()));
             omsOrder.setOrderItemList(itemList);
         }
         return new CommonResult().success(page);
     }
 
-
     @ApiOperation("获取订单详情:订单信息、商品信息、操作记录")
     @RequestMapping(value = "/order.details", method = RequestMethod.POST)
     @ResponseBody
     public Object detail(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
         OmsOrder orderDetailResult = null;
-        String key =  Rediskey.orderDetail+"orderid"+id;
+        String key = Rediskey.orderDetail + "orderid" + id;
         String json = redisService.get(key);
-        if (ValidatorUtils.notEmpty(json)){
-            orderDetailResult = JsonUtils.jsonToPojo(json,OmsOrder.class);
-            return   new CommonResult().success(orderDetailResult);
-        }
-            orderDetailResult = orderService.getById(id);
-            OmsOrderItem query = new OmsOrderItem();
-            query.setOrderId(id);
-            List<OmsOrderItem> orderItemList = orderItemService.list(new QueryWrapper<>(query));
-            orderDetailResult.setOrderItemList(orderItemList);
-            UmsMember member = memberMapper.selectById(orderDetailResult.getMemberId());
-            if(member!=null){
-                orderDetailResult.setBlance(member.getBlance());
-            }
-        redisService.set(key,JsonUtils.objectToJson(orderDetailResult));
-        redisService.expire(key,3600*5);
+        if (ValidatorUtils.notEmpty(json)) {
+            orderDetailResult = JsonUtils.jsonToPojo(json, OmsOrder.class);
+            return new CommonResult().success(orderDetailResult);
+        }
+        orderDetailResult = orderService.getById(id);
+        OmsOrderItem query = new OmsOrderItem();
+        query.setOrderId(id);
+        List<OmsOrderItem> orderItemList = orderItemService.list(new QueryWrapper<>(query));
+        orderDetailResult.setOrderItemList(orderItemList);
+        UmsMember member = memberMapper.selectById(orderDetailResult.getMemberId());
+        if (member != null) {
+            orderDetailResult.setBlance(member.getBlance());
+        }
+        redisService.set(key, JsonUtils.objectToJson(orderDetailResult));
+        redisService.expire(key, 60);
         return new CommonResult().success(orderDetailResult);
     }
 
@@ -395,7 +451,7 @@ public class BOmsController extends ApiBaseAction {
                 return new CommonResult().paramFailed("订单已支付，不能关闭");
             }
             if (orderService.closeOrder(newE)) {
-                String key = Rediskey.orderDetail+"orderid"+orderId;
+                String key = Rediskey.orderDetail + "orderid" + orderId;
                 redisService.remove(key);
                 return new CommonResult().success();
             }
@@ -418,7 +474,7 @@ public class BOmsController extends ApiBaseAction {
                 return new CommonResult().paramFailed("订单已支付，不能删除");
             }
             if (orderService.removeById(orderId)) {
-                String key = Rediskey.orderDetail+"orderid"+orderId;
+                String key = Rediskey.orderDetail + "orderid" + orderId;
                 redisService.remove(key);
                 return new CommonResult().success();
             }
@@ -440,6 +496,7 @@ public class BOmsController extends ApiBaseAction {
             return new CommonResult().failed();
         }
     }
+
     @SysLog(MODULE = "订单管理", REMARK = "订单申请退款")
     @ApiOperation("申请退款")
     @RequestMapping(value = "/order.applyRefund", method = RequestMethod.POST)
@@ -452,8 +509,7 @@ public class BOmsController extends ApiBaseAction {
             return new CommonResult().failed();
         }
     }
-    // 物流信息缓存间隔暂定3个小时
-    private static final Long maxCacheTime = 1000 * 60 * 60 * 3L;
+
     /**
      * 查看物流
      */
@@ -462,7 +518,7 @@ public class BOmsController extends ApiBaseAction {
     @RequestMapping("/order.logisticbyapi")
     public Object getWayBillInfo(String no, String type) throws Exception {
         try {
-            no ="801132164062135036";
+            no = "801132164062135036";
             if (StringUtils.isEmpty(no)) {
                 throw new ApiMallPlusException("请传入运单号");
             }
@@ -502,7 +558,7 @@ public class BOmsController extends ApiBaseAction {
                     // redis已经有缓存
                     Object kdwlInfo = redisUtil.hGet(Rediskey.KDWL_INFO_CACHE, no);
                     if (ValidatorUtils.notEmpty(kdwlInfo)) {
-                        Map<String, Object> kdwlInfoToMap =  JsonUtils.readJsonToMap(kdwlInfo.toString());
+                        Map<String, Object> kdwlInfoToMap = JsonUtils.readJsonToMap(kdwlInfo.toString());
                         Long cacheBeginTime = (Long) kdwlInfoToMap.get("queryTime");
                         // 计算已经缓存时长
                         if (System.currentTimeMillis() - cacheBeginTime < maxCacheTime) {
@@ -526,7 +582,7 @@ public class BOmsController extends ApiBaseAction {
                 returnStr = EntityUtils.toString(response.getEntity());
 
                 if (StringUtils.isEmpty(returnStr)) {
-                    throw new ApiMallPlusException( "查询物流信息失败");
+                    throw new ApiMallPlusException("查询物流信息失败");
                 }
 
                 // 重新缓存 [这里包含运单号输错 也缓存 避免有人故意调我们物流接口 次数用完]
@@ -549,6 +605,7 @@ public class BOmsController extends ApiBaseAction {
         }
 
     }
+
     @SysLog(MODULE = "订单管理", REMARK = "取消发货")
     @ApiOperation("取消发货")
     @RequestMapping(value = "/cancleDelivery", method = RequestMethod.POST)
@@ -556,8 +613,8 @@ public class BOmsController extends ApiBaseAction {
     public Object cancleDelivery(@ApiParam("订单id") @RequestParam Long id,
                                  @ApiParam(value = "订单备注", defaultValue = "我就是想取消") @RequestParam String remark) {
         OmsOrder order = orderService.getById(id);
-        if(order == null){
-            return new CommonResult().paramFailed("没有找到id为{"+id+"}的订单");
+        if (order == null) {
+            return new CommonResult().paramFailed("没有找到id为{" + id + "}的订单");
         }
 
         if (order.getStatus() != OrderStatus.DELIVERED.getValue()) {
@@ -586,19 +643,7 @@ public class BOmsController extends ApiBaseAction {
         return null;
     }
 
-    @ResponseBody
-    @PostMapping("/submitStorePreview")
-    public Object submitStorePreview(OrderParam orderParam) {
-        try {
-            ConfirmListOrderResult result = orderService.submitStorePreview(orderParam);
-            return new CommonResult().success(result);
-        } catch (ApiMallPlusException e) {
-            return new CommonResult().failed(e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
+
     /**
      * 提交订单
      *
@@ -633,6 +678,19 @@ public class BOmsController extends ApiBaseAction {
         return null;
     }
 
+    @ApiOperation("取消拼团")
+    @RequestMapping(value = "/combination/remove")
+    @ResponseBody
+    public Object quitGroup(@ApiParam("订单id") @RequestParam Long id) {
+        try {
+            return new CommonResult().success(orderService.quitGroup(id));
+        } catch (ApiMallPlusException e) {
+            return new CommonResult().failed(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
     @ApiOperation("提交拼团")
     @RequestMapping(value = "/acceptGroup")
     @ResponseBody
@@ -647,15 +705,13 @@ public class BOmsController extends ApiBaseAction {
         return null;
     }
 
-
-
     @SysLog(MODULE = "cms", REMARK = "添加订单评论")
     @ApiOperation(value = "添加订单评论")
     @PostMapping(value = "/user.orderevaluate")
-    public Object addGoodsConsult( @RequestParam(value = "orderId", defaultValue = "1") Long orderId,
-                                   @RequestParam(value = "items", defaultValue = "10") String items) throws Exception {
+    public Object addGoodsConsult(@RequestParam(value = "orderId", defaultValue = "1") Long orderId,
+                                  @RequestParam(value = "items", defaultValue = "10") String items) throws Exception {
 
-        return orderService.orderComment(orderId,items);
+        return orderService.orderComment(orderId, items);
     }
 
     @IgnoreAuth
@@ -667,9 +723,9 @@ public class BOmsController extends ApiBaseAction {
 
         String key = Rediskey.getorderstatusnum;
         String json = redisService.get(key);
-        if (ValidatorUtils.notEmpty(json)){
+        if (ValidatorUtils.notEmpty(json)) {
             objectMap = JsonUtils.readJsonToMap1(json);
-            return   new CommonResult().success(objectMap);
+            return new CommonResult().success(objectMap);
         }
 
         UmsMember umsMember = memberService.getNewCurrentMember();
@@ -697,30 +753,30 @@ public class BOmsController extends ApiBaseAction {
                 }
                 if (consult.getStatus() == OrderStatus.TO_DELIVER.getValue()) {
                     status1++;
-                    payAmount=payAmount.add(consult.getPayAmount());
+                    payAmount = payAmount.add(consult.getPayAmount());
                 }
                 if (consult.getStatus() == OrderStatus.DELIVERED.getValue()) {
                     status2++;
-                    payAmount=payAmount.add(consult.getPayAmount());
+                    payAmount = payAmount.add(consult.getPayAmount());
 
                 }
                 if (consult.getStatus() == OrderStatus.TO_COMMENT.getValue()) {
                     status3++;
-                    payAmount=payAmount.add(consult.getPayAmount());
+                    payAmount = payAmount.add(consult.getPayAmount());
 
                 }
                 if (consult.getStatus() == OrderStatus.TRADE_SUCCESS.getValue()) {
                     status4++;
-                    payAmount=payAmount.add(consult.getPayAmount());
+                    payAmount = payAmount.add(consult.getPayAmount());
 
                 }
                 if (consult.getStatus() == OrderStatus.RIGHT_APPLY.getValue()) {
                     status5++;
-                    payAmount=payAmount.add(consult.getPayAmount());
+                    payAmount = payAmount.add(consult.getPayAmount());
 
                 }
             }
-            statusAll = status1+status2+status3+status4+status5;
+            statusAll = status1 + status2 + status3 + status4 + status5;
             count.setPayAmount(payAmount);
             count.setStatusAll(statusAll);
             count.setStatus0(status0);
@@ -735,23 +791,19 @@ public class BOmsController extends ApiBaseAction {
         objectMap.put("user", umsMember);
         objectMap.put("count", count);
         List<ServiceMenu> menuList = new ArrayList<>();
-        menuList.add(new ServiceMenu("会员中心","http://datong.crmeb.net/public/uploads/attach/2019/03/28/5c9ccc9934a7c.png","/pages/user_vip/index","/user/vip"));
-        menuList.add(new ServiceMenu("砍价记录","http://datong.crmeb.net/public/uploads/attach/2019/03/28/5c9ccc9918091.png","/pages/activity/user_goods_bargain_list/index","/activity/bargain/record"));
-        menuList.add(new ServiceMenu("我的推广","http://datong.crmeb.net/public/uploads/attach/2019/03/28/5c9ccc9943575.png","/pages/user_spread_user/index","/user/user_promotion"));
-        menuList.add(new ServiceMenu("我的余额","http://datong.crmeb.net/public/uploads/attach/2019/03/28/5c9ccc992db31.png","/pages/user_money/index","/user/account"));
-        menuList.add(new ServiceMenu("地址信息","http://datong.crmeb.net/public/uploads/attach/2019/03/28/5c9ccc99101a8.png","/pages/user_address_list/index","/user/add_manage"));
-        menuList.add(new ServiceMenu("我的收藏","http://datong.crmeb.net/public/uploads/attach/2019/03/28/5c9ccc99269d1.png","/pages/user_goods_collection/index","/collection"));
-        menuList.add(new ServiceMenu("优惠券","http://datong.crmeb.net/public/uploads/attach/2019/03/28/5c9ccc991f394.png","/pages/user_coupon/index","/user/user_coupon"));
-        menuList.add(new ServiceMenu("联系客服","http://kaifa.crmeb.net/uploads/attach/2019/07/20190730/0ded3d3f72d654fb33c8c9f30a268c97.png","/pages/service/index","/customer/list"));
-        objectMap.put("menuList",menuList);
-        redisService.set(key,JsonUtils.objectToJson(objectMap));
-        redisService.expire(key,3600*5);
+        menuList.add(new ServiceMenu("会员中心", "http://datong.crmeb.net/public/uploads/attach/2019/03/28/5c9ccc9934a7c.png", "/pages/user_vip/index", "/user/vip"));
+        menuList.add(new ServiceMenu("砍价记录", "http://datong.crmeb.net/public/uploads/attach/2019/03/28/5c9ccc9918091.png", "/pages/activity/user_goods_bargain_list/index", "/activity/bargain/record"));
+        menuList.add(new ServiceMenu("我的推广", "http://datong.crmeb.net/public/uploads/attach/2019/03/28/5c9ccc9943575.png", "/pages/user_spread_user/index", "/user/user_promotion"));
+        menuList.add(new ServiceMenu("我的余额", "http://datong.crmeb.net/public/uploads/attach/2019/03/28/5c9ccc992db31.png", "/pages/user_money/index", "/user/account"));
+        menuList.add(new ServiceMenu("地址信息", "http://datong.crmeb.net/public/uploads/attach/2019/03/28/5c9ccc99101a8.png", "/pages/user_address_list/index", "/user/add_manage"));
+        menuList.add(new ServiceMenu("我的收藏", "http://datong.crmeb.net/public/uploads/attach/2019/03/28/5c9ccc99269d1.png", "/pages/user_goods_collection/index", "/collection"));
+        menuList.add(new ServiceMenu("优惠券", "http://datong.crmeb.net/public/uploads/attach/2019/03/28/5c9ccc991f394.png", "/pages/user_coupon/index", "/user/user_coupon"));
+        menuList.add(new ServiceMenu("联系客服", "http://kaifa.crmeb.net/uploads/attach/2019/07/20190730/0ded3d3f72d654fb33c8c9f30a268c97.png", "/pages/service/index", "/customer/list"));
+        objectMap.put("menuList", menuList);
+        redisService.set(key, JsonUtils.objectToJson(objectMap));
+        redisService.expire(key, 60);
         return new CommonResult().success(objectMap);
     }
-    @Resource
-    private IBillAftersalesService billAftersalesService;
-    @Resource
-    private IBillAftersalesItemsService billAftersalesItemsService;
 
     @IgnoreAuth
     @SysLog(MODULE = "oms", REMARK = "售后单列表")
@@ -761,9 +813,9 @@ public class BOmsController extends ApiBaseAction {
                                  @RequestParam(value = "pageSize", required = false, defaultValue = "100") Integer pageSize,
                                  @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
 
-        IPage<BillAftersales> page = billAftersalesService.page(new Page<BillAftersales>(pageNum, pageSize), new QueryWrapper<>(order).orderByDesc("ctime")) ;
-        for (BillAftersales omsOrder : page.getRecords()){
-            List<BillAftersalesItems> itemList = billAftersalesItemsService.list(new QueryWrapper<BillAftersalesItems>().eq("aftersales_id",omsOrder.getAftersalesId()));
+        IPage<BillAftersales> page = billAftersalesService.page(new Page<BillAftersales>(pageNum, pageSize), new QueryWrapper<>(order).orderByDesc("ctime"));
+        for (BillAftersales omsOrder : page.getRecords()) {
+            List<BillAftersalesItems> itemList = billAftersalesItemsService.list(new QueryWrapper<BillAftersalesItems>().eq("aftersales_id", omsOrder.getAftersalesId()));
             omsOrder.setItemList(itemList);
         }
         return new CommonResult().success(page);
@@ -775,7 +827,7 @@ public class BOmsController extends ApiBaseAction {
     @PostMapping(value = "/order.aftersalesinfo")
     public Object afterSalesInfo(@RequestParam Long id) {
         BillAftersales aftersales = billAftersalesService.getById(id);
-        List<BillAftersalesItems> itemList = billAftersalesItemsService.list(new QueryWrapper<BillAftersalesItems>().eq("aftersales_id",aftersales.getAftersalesId()));
+        List<BillAftersalesItems> itemList = billAftersalesItemsService.list(new QueryWrapper<BillAftersalesItems>().eq("aftersales_id", aftersales.getAftersalesId()));
         aftersales.setItemList(itemList);
         return new CommonResult().success(aftersales);
     }
@@ -790,7 +842,6 @@ public class BOmsController extends ApiBaseAction {
         return null;
     }
 
-
     @SysLog(MODULE = "cms", REMARK = "添加售后单")
     @ApiOperation(value = "添加售后单")
     @PostMapping(value = "/order.addaftersales")
@@ -798,7 +849,7 @@ public class BOmsController extends ApiBaseAction {
         UmsMember member = memberService.getNewCurrentMember();
         aftersales.setUserId(member.getId());
 
-        return new CommonResult().success( billAftersalesService.save(aftersales));
+        return new CommonResult().success(billAftersalesService.save(aftersales));
     }
 
     @SysLog(MODULE = "cms", REMARK = "用户发送退货包裹")
@@ -817,13 +868,11 @@ public class BOmsController extends ApiBaseAction {
     public Object getRefundReason() {
         return new CommonResult().success(IOmsOrderReturnReasonService.list(new QueryWrapper<>()));
     }
-    @Resource
-    private IOmsOrderReturnApplyService IOmsOrderReturnApplyService;
 
     @SysLog(MODULE = "oms", REMARK = "保存订单退货申请")
     @ApiOperation("保存订单退货申请")
     @PostMapping(value = "/create")
-    public Object saveOmsOrderReturnApply( OmsOrderReturnApply entity) {
+    public Object saveOmsOrderReturnApply(OmsOrderReturnApply entity) {
         try {
             if (IOmsOrderReturnApplyService.save(entity)) {
                 return new CommonResult().success();
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BPayController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BPayController.java
index 578b466a79916490abfeb7a0153df7e49f62dbd8..aee0269d137c6b31dbe43ac85901602ed64bf8c2 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BPayController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BPayController.java
@@ -3,18 +3,16 @@ package com.zscat.mallplus.b2c;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zscat.mallplus.annotation.SysLog;
-import com.zscat.mallplus.config.WxAppletProperties;
 import com.zscat.mallplus.enums.AllEnum;
 import com.zscat.mallplus.enums.OrderStatus;
+import com.zscat.mallplus.exception.ApiMallPlusException;
 import com.zscat.mallplus.oms.entity.OmsOrder;
-import com.zscat.mallplus.oms.entity.OmsOrderItem;
 import com.zscat.mallplus.oms.entity.OmsOrderOperateHistory;
 import com.zscat.mallplus.oms.service.IOmsOrderItemService;
 import com.zscat.mallplus.oms.service.IOmsOrderOperateHistoryService;
 import com.zscat.mallplus.oms.service.IOmsOrderService;
 import com.zscat.mallplus.oms.vo.OrderParam;
 import com.zscat.mallplus.single.ApiBaseAction;
-import com.zscat.mallplus.sms.entity.SmsGroup;
 import com.zscat.mallplus.sms.mapper.SmsGroupMapper;
 import com.zscat.mallplus.ums.entity.SysAppletSet;
 import com.zscat.mallplus.ums.entity.UmsMember;
@@ -27,7 +25,6 @@ import com.zscat.mallplus.util.XmlUtil;
 import com.zscat.mallplus.util.applet.WechatRefundApiResult;
 import com.zscat.mallplus.util.applet.WechatUtil;
 import com.zscat.mallplus.utils.CommonResult;
-import com.zscat.mallplus.utils.ValidatorUtils;
 import com.zscat.mallplus.vo.BalancePayParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -58,29 +55,24 @@ import java.util.TreeMap;
 @RestController
 public class BPayController extends ApiBaseAction {
     private static Logger LOGGER = LoggerFactory.getLogger(BPayController.class);
-
+    String tradeType = "JSAPI";
+    String uniformorder = "https://api.mch.weixin.qq.com/pay/unifiedorder";
+    String orderquery = "https://api.mch.weixin.qq.com/pay/orderquery";
+    String refundUrl = "https://api.mch.weixin.qq.com/secapi/pay/refund";
+    String refundqueryUrl = "https://api.mch.weixin.qq.com/pay/refundquery";
     @Resource
     private IOmsOrderService orderService;
     @Resource
     private IUmsMemberService memberService;
-
-
     @Resource
     private IOmsOrderItemService orderItemService;
     @Resource
     private SmsGroupMapper groupMapper;
-
     @Resource
-    private WxAppletProperties wxAppletProperties;
+    private SysAppletSetMapper appletSetMapper;
     @Autowired
     private IOmsOrderOperateHistoryService orderOperateHistoryService;
 
-    String tradeType="JSAPI";
-    String uniformorder="https://api.mch.weixin.qq.com/pay/unifiedorder";
-    String orderquery="https://api.mch.weixin.qq.com/pay/orderquery";
-    String refundUrl="https://api.mch.weixin.qq.com/secapi/pay/refund";
-    String refundqueryUrl="https://api.mch.weixin.qq.com/pay/refundquery";
-
     /**
      * 订单退款请求
      */
@@ -132,13 +124,9 @@ public class BPayController extends ApiBaseAction {
     @SysLog(MODULE = "pay", REMARK = "余额支付")
     @ApiOperation(value = "余额支付")
     @PostMapping("balancePay")
-    public Object balancePay(BalancePayParam payParam){
-        if(payParam.getPayAmount().compareTo(payParam.getBalance())>0){
-            return new CommonResult().failed("余额不足！");
-        }else {
-            OmsOrder order = orderService.blancePay(orderService.getById(payParam.getOrderId()));
-            return new CommonResult().success(order);
-        }
+    public Object balancePay(BalancePayParam payParam) {
+        OmsOrder order = orderService.blancePay(orderService.getById(payParam.getOrderId()));
+        return new CommonResult().success(order);
     }
 
     /**
@@ -147,7 +135,7 @@ public class BPayController extends ApiBaseAction {
     @SysLog(MODULE = "pay", REMARK = "积分兑换")
     @ApiOperation(value = "积分兑换")
     @PostMapping("jifenPay")
-    public Object jifenPay(OrderParam payParam){
+    public Object jifenPay(OrderParam payParam) {
         return orderService.jifenPay(payParam);
     }
 
@@ -161,13 +149,16 @@ public class BPayController extends ApiBaseAction {
         UmsMember user = memberService.getNewCurrentMember();
         //
         OmsOrder orderInfo = orderService.getById(orderId);
-
+        SysAppletSet appletSet = appletSetMapper.selectOne(new QueryWrapper<>());
+        if (null == appletSet) {
+            throw new ApiMallPlusException("没有设置支付配置");
+        }
 
         if (null == orderInfo) {
             return toResponsObject(400, "订单已取消", "");
         }
 
-        if (orderInfo.getStatus() != OrderStatus.CLOSED.getValue()) {
+        if (orderInfo.getStatus() == OrderStatus.CLOSED.getValue()) {
             return toResponsObject(400, "订单已已关闭，请不要重复操作", "");
         }
         if (orderInfo.getStatus() != OrderStatus.INIT.getValue()) {
@@ -181,9 +172,9 @@ public class BPayController extends ApiBaseAction {
 
         try {
             Map<Object, Object> parame = new TreeMap<Object, Object>();
-            parame.put("appid", wxAppletProperties.getAppId());
+            parame.put("appid", appletSet.getAppid());
             // 商家账号。
-            parame.put("mch_id", wxAppletProperties.getMchId());
+            parame.put("mch_id", appletSet.getMchid());
             String randomStr = CharUtil.getRandomNum(18).toUpperCase();
             // 随机字符串
             parame.put("nonce_str", randomStr);
@@ -192,28 +183,16 @@ public class BPayController extends ApiBaseAction {
 
             // 商品描述
             parame.put("body", "超市-支付");
-            //订单的商品
-            List<OmsOrderItem> orderGoods = orderItemService.list(new QueryWrapper<>(new OmsOrderItem()).eq("order_id", orderId));
-            if (null != orderGoods) {
-                String body = "超市-";
-                for (OmsOrderItem goodsVo : orderGoods) {
-                    body = body + goodsVo.getProductName() + "、";
-                }
-                if (body.length() > 0) {
-                    body = body.substring(0, body.length() - 1);
-                }
-                // 商品描述
-                parame.put("body", body);
-            }
+
             //支付金额
             parame.put("total_fee", orderInfo.getPayAmount().multiply(new BigDecimal(100)).intValue());
             // 回调地址
-            parame.put("notify_url", wxAppletProperties.getNotifyUrl());
+            parame.put("notify_url", appletSet.getNotifyurl());
             // 交易类型APP
             parame.put("trade_type", tradeType);
             parame.put("spbill_create_ip", getClientIp());
             parame.put("openid", user.getWeixinOpenid());
-            String sign = WechatUtil.arraySign(parame, wxAppletProperties.getPaySignKey());
+            String sign = WechatUtil.arraySign(parame, appletSet.getPaySignKey());
             // 数字签证
             parame.put("sign", sign);
 
@@ -225,34 +204,34 @@ public class BPayController extends ApiBaseAction {
             String return_msg = MapUtils.getString("return_msg", resultUn);
             //
             if (return_code.equalsIgnoreCase("FAIL")) {
-                return toResponsFail("支付失败," + return_msg);
+                return new CommonResult().failed("支付失败," + return_msg);
             } else if (return_code.equalsIgnoreCase("SUCCESS")) {
                 // 返回数据
                 String result_code = MapUtils.getString("result_code", resultUn);
                 String err_code_des = MapUtils.getString("err_code_des", resultUn);
                 if (result_code.equalsIgnoreCase("FAIL")) {
-                    return toResponsFail("支付失败," + err_code_des);
+                    return new CommonResult().failed("支付失败," + err_code_des);
                 } else if (result_code.equalsIgnoreCase("SUCCESS")) {
                     String prepay_id = MapUtils.getString("prepay_id", resultUn);
                     // 先生成paySign 参考https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=7_7&index=5
-                    resultObj.put("appId", wxAppletProperties.getAppId());
+                    resultObj.put("appId", appletSet.getAppid());
                     resultObj.put("timeStamp", DateUtils.timeToStr(System.currentTimeMillis() / 1000, DateUtils.DATE_TIME_PATTERN));
                     resultObj.put("nonceStr", nonceStr);
                     resultObj.put("package", "prepay_id=" + prepay_id);
                     resultObj.put("signType", "MD5");
-                    String paySign = WechatUtil.arraySign(resultObj, wxAppletProperties.getPaySignKey());
+                    String paySign = WechatUtil.arraySign(resultObj, appletSet.getPaySignKey());
                     resultObj.put("paySign", paySign);
                     // 业务处理
                     orderInfo.setPrepayId(prepay_id);
                     // 付款中
                     orderInfo.setStatus(OrderStatus.PayNotNotice.getValue());
                     orderService.updateById(orderInfo);
-                    if (orderInfo.getPid()==null){
+                    if (orderInfo.getPid() == null) {
                         OmsOrder neworder = new OmsOrder();
                         neworder.setStatus(OrderStatus.TO_DELIVER.getValue());
                         neworder.setPayType(AllEnum.OrderPayType.weixinAppletPay.code());
                         neworder.setPaymentTime(new Date());
-                        orderService.update(neworder,new QueryWrapper<OmsOrder>().eq("pid",orderInfo.getId()));
+                        orderService.update(neworder, new QueryWrapper<OmsOrder>().eq("pid", orderInfo.getId()));
                     }
                     OmsOrderOperateHistory history = new OmsOrderOperateHistory();
                     history.setOrderId(orderInfo.getId());
@@ -267,9 +246,9 @@ public class BPayController extends ApiBaseAction {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return toResponsFail("下单失败,error=" + e.getMessage());
+            return new CommonResult().failed("下单失败,error=" + e.getMessage());
         }
-        return toResponsFail("下单失败");
+        return new CommonResult().failed("下单失败");
     }
 
     /**
@@ -281,22 +260,25 @@ public class BPayController extends ApiBaseAction {
     public Object orderQuery(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
         UmsMember user = memberService.getNewCurrentMember();
         //
-
+        SysAppletSet appletSet = appletSetMapper.selectOne(new QueryWrapper<>());
+        if (null == appletSet) {
+            throw new ApiMallPlusException("没有设置支付配置");
+        }
         OmsOrder orderDetail = orderService.getById(id);
         if (id == null) {
-            return toResponsFail("订单不存在");
+            throw new ApiMallPlusException("订单不存在");
         }
         Map<Object, Object> parame = new TreeMap<Object, Object>();
-        parame.put("appid", wxAppletProperties.getAppId());
+        parame.put("appid", appletSet.getAppid());
         // 商家账号。
-        parame.put("mch_id", wxAppletProperties.getMchId());
+        parame.put("mch_id", appletSet.getMchid());
         String randomStr = CharUtil.getRandomNum(18).toUpperCase();
         // 随机字符串
         parame.put("nonce_str", randomStr);
         // 商户订单编号
         parame.put("out_trade_no", orderDetail.getOrderSn());
 
-        String sign = WechatUtil.arraySign(parame, wxAppletProperties.getPaySignKey());
+        String sign = WechatUtil.arraySign(parame, appletSet.getPaySignKey());
         // 数字签证
         parame.put("sign", sign);
 
@@ -307,14 +289,14 @@ public class BPayController extends ApiBaseAction {
             resultUn = XmlUtil.xmlStrToMap(WechatUtil.requestOnce(orderquery, xml));
         } catch (Exception e) {
             e.printStackTrace();
-            return toResponsFail("查询失败,error=" + e.getMessage());
+            throw new ApiMallPlusException("查询失败,error=" + e.getMessage());
         }
         // 响应报文
         String return_code = MapUtils.getString("return_code", resultUn);
         String return_msg = MapUtils.getString("return_msg", resultUn);
 
         if (!"SUCCESS".equals(return_code)) {
-            return toResponsFail("查询失败,error=" + return_msg);
+            throw new ApiMallPlusException("查询失败,error=" + return_msg);
         }
 
         String trade_state = MapUtils.getString("trade_state", resultUn);
@@ -327,7 +309,7 @@ public class BPayController extends ApiBaseAction {
             orderInfo.setConfirmStatus(1);
             orderInfo.setPaymentTime(new Date());
             orderService.updateById(orderInfo);
-            return toResponsMsgSuccess("支付成功");
+            return new CommonResult().success("支付成功");
         } else if ("USERPAYING".equals(trade_state)) {
             // 重新查询 正在支付中
            /* Integer num = (Integer) J2CacheUtils.get(J2CacheUtils.SHOP_CACHE_NAME, "queryRepeatNum" + id + "");
@@ -338,15 +320,15 @@ public class BPayController extends ApiBaseAction {
                 J2CacheUtils.remove(J2CacheUtils.SHOP_CACHE_NAME, "queryRepeatNum" + id);
                 this.orderQuery(id);
             } else {
-                return toResponsFail("查询失败,error=" + trade_state);
+                throw new ApiMallPlusException("查询失败,error=" + trade_state);
             }*/
 
         } else {
             // 失败
-            return toResponsFail("查询失败,error=" + trade_state);
+            throw new ApiMallPlusException("查询失败,error=" + trade_state);
         }
 
-        return toResponsFail("查询失败，未知错误");
+        throw new ApiMallPlusException("查询失败，未知错误");
     }
 
     /**
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BPmsController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BPmsController.java
index 246c765b52a05afbf4554490035e9f18a574b28e..7598c65b962eb1a4bd29352b8f37b92097492182 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BPmsController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BPmsController.java
@@ -4,6 +4,7 @@ package com.zscat.mallplus.b2c;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zscat.mallplus.ApiContext;
 import com.zscat.mallplus.annotation.IgnoreAuth;
 import com.zscat.mallplus.annotation.SysLog;
 import com.zscat.mallplus.cms.entity.CmsFavorite;
@@ -25,12 +26,13 @@ import com.zscat.mallplus.single.ApiBaseAction;
 import com.zscat.mallplus.sms.entity.SmsGroup;
 import com.zscat.mallplus.sms.entity.SmsGroupActivity;
 import com.zscat.mallplus.sms.entity.SmsGroupMember;
+import com.zscat.mallplus.sms.entity.SmsGroupRecord;
 import com.zscat.mallplus.sms.mapper.SmsGroupMapper;
 import com.zscat.mallplus.sms.mapper.SmsGroupMemberMapper;
+import com.zscat.mallplus.sms.mapper.SmsGroupRecordMapper;
 import com.zscat.mallplus.sms.service.ISmsGroupActivityService;
 import com.zscat.mallplus.sms.service.ISmsGroupService;
 import com.zscat.mallplus.sms.service.ISmsHomeAdvertiseService;
-import com.zscat.mallplus.sys.entity.SysStore;
 import com.zscat.mallplus.sys.mapper.SysStoreMapper;
 import com.zscat.mallplus.ums.entity.UmsMember;
 import com.zscat.mallplus.ums.entity.UmsMemberLevel;
@@ -42,7 +44,6 @@ import com.zscat.mallplus.util.DateUtils;
 import com.zscat.mallplus.util.JsonUtils;
 import com.zscat.mallplus.utils.CommonResult;
 import com.zscat.mallplus.utils.ValidatorUtils;
-
 import com.zscat.mallplus.vo.Rediskey;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -107,7 +108,9 @@ public class BPmsController extends ApiBaseAction {
     @Resource
     private SmsGroupMemberMapper groupMemberMapper;
     @Resource
-    private  PmsProductCategoryMapper categoryMapper;
+    private SmsGroupRecordMapper groupRecordMapper;
+    @Resource
+    private PmsProductCategoryMapper categoryMapper;
     @Resource
     private IPmsGiftsService giftsService;
     @Resource
@@ -117,7 +120,12 @@ public class BPmsController extends ApiBaseAction {
     @Resource
     private OmsOrderMapper omsOrderMapper;
 
-
+    @Autowired
+    private ApiContext apiContext;
+    @Autowired
+    private IPmsFavoriteService memberCollectionService;
+    @Autowired
+    private ICmsFavoriteService cmsFavoriteService;
 
     @SysLog(MODULE = "pms", REMARK = "查询商品详情信息")
     @IgnoreAuth
@@ -126,13 +134,13 @@ public class BPmsController extends ApiBaseAction {
     public Object queryProductDetail(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
         GoodsDetailResult goods = null;
         try {
-            goods = JsonUtils.jsonToPojo(redisService.get(String.format(Rediskey.GOODSDETAIL, id+"")), GoodsDetailResult.class);
-            if (ValidatorUtils.empty(goods) || ValidatorUtils.empty(goods.getGoods())){
-                log.info("redis缓存失效："+id);
+            goods = JsonUtils.jsonToPojo(redisService.get(apiContext.getCurrentProviderId() + ":" + String.format(Rediskey.GOODSDETAIL, id + "")), GoodsDetailResult.class);
+            if (ValidatorUtils.empty(goods) || ValidatorUtils.empty(goods.getGoods())) {
+                log.info("redis缓存失效：" + id);
                 goods = pmsProductService.getGoodsRedisById(id);
             }
         } catch (Exception e) {
-            log.info("redis缓存失效："+id);
+            log.info("redis缓存失效：" + id);
             goods = pmsProductService.getGoodsRedisById(id);
         }
         Map<String, Object> map = new HashMap<>();
@@ -144,9 +152,9 @@ public class BPmsController extends ApiBaseAction {
             query.setMemberId(umsMember.getId());
             query.setType(1);
             PmsFavorite findCollection = favoriteService.getOne(new QueryWrapper<>(query));
-            if(findCollection!=null){
+            if (findCollection != null) {
                 map.put("favorite", true);
-            }else{
+            } else {
                 map.put("favorite", false);
             }
         }
@@ -168,9 +176,9 @@ public class BPmsController extends ApiBaseAction {
         product.setVerifyStatus(1);
         product.setMemberId(null);
         IPage<PmsProduct> list;
-        if (ValidatorUtils.notEmpty(product.getKeyword())){
-            list = pmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<>(product).like("name",product.getKeyword()));
-        }else{
+        if (ValidatorUtils.notEmpty(product.getKeyword())) {
+            list = pmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<>(product).like("name", product.getKeyword()));
+        } else {
             list = pmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<>(product));
         }
         return new CommonResult().success(list);
@@ -185,6 +193,7 @@ public class BPmsController extends ApiBaseAction {
                                       @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
         return new CommonResult().success(productCategoryService.page(new Page<PmsProductCategory>(pageNum, pageSize), new QueryWrapper<>(productCategory)));
     }
+
     @SysLog(MODULE = "pms", REMARK = "查询商品分类列表")
     @IgnoreAuth
     @ApiOperation(value = "查询商品分类列表和子分类")
@@ -193,25 +202,25 @@ public class BPmsController extends ApiBaseAction {
         String json = redisService.get(Rediskey.categoryAndChilds);
         List<PmsProductCategory> list = new ArrayList<>();
         try {
-            if (ValidatorUtils.empty(json)){
-                list = productCategoryService.list(new QueryWrapper<PmsProductCategory>().eq("parent_id",0).eq("show_status",1));
-                for (PmsProductCategory category : list){
-                    List<PmsProductCategory> childlist = productCategoryService.list(new QueryWrapper<PmsProductCategory>().eq("parent_id",category.getId()).eq("show_status",1));
+            if (ValidatorUtils.empty(json)) {
+                list = productCategoryService.list(new QueryWrapper<PmsProductCategory>().eq("parent_id", 0).eq("show_status", 1));
+                for (PmsProductCategory category : list) {
+                    List<PmsProductCategory> childlist = productCategoryService.list(new QueryWrapper<PmsProductCategory>().eq("parent_id", category.getId()).eq("show_status", 1));
                     category.setChildList(childlist);
                 }
-                redisService.set(Rediskey.categoryAndChilds,JsonUtils.objectToJson(list));
-                redisService.expire(Rediskey.categoryAndChilds,3600*5);
-            }else{
+                redisService.set(Rediskey.categoryAndChilds + apiContext.getCurrentProviderId(), JsonUtils.objectToJson(list));
+                redisService.expire(Rediskey.categoryAndChilds + apiContext.getCurrentProviderId(), 2);
+            } else {
                 list = JsonUtils.json2list(json, PmsProductCategory.class);
             }
-        }catch (Exception e){
-            list = productCategoryService.list(new QueryWrapper<PmsProductCategory>().eq("parent_id",0).eq("show_status",1));
-            for (PmsProductCategory category : list){
-                List<PmsProductCategory> childlist = productCategoryService.list(new QueryWrapper<PmsProductCategory>().eq("parent_id",category.getId()).eq("show_status",1));
+        } catch (Exception e) {
+            list = productCategoryService.list(new QueryWrapper<PmsProductCategory>().eq("parent_id", 0).eq("show_status", 1));
+            for (PmsProductCategory category : list) {
+                List<PmsProductCategory> childlist = productCategoryService.list(new QueryWrapper<PmsProductCategory>().eq("parent_id", category.getId()).eq("show_status", 1));
                 category.setChildList(childlist);
             }
-            redisService.set(Rediskey.categoryAndChilds,JsonUtils.objectToJson(list));
-            redisService.expire(Rediskey.categoryAndChilds,3600*5);
+            redisService.set(Rediskey.categoryAndChilds + apiContext.getCurrentProviderId(), JsonUtils.objectToJson(list));
+            redisService.expire(Rediskey.categoryAndChilds + apiContext.getCurrentProviderId(), 2);
         }
 
         return new CommonResult().success(list);
@@ -241,16 +250,16 @@ public class BPmsController extends ApiBaseAction {
                        @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
 
         Map<String, Object> objectMap = new HashMap<>();
-        String json = redisService.get(Rediskey.goodsConsult+"goods"+goodsId);
-        if (ValidatorUtils.notEmpty(json)){
+        String json = redisService.get(Rediskey.goodsConsult + "goods" + goodsId);
+        if (ValidatorUtils.notEmpty(json)) {
             objectMap = JsonUtils.readJsonToMap1(json);
-            return   new CommonResult().success(objectMap);
+            return new CommonResult().success(objectMap);
         }
 
         PmsProductConsult productConsult = new PmsProductConsult();
         productConsult.setGoodsId(goodsId);
         productConsult.setType(AllEnum.ConsultType.GOODS.code());
-        List<PmsProductConsult> list =  pmsProductConsultService.list(new QueryWrapper<>(productConsult));
+        List<PmsProductConsult> list = pmsProductConsultService.list(new QueryWrapper<>(productConsult));
 
         int goods = 0;
         int general = 0;
@@ -258,13 +267,13 @@ public class BPmsController extends ApiBaseAction {
         ConsultTypeCount count = new ConsultTypeCount();
         for (PmsProductConsult consult : list) {
             if (consult.getStars() != null) {
-                if (consult.getStars()==1){
+                if (consult.getStars() == 1) {
                     bad++;
                 }
-                if (consult.getStars()==2){
+                if (consult.getStars() == 2) {
                     general++;
                 }
-                if (consult.getStars()==3){
+                if (consult.getStars() == 3) {
                     goods++;
                 }
             }
@@ -273,16 +282,16 @@ public class BPmsController extends ApiBaseAction {
         count.setBad(bad);
         count.setGeneral(general);
         count.setGoods(goods);
-        if (count.getAll()>0){
+        if (count.getAll() > 0) {
             count.setPersent(new BigDecimal(goods).divide(new BigDecimal(count.getAll())).multiply(new BigDecimal(100)));
-        }else {
+        } else {
             count.setPersent(new BigDecimal(200));
         }
 
         objectMap.put("list", list);
         objectMap.put("count", count);
-        redisService.set(Rediskey.goodsConsult+"goods"+goodsId,JsonUtils.objectToJson(objectMap));
-        redisService.expire(Rediskey.goodsConsult+"goods"+goodsId,3600*5);
+        redisService.set(Rediskey.goodsConsult + apiContext.getCurrentProviderId() + "goods" + goodsId, JsonUtils.objectToJson(objectMap));
+        redisService.expire(Rediskey.goodsConsult + apiContext.getCurrentProviderId() + "goods" + goodsId, 2);
         return new CommonResult().success(objectMap);
     }
 
@@ -291,19 +300,19 @@ public class BPmsController extends ApiBaseAction {
     @ApiOperation(value = "查询拼团列表")
     @PostMapping(value = "/groupHotGoods/list")
     public Object groupHotGoods(PmsProduct product,
-                                 @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                                 @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
-        List<SmsGroup> groupList =  groupService.list(new QueryWrapper<>());
+                                @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                                @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
+        List<SmsGroup> groupList = groupService.list(new QueryWrapper<>());
         List<SmsGroup> result = new ArrayList<>();
-        for (SmsGroup group :groupList){
-            if (ValidatorUtils.empty(group.getHours())){
+        for (SmsGroup group : groupList) {
+            if (ValidatorUtils.empty(group.getHours())) {
                 continue;
             }
             Long nowT = System.currentTimeMillis();
             Date endTime = DateUtils.convertStringToDate(DateUtils.addHours(group.getEndTime(), group.getHours()), "yyyy-MM-dd HH:mm:ss");
             if (nowT > group.getStartTime().getTime() && nowT < endTime.getTime()) {
-                PmsProduct g =pmsProductService.getById(group.getGoodsId());
-                if(g!=null){
+                PmsProduct g = pmsProductService.getById(group.getGoodsId());
+                if (g != null) {
                     group.setGoods(g);
                     result.add(group);
                 }
@@ -316,22 +325,23 @@ public class BPmsController extends ApiBaseAction {
     @SysLog(MODULE = "pms", REMARK = "查询团购商品列表")
     @IgnoreAuth
     @ApiOperation(value = "查询拼团商品列表")
+    @ResponseBody
     @PostMapping(value = "/pintuan.list")
     public Object pintuanList(PmsProduct product,
-                            @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                            @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
-       List<SmsGroup> groupList =  groupService.list(new QueryWrapper<>());
-       if (groupList!=null && groupList.size()>0){
-           List<Long> ids = groupList.stream()
-                   .map(SmsGroup::getGoodsId)
-                   .collect(Collectors.toList());
-           product.setPublishStatus(1);
-           product.setVerifyStatus(1);
-           product.setMemberId(null);
-           IPage<PmsProduct> list  = pmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<>(product).in("id",ids));
-           return new CommonResult().success(list);
-       }
-        return null;
+                              @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                              @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
+        List<SmsGroup> groupList = groupService.list(new QueryWrapper<>());
+        if (groupList != null && groupList.size() > 0) {
+            List<Long> ids = groupList.stream()
+                    .map(SmsGroup::getGoodsId)
+                    .collect(Collectors.toList());
+            product.setPublishStatus(1);
+            product.setVerifyStatus(1);
+            product.setMemberId(null);
+            IPage<PmsProduct> list = pmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<>(product).in("id", ids));
+            return new CommonResult().success(list);
+        }
+        return new CommonResult().success(new ArrayList<>());
     }
 
     @SysLog(MODULE = "pms", REMARK = "拼团商品详情")
@@ -339,36 +349,38 @@ public class BPmsController extends ApiBaseAction {
     @PostMapping(value = "/pintuan.goodsinfo")
     @ApiOperation(value = "拼团商品详情")
     public Object groupGoodsDetail(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
+        SmsGroup group = groupMapper.selectById(id);
+        Long goodsId = group.getGoodsId();
         //记录浏览量到redis,然后定时更新到数据库
-        String key=Rediskey.GOODS_VIEWCOUNT_CODE+id;
+        String key = Rediskey.GOODS_VIEWCOUNT_CODE + goodsId;
         //找到redis中该篇文章的点赞数，如果不存在则向redis中添加一条
-        Map<Object,Object> viewCountItem=redisUtil.hGetAll(Rediskey.GOODS_VIEWCOUNT_KEY);
-        Integer viewCount=0;
-        if(!viewCountItem.isEmpty()){
-            if(viewCountItem.containsKey(key)){
-                viewCount=Integer.parseInt(viewCountItem.get(key).toString())+1;
-                redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY,key,viewCount+"");
-            }else {
-                viewCount=1;
-                redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY,key,1+"");
+        Map<Object, Object> viewCountItem = redisUtil.hGetAll(Rediskey.GOODS_VIEWCOUNT_KEY);
+        Integer viewCount = 0;
+        if (!viewCountItem.isEmpty()) {
+            if (viewCountItem.containsKey(key)) {
+                viewCount = Integer.parseInt(viewCountItem.get(key).toString()) + 1;
+                redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY, key, viewCount + "");
+            } else {
+                viewCount = 1;
+                redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY, key, 1 + "");
             }
-        }else{
-            viewCount=1;
-            redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY,key,1+"");
+        } else {
+            viewCount = 1;
+            redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY, key, 1 + "");
         }
         GoodsDetailResult goods = null;
         try {
-              goods =JsonUtils.jsonToPojo(redisService.get(String.format(Rediskey.GOODSDETAIL, id+"")), GoodsDetailResult.class);
-            if (ValidatorUtils.empty(goods)){
-                log.info("redis缓存失效："+id);
-                goods = pmsProductService.getGoodsRedisById(id);
+            goods = JsonUtils.jsonToPojo(redisService.get(String.format(Rediskey.GOODSDETAIL, goodsId + "")), GoodsDetailResult.class);
+            if (ValidatorUtils.empty(goods)) {
+                log.info("redis缓存失效：" + goodsId);
+                goods = pmsProductService.getGoodsRedisById(goodsId);
             }
         } catch (Exception e) {
-            log.info("redis缓存失效："+id);
-            goods = pmsProductService.getGoodsRedisById(id);
+            log.info("redis缓存失效：" + goodsId);
+            goods = pmsProductService.getGoodsRedisById(goodsId);
             e.printStackTrace();
         }
-        SmsGroup group = groupMapper.getByGoodsId(id);
+
         Map<String, Object> map = new HashMap<>();
         UmsMember umsMember = memberService.getNewCurrentMember();
         if (umsMember != null && umsMember.getId() != null) {
@@ -379,38 +391,29 @@ public class BPmsController extends ApiBaseAction {
             query.setMemberId(umsMember.getId());
             query.setType(1);
             PmsFavorite findCollection = favoriteService.getOne(new QueryWrapper<>(query));
-            if(findCollection!=null){
+            if (findCollection != null) {
                 map.put("favorite", true);
-            }else{
+            } else {
                 map.put("favorite", false);
             }
         }
-        if (group!=null){
+        if (group != null) {
             group.setPintuan_start_status(1);
             group.setTimeSecound(ValidatorUtils.getTimeSecound(group.getEndTime()));
             Long nowT = System.currentTimeMillis();
             Date endTime = DateUtils.convertStringToDate(DateUtils.addHours(group.getEndTime(), group.getHours()), "yyyy-MM-dd HH:mm:ss");
-            if (nowT < group.getStartTime().getTime() ) {
+            if (nowT < group.getStartTime().getTime()) {
                 group.setPintuan_start_status(2);
             }
-            if ( nowT > endTime.getTime()) {
+            if (nowT > endTime.getTime()) {
                 group.setPintuan_start_status(3);
             }
-            List<SmsGroupMember> list = new ArrayList<>();
-            List<SmsGroupMember> groupMembers = groupMemberMapper.selectList(new QueryWrapper<SmsGroupMember>().eq("group_id",group.getId()));
-            for (SmsGroupMember groupMember : groupMembers){
-                if (ValidatorUtils.notEmpty(groupMember.getMemberId()) ){
-                    List<String> ids = Arrays.asList(groupMember.getMemberId().split(","));
-                    if (group.getMaxPeople()>ids.size()){
-                        groupMember.setList((List<UmsMember>) memberService.listByIds(ids));
-                    }else {
-                        continue;
-                    }
-                    list.add(groupMember);
-
-                }
+            List<SmsGroupRecord> groupRecords = groupRecordMapper.selectList(new QueryWrapper<SmsGroupRecord>().eq("group_id", group.getId()));
+            for (SmsGroupRecord groupRecord : groupRecords) {
+                List<SmsGroupMember> groupMembers = groupMemberMapper.selectList(new QueryWrapper<SmsGroupMember>().eq("group_record_id", groupRecord.getId()).eq("status", 2));
+                groupRecord.setList(groupMembers);
             }
-            map.put("memberGroupList",list);
+            map.put("memberGroupList", groupRecords);
             map.put("group", group);
         }
 
@@ -419,17 +422,52 @@ public class BPmsController extends ApiBaseAction {
         return new CommonResult().success(map);
     }
 
+    @SysLog(MODULE = "pms", REMARK = "拼团商品详情")
+    @IgnoreAuth
+    @PostMapping(value = "/pintuan.record")
+    @ApiOperation(value = "拼团商品详情")
+    public Object groupRecordDetail(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
+        SmsGroupRecord groupRecord = groupRecordMapper.selectById(id);
+        if (groupRecord==null){
+            SmsGroupMember smsGroupMember = groupMemberMapper.selectById(id);
+            groupRecord = groupRecordMapper.selectById(smsGroupMember.getGroupRecordId());
+        } if (groupRecord==null){
+            return new CommonResult().failed();
+        }
+            List<SmsGroupMember> groupMembers = groupMemberMapper.selectList(new QueryWrapper<SmsGroupMember>().eq("group_record_id", groupRecord.getId()).eq("status",2));
+            groupRecord.setList(groupMembers);
+        SmsGroup group = groupMapper.selectById(groupRecord.getGroupId());
+        Map<String, Object> map = new HashMap<>();
+        map.put("group", group);
+        map.put("groupRecord", groupRecord);
+        map.put("isOk", 1);
+        if (group.getMaxPeople()==groupMembers.size()){
+            map.put("isOk", 0);
+        }
+        UmsMember member = memberService.getNewCurrentMember();
+        map.put("userBool", 0);
+        map.put("pinkBool", 0);
+        if (member!=null){
+            for (SmsGroupMember groupMember : groupMembers){
+                if (groupMember.getMemberId()==member.getId()){
+                    map.put("userBool", 1);
+                    map.put("pinkBool", 1);
+                }
+            }
+        }
+        return new CommonResult().success(map);
+    }
 
     @SysLog(MODULE = "pms", REMARK = "查询团购商品列表")
     @IgnoreAuth
     @ApiOperation(value = "查询礼物商品列表")
     @PostMapping(value = "/gift/list")
     public Object giftList(PmsGifts product,
-                                 @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                                 @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
+                           @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                           @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
 
-            IPage<PmsGifts> list  = giftsService.page(new Page<PmsGifts>(pageNum, pageSize), new QueryWrapper<>(product));
-            return new CommonResult().success(list);
+        IPage<PmsGifts> list = giftsService.page(new Page<PmsGifts>(pageNum, pageSize), new QueryWrapper<>(product));
+        return new CommonResult().success(list);
 
     }
 
@@ -438,7 +476,7 @@ public class BPmsController extends ApiBaseAction {
     @PostMapping(value = "/gift/detail")
     @ApiOperation(value = "查询礼物商品详情信息")
     public Object giftDetail(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
-        PmsGifts  goods = giftsService.getById(id);
+        PmsGifts goods = giftsService.getById(id);
         Map<String, Object> map = new HashMap<>();
         UmsMember umsMember = memberService.getNewCurrentMember();
         if (umsMember != null && umsMember.getId() != null) {
@@ -447,9 +485,9 @@ public class BPmsController extends ApiBaseAction {
             query.setMemberId(umsMember.getId());
             query.setType(4);
             PmsFavorite findCollection = favoriteService.getOne(new QueryWrapper<>(query));
-            if(findCollection!=null){
+            if (findCollection != null) {
                 map.put("favorite", true);
-            }else{
+            } else {
                 map.put("favorite", false);
             }
         }
@@ -473,9 +511,9 @@ public class BPmsController extends ApiBaseAction {
     public Object categoryAndGoodsList(PmsProductAttributeCategory productCategory) throws Exception {
         List<PmsProductAttributeCategory> productAttributeCategoryList = new ArrayList<>();
         String json = redisService.get(Rediskey.categoryAndGoodsList);
-        if (ValidatorUtils.notEmpty(json)){
-            productAttributeCategoryList = JsonUtils.json2list(json,PmsProductAttributeCategory.class);
-            return   new CommonResult().success(productAttributeCategoryList);
+        if (ValidatorUtils.notEmpty(json)) {
+            productAttributeCategoryList = JsonUtils.json2list(json, PmsProductAttributeCategory.class);
+            return new CommonResult().success(productAttributeCategoryList);
         }
         productAttributeCategoryList = productAttributeCategoryService.list(new QueryWrapper<>());
         for (PmsProductAttributeCategory gt : productAttributeCategoryList) {
@@ -485,14 +523,11 @@ public class BPmsController extends ApiBaseAction {
             productQueryParam.setVerifyStatus(1);
             gt.setGoodsList(pmsProductService.list(new QueryWrapper<>(productQueryParam).select(ConstansValue.sampleGoodsList)));
         }
-        redisService.set(Rediskey.categoryAndGoodsList,JsonUtils.objectToJson(productAttributeCategoryList));
-        redisService.expire(Rediskey.categoryAndGoodsList,3600*5);
+        redisService.set(Rediskey.categoryAndGoodsList + apiContext.getCurrentProviderId(), JsonUtils.objectToJson(productAttributeCategoryList));
+        redisService.expire(Rediskey.categoryAndGoodsList + apiContext.getCurrentProviderId(), 2);
         return new CommonResult().success(productAttributeCategoryList);
     }
 
-
-
-
     @SysLog(MODULE = "pms", REMARK = "查询首页热销商品")
     @IgnoreAuth
     @ApiOperation(value = "查询首页热销商品")
@@ -501,10 +536,9 @@ public class BPmsController extends ApiBaseAction {
             @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
             @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
 
-        return new CommonResult().success(pmsProductService.getHotProductList(pageNum,pageSize));
+        return new CommonResult().success(pmsProductService.getHotProductList(pageNum, pageSize));
     }
 
-
     @SysLog(MODULE = "pms", REMARK = "查询商品类型下的商品列表")
     @IgnoreAuth
     @ApiOperation(value = "查询商品类型下的商品列表")
@@ -512,16 +546,16 @@ public class BPmsController extends ApiBaseAction {
     public Object typeGoodsList() throws Exception {
         List<ProductTypeVo> relList = new ArrayList<>();
         String json = redisService.get(Rediskey.specialcategoryAndGoodsList);
-        if (ValidatorUtils.notEmpty(json)){
-            relList = JsonUtils.json2list(json,ProductTypeVo.class);
-            return   new CommonResult().success(relList);
+        if (ValidatorUtils.notEmpty(json)) {
+            relList = JsonUtils.json2list(json, ProductTypeVo.class);
+            return new CommonResult().success(relList);
         }
 
         PmsProduct productQueryParam = new PmsProduct();
         productQueryParam.setPublishStatus(1);
         productQueryParam.setVerifyStatus(1);
-        List<PmsProduct>  list = pmsProductService.page(new Page<PmsProduct>(1, 8), new QueryWrapper<>(productQueryParam)).getRecords();
-        for (PmsProduct l : list){
+        List<PmsProduct> list = pmsProductService.page(new Page<PmsProduct>(1, 8), new QueryWrapper<>(productQueryParam)).getRecords();
+        for (PmsProduct l : list) {
             ProductTypeVo vo = new ProductTypeVo();
             vo.setGoodsId(l.getId());
             vo.setId(l.getId());
@@ -532,13 +566,13 @@ public class BPmsController extends ApiBaseAction {
             relList.add(vo);
         }
         List<PmsProductCategory> categories = categoryMapper.selectList(new QueryWrapper<>());
-        for (PmsProductCategory v : categories){
-            if (v.getParentId()==0){
+        for (PmsProductCategory v : categories) {
+            if (v.getParentId() == 0) {
                 ProductTypeVo vo = new ProductTypeVo();
                 vo.setName(v.getName());
                 vo.setId(v.getId());
                 relList.add(vo);
-            }else{
+            } else {
                 ProductTypeVo vo = new ProductTypeVo();
                 vo.setName(v.getName());
                 vo.setId(v.getId());
@@ -546,8 +580,8 @@ public class BPmsController extends ApiBaseAction {
                 relList.add(vo);
             }
         }
-        redisService.set(Rediskey.specialcategoryAndGoodsList,JsonUtils.objectToJson(relList));
-        redisService.expire(Rediskey.specialcategoryAndGoodsList,3600*5);
+        redisService.set(Rediskey.specialcategoryAndGoodsList + apiContext.getCurrentProviderId(), JsonUtils.objectToJson(relList));
+        redisService.expire(Rediskey.specialcategoryAndGoodsList + apiContext.getCurrentProviderId(), 2);
         return new CommonResult().success(relList);
     }
 
@@ -558,13 +592,13 @@ public class BPmsController extends ApiBaseAction {
     public Object typeList(PmsProductCategory productCategory) {
         List<ProductTypeVo> relList = new ArrayList<>();
         List<PmsProductCategory> categories = categoryMapper.selectList(new QueryWrapper<>());
-        for (PmsProductCategory v : categories){
-            if (v.getParentId()==0){
+        for (PmsProductCategory v : categories) {
+            if (v.getParentId() == 0) {
                 ProductTypeVo vo = new ProductTypeVo();
                 vo.setName(v.getName());
                 vo.setId(v.getId());
                 relList.add(vo);
-            }else{
+            } else {
                 ProductTypeVo vo = new ProductTypeVo();
                 vo.setName(v.getName());
                 vo.setId(v.getId());
@@ -575,17 +609,18 @@ public class BPmsController extends ApiBaseAction {
 
         return new CommonResult().success(relList);
     }
+
     @SysLog(MODULE = "cms", REMARK = "添加商品评论")
     @ApiOperation(value = "添加商品评论")
     @PostMapping(value = "/addGoodsConsult")
     public Object addGoodsConsult(PmsProductConsult subject, BindingResult result) {
         CommonResult commonResult;
         UmsMember member = memberService.getNewCurrentMember();
-        if (member!=null){
+        if (member != null) {
             subject.setPic(member.getIcon());
             subject.setMemberName(member.getNickname());
             subject.setMemberId(member.getId());
-        }else {
+        } else {
             return new CommonResult().failed("请先登录");
         }
         subject.setConsultAddtime(new Date());
@@ -598,23 +633,27 @@ public class BPmsController extends ApiBaseAction {
         }
         return commonResult;
     }
+
     @IgnoreAuth
     @ApiOperation("添加商品浏览记录")
     @SysLog(MODULE = "pms", REMARK = "添加商品浏览记录")
     @PostMapping(value = "/user.addgoodsbrowsing")
-    public Object addView(@RequestParam  Long goodsId) {
+    public Object addView(@RequestParam Long goodsId) {
 
+        if (memberService.getNewCurrentMember()==null){
+            return new CommonResult().success();
+        }
         String key = String.format(Rediskey.GOODSHISTORY, memberService.getNewCurrentMember().getId());
 
         //为了保证浏览商品的 唯一性,每次添加前,将list 中该 商品ID去掉,在加入,以保证其浏览的最新的商品在最前面
 
         redisUtil.lRemove(key, 1, goodsId.toString());
         //将value push 到该key下的list中
-        redisUtil.lLeftPush(key,goodsId.toString());
+        redisUtil.lLeftPush(key, goodsId.toString());
         //使用ltrim将60个数据之后的数据剪切掉
-        redisUtil.lTrim(key,0,59);
+        redisUtil.lTrim(key, 0, 59);
         //设置缓存时间为一个月
-        redisUtil.expire(key,60*60*24*30, TimeUnit.SECONDS);
+        redisUtil.expire(key, 60 * 60 * 24 * 30, TimeUnit.SECONDS);
         return new CommonResult().success();
     }
 
@@ -623,36 +662,34 @@ public class BPmsController extends ApiBaseAction {
     @ApiOperation(value = "查询用户浏览记录列表")
     @PostMapping(value = "/user.goodsbrowsing")
     public Object viewList(
-                                       @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                                       @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
+            @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+            @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
+        if (memberService.getNewCurrentMember()==null){
+            return new CommonResult().success();
+        }
         String key = String.format(Rediskey.GOODSHISTORY, memberService.getNewCurrentMember().getId());
 
         //获取用户的浏览的商品的总页数;
         long pageCount = redisUtil.lLen(key);
         //拼装返回
-        Map<String,Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         //根据用户的ID分頁获取该用户最近浏览的50个商品信息
-        List<String> result = redisUtil.lRange(key,(pageNum-1)*pageSize,pageNum*pageSize-1);
-        if (result!=null && result.size()>0){
+        List<String> result = redisUtil.lRange(key, (pageNum - 1) * pageSize, pageNum * pageSize - 1);
+        if (result != null && result.size() > 0) {
             List<PmsProduct> list = (List<PmsProduct>) pmsProductService.listByIds(result);
 
-            map.put("result",list);
-            map.put("total",pageCount);
-            map.put("pageCount",(pageCount%pageSize == 0 ? pageCount/pageSize : pageCount/pageSize+1));
+            map.put("result", list);
+            map.put("total", pageCount);
+            map.put("pageCount", (pageCount % pageSize == 0 ? pageCount / pageSize : pageCount / pageSize + 1));
         }
 
         return new CommonResult().success(map);
     }
 
-    @Autowired
-    private IPmsFavoriteService memberCollectionService;
-    @Autowired
-    private ICmsFavoriteService cmsFavoriteService;
-
     @ApiOperation("添加和取消收藏 type 1 商品 2 文章")
     @PostMapping("user.goodscollection")
     public Object favoriteSave(PmsFavorite productCollection) {
-        if (memberService.getNewCurrentMember().getId()==null){
+        if (memberService.getNewCurrentMember().getId() == null) {
             return new CommonResult().fail(100);
         }
         int count = memberCollectionService.addProduct(productCollection);
@@ -662,6 +699,7 @@ public class BPmsController extends ApiBaseAction {
             return new CommonResult().failed();
         }
     }
+
     @ApiOperation("删除收藏中的某个商品")
     @PostMapping(value = "/batchcollect.delete")
     public Object batchcollectDel(String ids) {
@@ -677,6 +715,7 @@ public class BPmsController extends ApiBaseAction {
         }
         return new CommonResult().failed();
     }
+
     @ApiOperation("删除收藏中的某个商品")
     @PostMapping(value = "/collect.delete")
     public Object delete(Long id) {
@@ -691,15 +730,14 @@ public class BPmsController extends ApiBaseAction {
 
     @ApiOperation("显示收藏列表")
     @PostMapping(value = "/user.goodscollectionlist")
-    public Object listCollectByType( PmsFavorite productCollection,
-                                     @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                                     @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
+    public Object listCollectByType(PmsFavorite productCollection,
+                                    @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                                    @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
         productCollection.setMemberId(memberService.getNewCurrentMember().getId());
         return new CommonResult().success(memberCollectionService.page(new Page<PmsFavorite>(pageNum, pageSize), new QueryWrapper<>(productCollection).orderByDesc("add_time")));
     }
 
 
-
     @ApiOperation("添加和取消点赞 type 1 商品 2 文章")
     @PostMapping("likeSave")
     public Object likeSave(CmsFavorite productCollection) {
@@ -730,13 +768,14 @@ public class BPmsController extends ApiBaseAction {
 
     @ApiOperation("显示点赞列表")
     @PostMapping(value = "/listLikeByType")
-    public Object listLikeByType( CmsFavorite productCollection) {
-        List<CmsFavorite> memberProductCollectionList = cmsFavoriteService.listProduct(memberService.getNewCurrentMember().getId(),productCollection.getType());
+    public Object listLikeByType(CmsFavorite productCollection) {
+        List<CmsFavorite> memberProductCollectionList = cmsFavoriteService.listProduct(memberService.getNewCurrentMember().getId(), productCollection.getType());
         return new CommonResult().success(memberProductCollectionList);
     }
+
     @ApiOperation("显示点赞列表")
     @PostMapping(value = "/listLike")
-    public Object listLike( CmsFavorite productCollection) {
+    public Object listLike(CmsFavorite productCollection) {
         List<CmsFavorite> memberProductCollectionList = cmsFavoriteService.listCollect(memberService.getNewCurrentMember().getId());
         return new CommonResult().success(memberProductCollectionList);
     }
@@ -744,13 +783,12 @@ public class BPmsController extends ApiBaseAction {
 
     @ApiOperation("生成海报")
     @PostMapping(value = "/user.getposter")
-    public Object getposter( @RequestParam Long id) {
+    public Object getposter(@RequestParam Long id) {
         PmsProduct product = pmsProductService.getById(id);
         return new CommonResult().success(product.getPic());
     }
 
 
-
     @SysLog(MODULE = "pms", REMARK = "查询商品列表")
     @IgnoreAuth
     @ApiOperation(value = "查询首页推荐商品")
@@ -772,11 +810,11 @@ public class BPmsController extends ApiBaseAction {
 
         IPage<SmsGroupActivity> page = null;
         groupActivity.setStatus(1);
-        page = smsGroupActivityService.page(new Page<SmsGroupActivity>(pageNum, pageSize), new QueryWrapper<>(groupActivity).orderByDesc("create_time")) ;
+        page = smsGroupActivityService.page(new Page<SmsGroupActivity>(pageNum, pageSize), new QueryWrapper<>(groupActivity).orderByDesc("create_time"));
 
         for (SmsGroupActivity smsGroupActivity : page.getRecords()) {
             if (ValidatorUtils.notEmpty(smsGroupActivity.getGoodsIds())) {
-                List<PmsProduct> productList = (List<PmsProduct>) pmsProductService.list(new QueryWrapper<PmsProduct>().eq("id",Arrays.asList(smsGroupActivity.getGoodsIds().split(",")).stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList())).select(ConstansValue.sampleGoodsList));
+                List<PmsProduct> productList = (List<PmsProduct>) pmsProductService.list(new QueryWrapper<PmsProduct>().eq("id", Arrays.asList(smsGroupActivity.getGoodsIds().split(",")).stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList())).select(ConstansValue.sampleGoodsList));
                 if (productList != null && productList.size() > 0) {
                     smsGroupActivity.setProductList(productList);
                 }
@@ -809,7 +847,7 @@ public class BPmsController extends ApiBaseAction {
                     recordGoodsFoot(id);
                     List<Long> newGoodIds = goodIds.subList(1, goodIds.size());
                     if (newGoodIds != null && newGoodIds.size() > 0) {
-                        List<PmsProduct> productList = (List<PmsProduct>) pmsProductService.list(new QueryWrapper<PmsProduct>().eq("id",newGoodIds).select(ConstansValue.sampleGoodsList));
+                        List<PmsProduct> productList = (List<PmsProduct>) pmsProductService.list(new QueryWrapper<PmsProduct>().eq("id", newGoodIds).select(ConstansValue.sampleGoodsList));
                         if (productList != null && productList.size() > 0) {
                             groupActivity.setProductList(productList);
                         }
@@ -832,21 +870,21 @@ public class BPmsController extends ApiBaseAction {
         UmsMember member = memberService.getNewCurrentMember();
         if (member.getMemberLevelId() > 0) {
             UmsMemberLevel memberLevel = memberLevelService.getById(member.getMemberLevelId());
-            Integer countGoodsByToday  = pmsProductService.countGoodsByToday(member.getId());
-            if (ValidatorUtils.empty(countGoodsByToday)){
-                countGoodsByToday=0;
+            Integer countGoodsByToday = pmsProductService.countGoodsByToday(member.getId());
+            if (ValidatorUtils.empty(countGoodsByToday)) {
+                countGoodsByToday = 0;
             }
             if (countGoodsByToday > memberLevel.getGoodscount()) {
                 commonResult = new CommonResult().failed("你今天已经有发" + countGoodsByToday + "个商品");
                 return commonResult;
             }
-        }else {
+        } else {
             return new CommonResult().success("没有设置会员等级");
         }
-        if (productParam.getQsType()==1){
+        if (productParam.getQsType() == 1) {
             productParam.setSchoolName(member.getSchoolName());
             productParam.setSchoolId(member.getSchoolId());
-        }else {
+        } else {
             productParam.setAreaName(member.getAreaName());
             productParam.setAreaId(member.getAreaId());
         }
@@ -860,28 +898,31 @@ public class BPmsController extends ApiBaseAction {
         }
     }
 
+
+
     private Integer recordGoodsFoot(Long id) {
         //记录浏览量到redis,然后定时更新到数据库
-        String key=Rediskey.GOODS_VIEWCOUNT_CODE+id;
+        String key = Rediskey.GOODS_VIEWCOUNT_CODE + id;
         //找到redis中该篇文章的点赞数，如果不存在则向redis中添加一条
-        Map<Object,Object> viewCountItem=redisUtil.hGetAll(Rediskey.GOODS_VIEWCOUNT_KEY);
-        Integer viewCount=0;
-        if(!viewCountItem.isEmpty()){
-            if(viewCountItem.containsKey(key)){
-                viewCount=Integer.parseInt(viewCountItem.get(key).toString())+1;
-                redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY,key,viewCount+"");
-            }else {
-                redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY,key,1+"");
+        Map<Object, Object> viewCountItem = redisUtil.hGetAll(Rediskey.GOODS_VIEWCOUNT_KEY);
+        Integer viewCount = 0;
+        if (!viewCountItem.isEmpty()) {
+            if (viewCountItem.containsKey(key)) {
+                viewCount = Integer.parseInt(viewCountItem.get(key).toString()) + 1;
+                redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY, key, viewCount + "");
+            } else {
+                redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY, key, 1 + "");
             }
-        }else{
-            viewCount=1;
-            redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY,key,1+"");
+        } else {
+            viewCount = 1;
+            redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY, key, 1 + "");
         }
         return viewCount;
     }
 
     /**
      * 判断是否收藏商品
+     *
      * @param map
      * @param goods
      * @param umsMember
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BSmsController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BSmsController.java
index 0256885a803fbbf4bae633e50e04507d73e3e8c6..63a2072e7d2590ca001f0ebaeabe8be10633aa6d 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BSmsController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BSmsController.java
@@ -78,11 +78,13 @@ public class BSmsController extends ApiBaseAction {
     public Object add(@RequestParam(value = "couponId", required = true) Long couponId) {
         return couponService.add(couponId);
     }
+
     @ApiOperation("批量领取指定优惠券")
     @PostMapping(value = "/batch.getcoupon")
     public Object addbatch(@RequestParam(value = "couponIds", required = true) String couponIds) {
         return couponService.addbatch(couponIds);
     }
+
     @ApiOperation("获取用户优惠券列表")
     @ApiImplicitParam(name = "useStatus", value = "优惠券筛选类型:0->未使用；1->已使用；2->已过期",
             allowableValues = "0,1,2", paramType = "query", dataType = "integer")
@@ -106,9 +108,9 @@ public class BSmsController extends ApiBaseAction {
     public Object detail(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
         List<SmsBasicMarking> basicMarkingList = basicMarkingService.matchGoodsBasicMarking(id);
         List<SmsBasicGifts> basicGiftsList = basicGiftsService.matchGoodsBasicGifts(id);
-        Map<String,Object> map = new HashMap<>();
-        map.put("basicMarkingList",basicMarkingList);
-        map.put("basicGiftsList",basicGiftsList);
+        Map<String, Object> map = new HashMap<>();
+        map.put("basicMarkingList", basicMarkingList);
+        map.put("basicGiftsList", basicGiftsList);
         return new CommonResult().success(map);
     }
 
@@ -134,7 +136,7 @@ public class BSmsController extends ApiBaseAction {
             Date endtime = DateUtil.strToDate(session.getEndTime(), "HH:mm:ss");
 
             Date starttime = DateUtil.strToDate(session.getStartTime(), "HH:mm:ss");
-            session.setStop(endtime.getTime()+nowT1+8*3600);
+            session.setStop(endtime.getTime() + nowT1 + 8 * 3600);
 
             if (nowT > endtime.getTime()) {
                 session.setState("已结束");
@@ -197,7 +199,7 @@ public class BSmsController extends ApiBaseAction {
                 product.setProductPrice(tempproduct.getPrice() != null ? tempproduct.getPrice() : BigDecimal.ZERO);
                 product.setFlashPromotionPrice(item.getFlashPromotionPrice());
                 product.setFlashPromotionCount(item.getFlashPromotionCount());
-                product.setPercent((double) (item.getFlashPromotionCount()*100/tempproduct.getStock()));
+                product.setPercent((double) (item.getFlashPromotionCount() * 100 / tempproduct.getStock()));
                 if (item.getFlashPromotionLimit() < 1) {
                     product.setFlashPromotionLimit(1);
                 } else {
@@ -206,7 +208,7 @@ public class BSmsController extends ApiBaseAction {
                 if (product.getProductPrice().compareTo(BigDecimal.ZERO) > 0 && item.getFlashPromotionCount() > 0) {
                     productAttrs.add(product);
                 }
-            }else {
+            } else {
                 smsFlashPromotionProductRelationService.removeById(item.getId());
             }
         }
@@ -224,13 +226,13 @@ public class BSmsController extends ApiBaseAction {
 
         GoodsDetailResult goods = null;
         try {
-            goods = JsonUtils.jsonToPojo(redisService.get(String.format(Rediskey.GOODSDETAIL, relation.getProductId()+"")), GoodsDetailResult.class);
-            if (ValidatorUtils.empty(goods)){
-                log.info("redis缓存失效："+relation.getProductId());
+            goods = JsonUtils.jsonToPojo(redisService.get(String.format(Rediskey.GOODSDETAIL, relation.getProductId() + "")), GoodsDetailResult.class);
+            if (ValidatorUtils.empty(goods)) {
+                log.info("redis缓存失效：" + relation.getProductId());
                 goods = pmsProductService.getGoodsRedisById(relation.getProductId());
             }
         } catch (Exception e) {
-            log.info("redis缓存失效："+relation.getProductId());
+            log.info("redis缓存失效：" + relation.getProductId());
             goods = pmsProductService.getGoodsRedisById(relation.getProductId());
             e.printStackTrace();
         }
@@ -244,9 +246,9 @@ public class BSmsController extends ApiBaseAction {
             query.setMemberId(umsMember.getId());
             query.setType(1);
             PmsFavorite findCollection = favoriteService.getOne(new QueryWrapper<>(query));
-            if(findCollection!=null){
+            if (findCollection != null) {
                 map.put("favorite", true);
-            }else{
+            } else {
                 map.put("favorite", false);
             }
         }
@@ -256,23 +258,22 @@ public class BSmsController extends ApiBaseAction {
     }
 
 
-
     private Integer recordGoodsFoot(Long id) {
         //记录浏览量到redis,然后定时更新到数据库
-        String key=Rediskey.GOODS_VIEWCOUNT_CODE+id;
+        String key = Rediskey.GOODS_VIEWCOUNT_CODE + id;
         //找到redis中该篇文章的点赞数，如果不存在则向redis中添加一条
-        Map<Object,Object> viewCountItem=redisUtil.hGetAll(Rediskey.GOODS_VIEWCOUNT_KEY);
-        Integer viewCount=0;
-        if(!viewCountItem.isEmpty()){
-            if(viewCountItem.containsKey(key)){
-                viewCount=Integer.parseInt(viewCountItem.get(key).toString())+1;
-                redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY,key,viewCount+"");
-            }else {
-                redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY,key,1+"");
+        Map<Object, Object> viewCountItem = redisUtil.hGetAll(Rediskey.GOODS_VIEWCOUNT_KEY);
+        Integer viewCount = 0;
+        if (!viewCountItem.isEmpty()) {
+            if (viewCountItem.containsKey(key)) {
+                viewCount = Integer.parseInt(viewCountItem.get(key).toString()) + 1;
+                redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY, key, viewCount + "");
+            } else {
+                redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY, key, 1 + "");
             }
-        }else{
-            viewCount=1;
-            redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY,key,1+"");
+        } else {
+            viewCount = 1;
+            redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY, key, 1 + "");
         }
         return viewCount;
     }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BUmsController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BUmsController.java
index 8fb84dc38d6df24647cb5f90e38d912bac621386..90288003d0dfa4329cd3b27da311dfbeb2b686b1 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BUmsController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/b2c/BUmsController.java
@@ -59,6 +59,30 @@ public class BUmsController {
     @Resource
     private IUserBankcardsService bankcardsService;
 
+    public static Object getObject(UmsMember member, IUmsMemberService memberService) {
+        if (member == null) {
+            return new CommonResult().paramFailed();
+        }
+        UmsMember member1 = memberService.getNewCurrentMember();
+        if (member1 != null && member1.getId() != null) {
+            member.setId(member1.getId());
+            return new CommonResult().success(memberService.updateById(member));
+        }
+        return new CommonResult().failed();
+    }
+
+    public static Object getObject(boolean b, Long id, boolean b2, boolean save, UserBankcards address) {
+        boolean count;
+        if (b && id != null) {
+            count = b2;
+        } else {
+            count = save;
+        }
+        if (count) {
+            return new CommonResult().success(count);
+        }
+        return new CommonResult().failed();
+    }
 
     @ApiOperation("更新会员信息")
     @SysLog(MODULE = "ums", REMARK = "更新会员信息")
@@ -74,31 +98,23 @@ public class BUmsController {
         return getObject(member, memberService);
     }
 
-    public static Object getObject(UmsMember member, IUmsMemberService memberService) {
-        if (member==null){
-            return new CommonResult().paramFailed();
-        }
-        UmsMember member1 = memberService.getNewCurrentMember();
-        if(member1!=null&& member1.getId()!=null){
-            member.setId(member1.getId());
-            return new CommonResult().success(memberService.updateById(member));
-        }
-        return new CommonResult().failed();
-    }
-
     @IgnoreAuth
     @ApiOperation(value = "查询余额列表")
     @PostMapping(value = "/user.balancelist")
     @SysLog(MODULE = "ums", REMARK = "查询余额列表")
     public Object balancelist(UmsMemberBlanceLog entity,
-                             @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                             @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
+                              @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                              @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
+        if (memberService.getNewCurrentMember()==null){
+            return new CommonResult().success();
+        }
         entity.setMemberId(memberService.getNewCurrentMember().getId());
-        if (entity==null || entity.getType()==0){
+        if (entity == null || entity.getType() == 0) {
             return new CommonResult().success(blanceLogService.page(new Page<UmsMemberBlanceLog>(pageNum, pageSize), new QueryWrapper<>()));
         }
         return new CommonResult().success(blanceLogService.page(new Page<UmsMemberBlanceLog>(pageNum, pageSize), new QueryWrapper<>(entity)));
     }
+
     @IgnoreAuth
     @ApiOperation(value = "查询会员等级列表")
     @PostMapping(value = "/user.levellist")
@@ -120,12 +136,12 @@ public class BUmsController {
     @PostMapping(value = "/user.userpointlog")
     @SysLog(MODULE = "ums", REMARK = "查询会员和积分消费记录")
     public Object userpointlog(UmsIntegrationChangeHistory entity,
-                             @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                             @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
-        Map<String,Object> map = new HashedMap();
-        map.put("member",memberService.getById(memberService.getNewCurrentMember().getId()));
+                               @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                               @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
+        Map<String, Object> map = new HashedMap();
+        map.put("member", memberService.getById(memberService.getNewCurrentMember().getId()));
         entity.setMemberId(memberService.getNewCurrentMember().getId());
-        map.put("intList",integrationChangeHistoryService.page(new Page<UmsIntegrationChangeHistory>(pageNum, pageSize), new QueryWrapper<>(entity)));
+        map.put("intList", integrationChangeHistoryService.page(new Page<UmsIntegrationChangeHistory>(pageNum, pageSize), new QueryWrapper<>(entity)));
         return new CommonResult().success(map);
     }
 
@@ -137,7 +153,6 @@ public class BUmsController {
         return new CommonResult().success(areaMapper.selectOne(new QueryWrapper<>(entity)));
     }
 
-
     @SysLog(MODULE = "cms", REMARK = "判断是否签到")
     @ApiOperation(value = "判断是否签到")
     @PostMapping(value = "/user.issign")
@@ -157,36 +172,21 @@ public class BUmsController {
         return new CommonResult().success();
     }
 
-
-
     @ApiOperation("添加银行卡")
     @RequestMapping(value = "/user.addbankcard")
     @ResponseBody
     public Object saveusership(UserBankcards address) {
         boolean count = false;
-        UmsMember umsMember =  memberService.getNewCurrentMember();
-        if (ValidatorUtils.notEmpty(address.getIsDefault()) && address.getIsDefault()==1){
-            UserBankcards query =new UserBankcards();
+        UmsMember umsMember = memberService.getNewCurrentMember();
+        if (ValidatorUtils.notEmpty(address.getIsDefault()) && address.getIsDefault() == 1) {
+            UserBankcards query = new UserBankcards();
             query.setIsDefault(2);
-            bankcardsService.update(query,new QueryWrapper<UserBankcards>().eq("user_id",umsMember.getId()));
+            bankcardsService.update(query, new QueryWrapper<UserBankcards>().eq("user_id", umsMember.getId()));
         }
         address.setUserId(umsMember.getId());
         return getObject(address != null, address.getId(), bankcardsService.updateById(address), bankcardsService.save(address), address);
     }
 
-    public static Object getObject(boolean b, Long id, boolean b2, boolean save, UserBankcards address) {
-        boolean count;
-        if (b && id != null) {
-            count = b2;
-        } else {
-            count = save;
-        }
-        if (count) {
-            return new CommonResult().success(count);
-        }
-        return new CommonResult().failed();
-    }
-
     @IgnoreAuth
     @ApiOperation("获取我的银行卡列表")
     @RequestMapping(value = "/user.getbankcardlist", method = RequestMethod.POST)
@@ -194,14 +194,13 @@ public class BUmsController {
     public Object getbankcardlist() {
         UmsMember umsMember = memberService.getNewCurrentMember();
         if (umsMember != null && umsMember.getId() != null) {
-            List<UserBankcards> addressList = bankcardsService.list(new QueryWrapper<UserBankcards>().eq("user_id",umsMember.getId()));
+            List<UserBankcards> addressList = bankcardsService.list(new QueryWrapper<UserBankcards>().eq("user_id", umsMember.getId()));
             return new CommonResult().success(addressList);
         }
         return new ArrayList<UmsMemberReceiveAddress>();
     }
 
 
-
     @IgnoreAuth
     @ApiOperation("获取银行卡信息")
     @RequestMapping(value = "/user.getbankcardinfo", method = RequestMethod.POST)
@@ -209,12 +208,13 @@ public class BUmsController {
     public Object getbankcardinfo(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
         return new CommonResult().success(bankcardsService.getById(id));
     }
+
     @IgnoreAuth
     @ApiOperation("获取默认的银行卡")
     @RequestMapping(value = "/user.getdefaultbankcard", method = RequestMethod.POST)
     @ResponseBody
     public Object getItemDefautl() {
-        UserBankcards address = bankcardsService.getOne(new QueryWrapper<UserBankcards>().eq("user_id",memberService.getNewCurrentMember().getId()).eq("is_default",1));
+        UserBankcards address = bankcardsService.getOne(new QueryWrapper<UserBankcards>().eq("user_id", memberService.getNewCurrentMember().getId()).eq("is_default", 1));
         return new CommonResult().success(address);
     }
 
@@ -235,7 +235,6 @@ public class BUmsController {
     }
 
 
-
     @ApiOperation("用户推荐列表")
     @PostMapping(value = "/user.recommend")
     @ResponseBody
@@ -279,6 +278,7 @@ public class BUmsController {
         }
         return new CommonResult().failed();
     }
+
     @ApiOperation("店铺设置")
     @PostMapping(value = "/distribution_center-api-setstore")
     @ResponseBody
@@ -300,6 +300,7 @@ public class BUmsController {
         }
         return new CommonResult().failed();
     }
+
     @ApiOperation("我的分销订单")
     @PostMapping(value = "/distribution_center-api-myorder")
     @ResponseBody
@@ -310,6 +311,7 @@ public class BUmsController {
         }
         return new CommonResult().failed();
     }
+
     @ApiOperation("判断是否是店员")
     @PostMapping(value = "/store.isclerk")
     @ResponseBody
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/cms/service/ICmsFavoriteService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/cms/service/ICmsFavoriteService.java
index 6f9f4278f8f8336cd071974eb5e4e973247a6c8e..63ad0d6181675db235a8768c629cd798c307608e 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/cms/service/ICmsFavoriteService.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/cms/service/ICmsFavoriteService.java
@@ -7,7 +7,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/cms/service/ICmsSubjectService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/cms/service/ICmsSubjectService.java
index 37e58fc27a82cc0da21ebee837a539f48536ada9..d63c09169355adfefb45318d03d3923c14c5f91b 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/cms/service/ICmsSubjectService.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/cms/service/ICmsSubjectService.java
@@ -16,11 +16,11 @@ import java.util.List;
  */
 public interface ICmsSubjectService extends IService<CmsSubject> {
 
-    List<CmsSubject> getRecommendSubjectList(int pageNum, int pageSize) ;
+    List<CmsSubject> getRecommendSubjectList(int pageNum, int pageSize);
 
     int countByToday(Long id);
 
-    Object reward(Long aid,int coin);
+    Object reward(Long aid, int coin);
 
     List<Timeline> listTimeLine();
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/cms/service/impl/CmsFavoriteServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/cms/service/impl/CmsFavoriteServiceImpl.java
index 48b55d5c32b06ff70efd9c84f391dd0d2da877be..2af3460f6b801b091f0cfaade88eab5ce1e2e922 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/cms/service/impl/CmsFavoriteServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/cms/service/impl/CmsFavoriteServiceImpl.java
@@ -17,7 +17,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
@@ -32,6 +32,7 @@ public class CmsFavoriteServiceImpl extends ServiceImpl<CmsFavoriteMapper, CmsFa
     private PmsProductMapper productMapper;
     @Resource
     private ICmsSubjectService subjectService;
+
     @Override
     public int addProduct(CmsFavorite productCollection) {
         int count = 0;
@@ -43,33 +44,33 @@ public class CmsFavoriteServiceImpl extends ServiceImpl<CmsFavoriteMapper, CmsFa
         if (findCollection == null) {
             productCollection.setAddTime(new Date());
             productCollectionRepository.insert(productCollection);
-            if (productCollection.getType()==1){
+            if (productCollection.getType() == 1) {
                 PmsProduct subject = productMapper.selectById(productCollection.getObjId());
                 subject.setId(productCollection.getObjId());
-                subject.setGiftPoint(subject.getGiftPoint()+1);
+                subject.setGiftPoint(subject.getGiftPoint() + 1);
                 //更新到数据库
                 productMapper.updateById(subject);
             }
-            if (productCollection.getType()==2){
+            if (productCollection.getType() == 2) {
                 CmsSubject subject = subjectService.getById(productCollection.getObjId());
                 subject.setId(productCollection.getObjId());
-                subject.setCollectCount(subject.getCollectCount()+1);
+                subject.setCollectCount(subject.getCollectCount() + 1);
                 //更新到数据库
                 subjectService.updateById(subject);
             }
             count = 1;
-        }else {
-            if (productCollection.getType()==1){
+        } else {
+            if (productCollection.getType() == 1) {
                 PmsProduct subject = productMapper.selectById(productCollection.getObjId());
                 subject.setId(productCollection.getObjId());
-                subject.setGiftPoint(subject.getGiftPoint()-1);
+                subject.setGiftPoint(subject.getGiftPoint() - 1);
                 //更新到数据库
                 productMapper.updateById(subject);
             }
-            if (productCollection.getType()==2){
+            if (productCollection.getType() == 2) {
                 CmsSubject subject = subjectService.getById(productCollection.getObjId());
                 subject.setId(productCollection.getObjId());
-                subject.setCollectCount(subject.getCollectCount()-1);
+                subject.setCollectCount(subject.getCollectCount() - 1);
                 //更新到数据库
                 subjectService.updateById(subject);
             }
@@ -79,13 +80,13 @@ public class CmsFavoriteServiceImpl extends ServiceImpl<CmsFavoriteMapper, CmsFa
     }
 
 
-
     @Override
     public List<CmsFavorite> listProduct(Long memberId, int type) {
-        return productCollectionRepository.selectList(new QueryWrapper<CmsFavorite>().eq("member_id",memberId).eq("type",type));
+        return productCollectionRepository.selectList(new QueryWrapper<CmsFavorite>().eq("member_id", memberId).eq("type", type));
     }
+
     @Override
     public List<CmsFavorite> listCollect(Long memberId) {
-        return productCollectionRepository.selectList(new QueryWrapper<CmsFavorite>().eq("member_id",memberId));
+        return productCollectionRepository.selectList(new QueryWrapper<CmsFavorite>().eq("member_id", memberId));
     }
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/cms/service/impl/CmsSubjectServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/cms/service/impl/CmsSubjectServiceImpl.java
index d27cd24a9ec82af8cad946aa7d93916cb9b46fc0..13ca7b003de0486c5b97183674294e0e8a35df78 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/cms/service/impl/CmsSubjectServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/cms/service/impl/CmsSubjectServiceImpl.java
@@ -57,8 +57,8 @@ public class CmsSubjectServiceImpl extends ServiceImpl<CmsSubjectMapper, CmsSubj
     private IUmsMemberService memberService;
 
 
-
-    /**timelineMapper
+    /**
+     * timelineMapper
      * 获取timeLine数据
      *
      * @return
@@ -71,11 +71,11 @@ public class CmsSubjectServiceImpl extends ServiceImpl<CmsSubjectMapper, CmsSubj
     }
 
     private List<Timeline> genTimelineMonth(List<Timeline> timelineList) {
-        for(Timeline timeline : timelineList) {
+        for (Timeline timeline : timelineList) {
             List<TimelineMonth> timelineMonthList = new ArrayList<>();
             for (int i = Calendar.DECEMBER + 1; i > 0; i--) {
                 List<TimelinePost> postList = subjectMapper.listTimelinePost(timeline.getYear(), i);
-                if(CollectionUtils.isEmpty(postList)) {
+                if (CollectionUtils.isEmpty(postList)) {
                     continue;
                 }
                 TimelineMonth month = new TimelineMonth();
@@ -100,8 +100,8 @@ public class CmsSubjectServiceImpl extends ServiceImpl<CmsSubjectMapper, CmsSubj
     }
 
     @Override
-    public int countByToday(Long id){
-       return subjectMapper.countByToday(id);
+    public int countByToday(Long id) {
+        return subjectMapper.countByToday(id);
     }
 
     @Transactional
@@ -109,23 +109,25 @@ public class CmsSubjectServiceImpl extends ServiceImpl<CmsSubjectMapper, CmsSubj
     public Object reward(Long aid, int coin) {
         try {
             UmsMember member = memberService.getNewCurrentMember();
-            if (member!=null && member.getBlance().compareTo(new BigDecimal(coin))<0){
+            if (member != null && member.getBlance().compareTo(new BigDecimal(coin)) < 0) {
                 return new CommonResult().failed("余额不够");
             }
             member.setBlance(member.getBlance().subtract(new BigDecimal(coin)));
             memberMapper.updateById(member);
             CmsSubject subject = subjectMapper.selectById(aid);
             UmsMember remember = memberMapper.selectById(subject.getMemberId());
-            if (remember!=null){
-                subject.setReward(subject.getReward()+coin);
+            if (remember != null) {
+                subject.setReward(subject.getReward() + coin);
                 subjectMapper.updateById(subject);
                 remember.setBlance(remember.getBlance().add(new BigDecimal(coin)));
                 memberMapper.updateById(remember);
                 UmsRewardLog log = new UmsRewardLog();
-                log.setCoin(coin);log.setSendMemberId(member.getId());
+                log.setCoin(coin);
+                log.setSendMemberId(member.getId());
                 log.setMemberIcon(member.getIcon());
                 log.setMemberNickName(member.getNickname());
-                log.setRecMemberId(remember.getId());log.setCreateTime(new Date());
+                log.setRecMemberId(remember.getId());
+                log.setCreateTime(new Date());
                 log.setObjid(aid);
                 rewardLogMapper.insert(log);
             }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/component/JwtAuthenticationTokenFilter.java b/mallplus-portal/src/main/java/com/zscat/mallplus/component/JwtAuthenticationTokenFilter.java
index c424e97e991a4ccc90d7e23c2a1009bb70c9f917..52c48178b594b75550a46715813afa5930a5ec4a 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/component/JwtAuthenticationTokenFilter.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/component/JwtAuthenticationTokenFilter.java
@@ -1,13 +1,12 @@
 package com.zscat.mallplus.component;
 
 
-import com.google.common.collect.Lists;
+import com.zscat.mallplus.ApiContext;
 import com.zscat.mallplus.sys.entity.SysWebLog;
 import com.zscat.mallplus.sys.mapper.SysWebLogMapper;
 import com.zscat.mallplus.util.IpAddressUtil;
 import com.zscat.mallplus.util.JwtTokenUtil;
 import com.zscat.mallplus.utils.ValidatorUtils;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +30,6 @@ import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -39,98 +37,21 @@ import java.util.Map;
  * https://github.com/shenzhuan/mallplus on 2018/4/26.
  */
 public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
+
     private static final Logger LOGGER = LoggerFactory.getLogger(JwtAuthenticationTokenFilter.class);
+    @Resource
+    public SysWebLogMapper fopSystemOperationLogService;
     @Autowired
     private UserDetailsService userDetailsService;
     @Autowired
     private JwtTokenUtil jwtTokenUtil;
-
     @Value("${jwt.tokenHeader}")
     private String tokenHeader;
     @Value("${jwt.tokenHead}")
     private String tokenHead;
+    @Autowired
+    private ApiContext apiContext;
 
-    @Resource
-    public SysWebLogMapper fopSystemOperationLogService;
-
-    public static final List<String> IGNORE_TENANT_TABLES = Lists.newArrayList(
-            "user.info",
-            "user.editinfo",
-            "user.changeavatar",
-            "user.logout",
-            "user.addgoodsbrowsing",
-            "user.delgoodsbrowsing",
-            "user.goodsbrowsing",
-            "user.goodscollection",
-            "user.goodscollectionlist",
-            "user.vuesaveusership",
-            "user.saveusership",
-            "user.getshipdetail",
-            "user.setdefship",
-            "user.editship",
-            "user.removeship",
-            "user.getusership",
-            "api/wxpay/user.pay",
-            "user.orderevaluate",
-            "user.getuserdefaultship",
-            "user.issign",
-            "user.sign",
-            "user.mypoint",
-            "user.userpointlog",
-            "user.getbankcardlist",
-            "user.getdefaultbankcard",
-            "user.addbankcard",
-            "user.removebankcard",
-            "user.setdefaultbankcard",
-            "user.getbankcardinfo",
-            "user.editpwd",
-            "user.forgotpwd",
-            "user.recommend",
-            "user.balancelist",
-            "user.sharecode",
-            "user.cash",
-            "user.cashlist",
-            "user.myinvite",
-            "user.activationinvite",
-            "coupon.getcoupon",
-            "coupon.usercoupon",
-            "cart.add",
-            "cart.del",
-            "cart.getlist",
-            "cart.setnums",
-            "cart.getnumber",
-            "order.cancel",
-            "order.del",
-            "order.details",
-            "order.confirm",
-            "order.getlist",
-            "order.create",
-            "submitPreview",
-            "order.getship",
-            "order.getorderlist",
-            "order.getorderstatusnum",
-            "order.aftersaleslist",
-            "order.aftersalesinfo",
-            "order.aftersalesstatus",
-            "order.addaftersales",
-            "order.sendreship",
-            "order.iscomment",
-            "payments.getinfo",
-            "user.getuserpoint",
-            "coupon.getcouponkey",
-            "store.isclerk",
-            "store.storeladinglist",
-            "store.ladinginfo",
-            "store.lading",
-            "store.ladingdel",
-            "distribution_center-api-info",
-            "distribution_center-api-applydistribution",
-            "distribution_center-api-setstore",
-            "distribution_center-api-myorder",
-            "pintuan.pintuanteam",
-            "lottery-api-getLotteryConfig",
-            "lottery-api-lottery",
-            "lottery-api-lotteryLog");
     @Override
     protected void doFilterInternal(HttpServletRequest request,
                                     HttpServletResponse response,
@@ -162,38 +83,50 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
         String username = null;
         int startIntercept = fullUrl.replace("//", "a").indexOf("/") + 2;
         String interfaceName = fullUrl.substring(startIntercept, fullUrl.length());
-        String tokenPre = this.tokenHeader ;
+        String storeId = request.getParameter("storeid");
+        if (ValidatorUtils.notEmpty(storeId)) {
+            apiContext.setCurrentProviderId(Long.valueOf(storeId));
+        } else {
+            storeId = request.getHeader("storeid");
+            if (ValidatorUtils.notEmpty(storeId)) {
+                apiContext.setCurrentProviderId(Long.valueOf(storeId));
+            }
+        }
+        logger.info(formMapKey(11, fullUrl, requestType,
+                IpAddressUtil.getIpAddr((HttpServletRequest) request), sbParams.toString(), "")
+                + ",\"cost\":\"" + 0 + "ms\"");
+
+        String tokenPre = this.tokenHeader + storeId;
         String authHeader = request.getParameter(tokenPre);
-        if (ValidatorUtils.empty(authHeader)){
+        if (ValidatorUtils.empty(authHeader)) {
             authHeader = request.getHeader(tokenPre);
         }
-      //  if (  IGNORE_TENANT_TABLES.stream().anyMatch((e) -> e.equalsIgnoreCase(interfaceName))){
-
-            if (authHeader != null && authHeader.startsWith("Bearer")) {
-                String authToken = authHeader.substring("Bearer".length());
-                username = jwtTokenUtil.getUserNameFromToken(authToken);
-                LOGGER.info("checking username:{}", username);
-                    UserDetails userDetails = this.userDetailsService.loadUserByUsername(username);
-                    if (userDetails!=null && jwtTokenUtil.validateToken(authToken, userDetails)) {
-                        UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
-                        authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
-                        LOGGER.info("authenticated user:{}", username);
-                        SecurityContextHolder.getContext().setAuthentication(authentication);
-                    }else{
-                        throw new ClassCastException();
-                    }
-
-            }else {
-                logger.info("no token"+request.getRequestURI());
+        //  if (  IGNORE_TENANT_TABLES.stream().anyMatch((e) -> e.equalsIgnoreCase(interfaceName))){
+
+        if (authHeader != null && authHeader.startsWith("Bearer")) {
+            String authToken = authHeader.substring("Bearer".length());
+            username = jwtTokenUtil.getUserNameFromToken(authToken);
+            LOGGER.info("checking username:{}，storeId:{}", username,storeId);
+            UserDetails userDetails = this.userDetailsService.loadUserByUsername(username);
+            if (userDetails != null && userDetails.getUsername() != null) {
+                if (userDetails != null && jwtTokenUtil.validateToken(authToken, userDetails)) {
+                    UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
+                    authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+                    LOGGER.info("authenticated user:{}", username);
+                    SecurityContextHolder.getContext().setAuthentication(authentication);
+                }
             }
-       // }
+        } else {
+            logger.info("no token" + request.getRequestURI());
+        }
+        // }
 
         startTime = System.currentTimeMillis();
-            try {
-                chain.doFilter(request, response);
-            }catch (Exception e){
-                e.printStackTrace();
-            }
+        try {
+            chain.doFilter(request, response);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
         endTime = System.currentTimeMillis();
         logger.info(formMapKey(11, fullUrl, requestType,
@@ -209,7 +142,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
         sysLog.setTimeMin((endTime - startTime));
         if (!"OPTIONS".equals(requestType) && !interfaceName.contains("webjars")
                 && !interfaceName.contains("api-docs")) {
-        //    fopSystemOperationLogService.insert(sysLog);
+                fopSystemOperationLogService.insert(sysLog);
         }
     }
 
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/component/OrderTimeOutCancelTask.java b/mallplus-portal/src/main/java/com/zscat/mallplus/component/OrderTimeOutCancelTask.java
index 36aaf29b56976d109403cf5fb1e8609e7ea55e5d..48ace951d1fa59fab5dd7292f6a667bdd9ad854d 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/component/OrderTimeOutCancelTask.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/component/OrderTimeOutCancelTask.java
@@ -9,7 +9,6 @@ import com.zscat.mallplus.pms.entity.PmsProduct;
 import com.zscat.mallplus.pms.mapper.PmsProductMapper;
 import com.zscat.mallplus.ums.service.IUmsMemberService;
 import com.zscat.mallplus.ums.service.impl.RedisUtil;
-import com.zscat.mallplus.utils.CommonResult;
 import com.zscat.mallplus.vo.Rediskey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,14 +38,15 @@ public class OrderTimeOutCancelTask {
     private OmsOrderMapper orderMapper;
     @Resource
     private IUmsMemberService IUmsMemberService;
+
     /**
      * cron表达式：Seconds Minutes Hours DayofMonth Month DayofWeek [Year]
      * 每10分钟扫描一次，扫描设定超时时间之前下的订单，如果没支付则取消该订单
      */
     @Scheduled(cron = "0 0/10 * ? * ?")
     private void cancelTimeOutOrder() {
-        CommonResult result = portalOrderService.cancelTimeOutOrder();
-        logger.info("取消订单，并根据sku编号释放锁定库存:{}", result);
+//        CommonResult result = portalOrderService.cancelTimeOutOrder();
+        //      logger.info("取消订单，并根据sku编号释放锁定库存:{}", result);
     }
 
 
@@ -55,9 +55,10 @@ public class OrderTimeOutCancelTask {
      */
     @Scheduled(cron = "0 0/55 * ? * ?")
     private void memberlevelCalator() {
-        IUmsMemberService.updataMemberOrderInfo();
+        //   IUmsMemberService.updataMemberOrderInfo();
         logger.info("会员等级计算");
     }
+
     /**
      * 文章浏览量
      */
@@ -66,22 +67,23 @@ public class OrderTimeOutCancelTask {
         logger.info("开始保存点赞数 、浏览数SyncNodesAndShips");
         try {
             //先获取这段时间的浏览数
-            Map<Object,Object> viewCountItem=redisUtil.hGetAll(Rediskey.ARTICLE_VIEWCOUNT_KEY);
+            Map<Object, Object> viewCountItem = redisUtil.hGetAll(Rediskey.ARTICLE_VIEWCOUNT_KEY);
             //然后删除redis里这段时间的浏览数
             redisUtil.delete(Rediskey.ARTICLE_VIEWCOUNT_KEY);
-            if(!viewCountItem.isEmpty()){
-                for(Object item :viewCountItem.keySet()){
-                    String articleKey=item.toString();//viewcount_1
-                    String[]  kv=articleKey.split("_");
-                    Long articleId=Long.parseLong(kv[1]);
-                    Integer viewCount=Integer.parseInt(viewCountItem.get(articleKey).toString());
+            if (!viewCountItem.isEmpty()) {
+                for (Object item : viewCountItem.keySet()) {
+                    String articleKey = item.toString();//viewcount_1
+                    String[] kv = articleKey.split("_");
+                    Long articleId = Long.parseLong(kv[1]);
+                    Integer viewCount = Integer.parseInt(viewCountItem.get(articleKey).toString());
                     CmsSubject subject = subjectService.getById(articleId);
-                    if (subject!=null){
-                        subject.setId(articleId);
-                        subject.setReadCount(subject.getReadCount()+viewCount);
-                        logger.info("SyncNodesAndShips"+articleId+","+viewCount);
+                    if (subject != null) {
+                        CmsSubject cms = new CmsSubject();
+                        cms.setId(articleId);
+                        cms.setReadCount(subject.getReadCount() + viewCount);
+                        logger.info("SyncNodesAndShips" + articleId + "," + viewCount);
                         //更新到数据库
-                        subjectService.updateById(subject);
+                        subjectService.updateById(cms);
                     }
                 }
             }
@@ -100,23 +102,24 @@ public class OrderTimeOutCancelTask {
         logger.info("开始保存点赞数 、浏览数SyncGoodsView");
         try {
             //先获取这段时间的浏览数
-            Map<Object,Object> viewCountItem=redisUtil.hGetAll(Rediskey.GOODS_VIEWCOUNT_KEY);
+            Map<Object, Object> viewCountItem = redisUtil.hGetAll(Rediskey.GOODS_VIEWCOUNT_KEY);
             //然后删除redis里这段时间的浏览数
             redisUtil.delete(Rediskey.GOODS_VIEWCOUNT_KEY);
-            if(!viewCountItem.isEmpty()){
-                for(Object item :viewCountItem.keySet()){
-                    String articleKey=item.toString();//viewcount_1
-                    String[]  kv=articleKey.split("_");
-                    Long articleId=Long.parseLong(kv[1]);
-                    Integer viewCount=Integer.parseInt(viewCountItem.get(articleKey).toString());
+            if (!viewCountItem.isEmpty()) {
+                for (Object item : viewCountItem.keySet()) {
+                    String articleKey = item.toString();//viewcount_1
+                    String[] kv = articleKey.split("_");
+                    Long articleId = Long.parseLong(kv[1]);
+                    Integer viewCount = Integer.parseInt(viewCountItem.get(articleKey).toString());
                     PmsProduct subject = productMapper.selectById(articleId);
-                   if(subject!=null){
-                       subject.setId(articleId);
-                       subject.setHit(subject.getHit()+viewCount);
-                       logger.info("SyncGoodsView"+articleId+","+viewCount);
-                       //更新到数据库
-                       productMapper.updateById(subject);
-                   }
+                    if (subject != null) {
+                        PmsProduct p = new PmsProduct();
+                        p.setId(articleId);
+                        p.setHit(subject.getHit() + viewCount);
+                        logger.info("SyncGoodsView" + articleId + "," + viewCount);
+                        //更新到数据库
+                        productMapper.updateById(p);
+                    }
                 }
             }
         } catch (Exception e) {
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/component/UserUtils.java b/mallplus-portal/src/main/java/com/zscat/mallplus/component/UserUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..f874f4e626b93c1005e30c97f92015edc96b7e2c
--- /dev/null
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/component/UserUtils.java
@@ -0,0 +1,25 @@
+package com.zscat.mallplus.component;
+
+import com.zscat.mallplus.ums.entity.UmsMember;
+import com.zscat.mallplus.vo.MemberDetails;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+/**
+ * @Auther: shenzhuan
+ * @Date: 2019/3/30 16:26
+ * @Description:
+ */
+public class UserUtils {
+    public static UmsMember getCurrentMember() {
+        try {
+            SecurityContext ctx = SecurityContextHolder.getContext();
+            Authentication auth = ctx.getAuthentication();
+            MemberDetails memberDetails = (MemberDetails) auth.getPrincipal();
+            return memberDetails.getUmsMember();
+        } catch (Exception e) {
+            return new UmsMember();
+        }
+    }
+}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/config/AliyunSmsConfig.java b/mallplus-portal/src/main/java/com/zscat/mallplus/config/AliyunSmsConfig.java
index 9261d357cd3b9b3b5c0a920cbe93fd90ccb57b5c..da2747a05bfd05d069bbba2ad0ef55c0486b1366 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/config/AliyunSmsConfig.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/config/AliyunSmsConfig.java
@@ -24,37 +24,37 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration
 public class AliyunSmsConfig {
-	
-	private Logger logger = LoggerFactory.getLogger(AliyunSmsConfig.class);
-
-	@Value("${aliyun.sms.accessKeyId:xxxxx}")
-	private String accessKeyId;
-	@Value("${aliyun.sms.accessKeySecret:xxxxx}")
-	private String accessKeySecret;
-
-	@Bean
-	public IAcsClient iAcsClient() throws ClientException {
-		
-		// 设置超时时间-可自行调整
-		System.setProperty("sun.net.client.defaultConnectTimeout", "10000");
-		System.setProperty("sun.net.client.defaultReadTimeout", "10000");
-		// 初始化ascClient需要的几个参数
-		logger.info("初始化阿里云接口:" + this);
-		final String product = "Dysmsapi";// 短信API产品名称（短信产品名固定，无需修改）
-		final String domain = "dysmsapi.aliyuncs.com";// 短信API产品域名（接口地址固定，无需修改）
-		// 替换成你的AK
-		// 初始化ascClient,暂时不支持多region（请勿修改）
-		IClientProfile profile = DefaultProfile.getProfile("cn-hangzhou", accessKeyId, accessKeySecret);
-		try {
-			DefaultProfile.addEndpoint("cn-hangzhou", "cn-hangzhou", product, domain);
+
+    private Logger logger = LoggerFactory.getLogger(AliyunSmsConfig.class);
+
+    @Value("${aliyun.sms.accessKeyId:xxxxx}")
+    private String accessKeyId;
+    @Value("${aliyun.sms.accessKeySecret:xxxxx}")
+    private String accessKeySecret;
+
+    @Bean
+    public IAcsClient iAcsClient() throws ClientException {
+
+        // 设置超时时间-可自行调整
+        System.setProperty("sun.net.client.defaultConnectTimeout", "10000");
+        System.setProperty("sun.net.client.defaultReadTimeout", "10000");
+        // 初始化ascClient需要的几个参数
+        logger.info("初始化阿里云接口:" + this);
+        final String product = "Dysmsapi";// 短信API产品名称（短信产品名固定，无需修改）
+        final String domain = "dysmsapi.aliyuncs.com";// 短信API产品域名（接口地址固定，无需修改）
+        // 替换成你的AK
+        // 初始化ascClient,暂时不支持多region（请勿修改）
+        IClientProfile profile = DefaultProfile.getProfile("cn-hangzhou", accessKeyId, accessKeySecret);
+        try {
+            DefaultProfile.addEndpoint("cn-hangzhou", "cn-hangzhou", product, domain);
         } catch (ClientException e) {
-            
+
             logger.error("初始化阿里云客户端失败：" + e);
         }
-		
-		IAcsClient acsClient = new DefaultAcsClient(profile);
 
-		return acsClient;
-	}
+        IAcsClient acsClient = new DefaultAcsClient(profile);
+
+        return acsClient;
+    }
 
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/config/InterfaceExceptionHandler.java b/mallplus-portal/src/main/java/com/zscat/mallplus/config/InterfaceExceptionHandler.java
index c03c239f5dd6af08ca7ac90531b331aa6ac90cff..db72b2ffebbf0fd09366828467677dfa5bddfac7 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/config/InterfaceExceptionHandler.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/config/InterfaceExceptionHandler.java
@@ -15,35 +15,35 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
 @Slf4j
 public class InterfaceExceptionHandler {
 
-	/**
-	 * 接口 业务异常
-	 */
-	@ResponseBody
-	@ExceptionHandler(ClassCastException.class)
-	public Object businessInterfaceException(ClassCastException e) {
-		log.error(e.getMessage(), e);
-		e.printStackTrace();
-		return new CommonResult().fail(100);
-	}
+    /**
+     * 接口 业务异常
+     */
+    @ResponseBody
+    @ExceptionHandler(ClassCastException.class)
+    public Object businessInterfaceException(ClassCastException e) {
+        log.error(e.getMessage(), e);
+        e.printStackTrace();
+        return new CommonResult().fail(100);
+    }
 
-	/**
-	 * 拦截所有运行时的全局异常   
-	 */
-	@ExceptionHandler(RuntimeException.class)
-	@ResponseBody
-	public Object runtimeException(RuntimeException e) {
-		log.error(e.getMessage(), e);
-		// 返回 JOSN
-		return new CommonResult().fail(500);
-	}
+    /**
+     * 拦截所有运行时的全局异常   
+     */
+    @ExceptionHandler(RuntimeException.class)
+    @ResponseBody
+    public Object runtimeException(RuntimeException e) {
+        log.error(e.getMessage(), e);
+        // 返回 JOSN
+        return new CommonResult().fail(500);
+    }
 
-	/**
-	 * 系统异常捕获处理
-	 */
-	@ExceptionHandler(Exception.class)
-	@ResponseBody
-	public Object exception(Exception e) {
-		log.error(e.getMessage(), e);
-		return new CommonResult().fail(500);
-	}
+    /**
+     * 系统异常捕获处理
+     */
+    @ExceptionHandler(Exception.class)
+    @ResponseBody
+    public Object exception(Exception e) {
+        log.error(e.getMessage(), e);
+        return new CommonResult().fail(500);
+    }
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/config/MybatisPlusConfig.java b/mallplus-portal/src/main/java/com/zscat/mallplus/config/MybatisPlusConfig.java
index b3412622f0b833d8458d80955d4f90fe72e4e78d..cbb11e8dd681cce3a44c13ab5969fb25494e8e71 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/config/MybatisPlusConfig.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/config/MybatisPlusConfig.java
@@ -8,8 +8,9 @@ import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler;
 import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser;
+import com.zscat.mallplus.ApiContext;
 import com.zscat.mallplus.enums.ConstansValue;
-
+import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.LongValue;
 import org.apache.ibatis.mapping.MappedStatement;
@@ -24,11 +25,14 @@ import java.util.ArrayList;
 import java.util.List;
 
 //Spring boot方式
+@Slf4j
 @EnableTransactionManagement
 @Configuration
 @MapperScan("com.zscat.mallplus.*.mapper*")
 public class MybatisPlusConfig {
     private static final List<String> IGNORE_TENANT_TABLES = ConstansValue.IGNORE_TENANT_TABLES;
+    @Autowired
+    private ApiContext apiContext;
 
     /**
      * 分页插件
@@ -39,8 +43,59 @@ public class MybatisPlusConfig {
         PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
 
         paginationInterceptor.setDialectType("mysql");
+        /*
+         * 【测试多租户】 SQL 解析处理拦截器<br>
+         * 这里固定写成住户 1 实际情况你可以从cookie读取，因此数据看不到 【 麻花藤 】 这条记录（ 注意观察 SQL ）<br>
+         */
+        List<ISqlParser> sqlParserList = new ArrayList<>();
+        TenantSqlParser tenantSqlParser = new TenantSqlParser();
+        tenantSqlParser.setTenantHandler(new TenantHandler() {
+
+            @Override
+            public Expression getTenantId() {
+                // 从当前系统上下文中取出当前请求的服务商ID，通过解析器注入到SQL中。
+                Long currentProviderId = apiContext.getCurrentProviderId();
+                if (null == currentProviderId) {
+                    currentProviderId = 1l;
+                    log.info("#1129 getCurrentProviderId error.");
+                    System.out.println("#1129 getCurrentProviderId error.");
+
+                }
+                return new LongValue(currentProviderId);
+            }
+
+            @Override
+            public String getTenantIdColumn() {
+                return "store_id";
+            }
+
+            @Override
+            public boolean doTableFilter(String tableName) {
+                if (tableName.startsWith("admin_") || tableName.startsWith("QRTZ_")) {
+                    return true;
+                }
+                return IGNORE_TENANT_TABLES.stream().anyMatch((e) -> e.equalsIgnoreCase(tableName));
+
+            }
+        });
+
+        sqlParserList.add(tenantSqlParser);
+        paginationInterceptor.setSqlParserList(sqlParserList);
+        paginationInterceptor.setSqlParserFilter(new ISqlParserFilter() {
+            @Override
+            public boolean doFilter(MetaObject metaObject) {
+                MappedStatement ms = SqlParserHelper.getMappedStatement(metaObject);
 
+                if ("com.zscat.mallplus.sys.mapper.SysUserMapper.selectByUserName".equals(ms.getId())) {
+                    return true;
+                }
+                if ("com.zscat.mallplus.oms.mapper.OmsOrderMapper.listOrderGroupByMemberId".equals(ms.getId())) {
+                    return true;
+                }
 
+                return false;
+            }
+        });
         return paginationInterceptor;
     }
 
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/config/OssAliyunConfig.java b/mallplus-portal/src/main/java/com/zscat/mallplus/config/OssAliyunConfig.java
index 94966f64aaaa7ce5d74263f98abb9ae0b3b0aaca..9a08bfb6ab317f8634cfb490d720f07b8c92de80 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/config/OssAliyunConfig.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/config/OssAliyunConfig.java
@@ -7,19 +7,20 @@ import org.springframework.context.annotation.Configuration;
 
 /**
  * 阿里云配置类
+ *
  * @author: Peter
  * @date: 2018-4-11
  */
 @Configuration
 public class OssAliyunConfig {
 
-    @Bean(value="defaultOssAliyunField")
+    @Bean(value = "defaultOssAliyunField")
     @ConfigurationProperties("oss.aliyun.defalut")
     public OssAliyunField defaultOssAliyunField() {
         return new OssAliyunField();
     }
 
-    @Bean(value="firstOssAliyuField")
+    @Bean(value = "firstOssAliyuField")
     @ConfigurationProperties("oss.aliyun.first")
     public OssAliyunField firstOssAliyuField() {
         return new OssAliyunField();
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/config/SecurityConfig.java b/mallplus-portal/src/main/java/com/zscat/mallplus/config/SecurityConfig.java
index 04e0ee32e7b1738bb02e78461696cf11eeb5e584..ade00a06ea5eac09297a02860f63a6773709786f 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/config/SecurityConfig.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/config/SecurityConfig.java
@@ -1,6 +1,7 @@
 package com.zscat.mallplus.config;
 
 
+import com.zscat.mallplus.ApiContext;
 import com.zscat.mallplus.component.JwtAuthenticationTokenFilter;
 import com.zscat.mallplus.component.RestAuthenticationEntryPoint;
 import com.zscat.mallplus.component.RestfulAccessDeniedHandler;
@@ -8,7 +9,6 @@ import com.zscat.mallplus.ums.entity.UmsMember;
 import com.zscat.mallplus.ums.service.IUmsMemberService;
 import com.zscat.mallplus.ums.service.RedisService;
 import com.zscat.mallplus.util.JsonUtils;
-
 import com.zscat.mallplus.vo.MemberDetails;
 import com.zscat.mallplus.vo.Rediskey;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +22,6 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -49,6 +48,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
     private RestfulAccessDeniedHandler restfulAccessDeniedHandler;
     @Autowired
     private RestAuthenticationEntryPoint restAuthenticationEntryPoint;
+    @Autowired
+    private ApiContext apiContext;
 
     @Override
     protected void configure(HttpSecurity httpSecurity) throws Exception {
@@ -71,7 +72,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 .permitAll()
                 .antMatchers("/admin/login", "/admin/register")// 对登录注册要允许匿名访问
                 .permitAll()
-               // .antMatchers(HttpMethod.OPTIONS)//跨域请求会先进行一次options请求
+                // .antMatchers(HttpMethod.OPTIONS)//跨域请求会先进行一次options请求
                 //.permitAll()
                 .antMatchers("/**")//测试时全部运行访问
                 .permitAll()
@@ -104,18 +105,21 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
         //获取登录用户信息
         return new UserDetailsService() {
             @Override
-            public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+            public MemberDetails loadUserByUsername(String username) throws UsernameNotFoundException {
 
                 try {
-
-                    UmsMember member = JsonUtils.jsonToPojo(redisService.get(String.format(Rediskey.MEMBER, username)),UmsMember.class);
+                    UmsMember member = JsonUtils.jsonToPojo(redisService.get(apiContext.getCurrentProviderId() + ":" + String.format(Rediskey.MEMBER, username)), UmsMember.class);
+                    //   UmsMember member = JsonUtils.jsonToPojo(redisService.get(String.format(Rediskey.MEMBER, username)),UmsMember.class);
                     if (member != null) {
                         return new MemberDetails(member);
-                    }else {
+                    } else {
                         member = memberService.getByUsername(username);
-                        return new MemberDetails(member);
+                        if (member!=null){
+                            return new MemberDetails(member);
+                        }
+
                     }
-                }catch (Exception e){
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
                 return null;
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/config/WebMvcConfig.java b/mallplus-portal/src/main/java/com/zscat/mallplus/config/WebMvcConfig.java
index c9b69a8d345be5c35ea6aa8f77b374c4640df05d..957b70b0f55b3f1fe2b2fa462f94223e6b628214 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/config/WebMvcConfig.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/config/WebMvcConfig.java
@@ -36,8 +36,9 @@ public class WebMvcConfig extends WebMvcConfigurationSupport {
         registry.addResourceHandler("/webjars/**")
                 .addResourceLocations("classpath:/META-INF/resources/webjars/");
     }
+
     @Bean
-     public HandlerInterceptor getMyInterceptor(){
-                return new WxPayInterceptor();
-            }
+    public HandlerInterceptor getMyInterceptor() {
+        return new WxPayInterceptor();
+    }
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/config/WxAppletProperties.java b/mallplus-portal/src/main/java/com/zscat/mallplus/config/WxAppletProperties.java
index 834aa4852b5578ba33077040d59f1775dbe368fd..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/config/WxAppletProperties.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/config/WxAppletProperties.java
@@ -1,32 +0,0 @@
-package com.zscat.mallplus.config;
-
-import lombok.Data;
-import lombok.ToString;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-
-@Data
-@ToString
-@Component
-@ConfigurationProperties(prefix = "wx")
-public class WxAppletProperties {
-
-    private String secret;
-    private String appId;
-    private String mchId;
-    private String paySignKey;
-    private String certName;
-    private String getCode;
-    private String notifyUrl;
-    private String orderquery;
-    private String refundUrl;
-    private String refundqueryUrl;
-    private String tradeType;
-    private String uniformorder;
-    private String userMessage;
-    private String webAccessTokenhttps;
-    private String templateId;
-
-
-}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/controller/AppletMemberController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/controller/AppletMemberController.java
index 4d232e8cc42315b3e4f6ea3a215adc9be24fafd7..d60b78a25d446f7ded78361546d8bb8bd8515eff 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/controller/AppletMemberController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/controller/AppletMemberController.java
@@ -7,43 +7,39 @@ import com.zscat.mallplus.annotation.SysLog;
 import com.zscat.mallplus.cms.entity.CmsSubject;
 import com.zscat.mallplus.cms.service.ICmsSubjectService;
 import com.zscat.mallplus.enums.ConstansValue;
+import com.zscat.mallplus.enums.OrderStatus;
 import com.zscat.mallplus.oms.entity.OmsOrder;
 import com.zscat.mallplus.oms.service.IOmsOrderService;
 import com.zscat.mallplus.pms.entity.PmsProduct;
 import com.zscat.mallplus.pms.entity.PmsProductAttributeCategory;
-import com.zscat.mallplus.pms.entity.PmsProductCategory;
 import com.zscat.mallplus.pms.service.IPmsProductAttributeCategoryService;
 import com.zscat.mallplus.pms.service.IPmsProductCategoryService;
 import com.zscat.mallplus.pms.service.IPmsProductService;
 import com.zscat.mallplus.pms.service.IPmsSmallNaviconCategoryService;
 import com.zscat.mallplus.single.ApiBaseAction;
 import com.zscat.mallplus.sms.entity.SmsCoupon;
-import com.zscat.mallplus.sms.entity.SmsFlashPromotion;
 import com.zscat.mallplus.sms.entity.SmsHomeAdvertise;
 import com.zscat.mallplus.sms.mapper.SmsFlashPromotionSessionMapper;
 import com.zscat.mallplus.sms.mapper.SmsHomeNewProductMapper;
 import com.zscat.mallplus.sms.mapper.SmsHomeRecommendProductMapper;
 import com.zscat.mallplus.sms.service.*;
-import com.zscat.mallplus.sms.vo.HomeFlashPromotion;
-import com.zscat.mallplus.sms.vo.HomeProductAttr;
 import com.zscat.mallplus.ums.entity.UmsMember;
 import com.zscat.mallplus.ums.service.IUmsMemberService;
 import com.zscat.mallplus.ums.service.RedisService;
 import com.zscat.mallplus.util.JsonUtils;
 import com.zscat.mallplus.utils.CommonResult;
 import com.zscat.mallplus.vo.*;
-import com.zscat.mallplus.vo.pms.CateProduct;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import org.apache.commons.lang.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 会员登录注册管理Controller
@@ -105,23 +101,60 @@ public class AppletMemberController extends ApiBaseAction {
     @ApiOperation("注册")
     @SysLog(MODULE = "applet", REMARK = "小程序注册")
     @PostMapping("login_by_weixin1")
-    public Object loginByWeixinNew(AppletLoginParam param) {
-       /* AppletLoginParam appletLoginParam = new AppletLoginParam();
-        BeanUtils.copyProperties(param,appletLoginParam);
-        appletLoginParam.setUserInfo(JSONObject.toJSONString(param.getUserInfo()));*/
-        return memberService.loginByWeixin(param);
+    public Object loginByWeixinNew(@RequestBody AppletLoginParam param) {
+        try {
+            return memberService.loginByWeixin1(param);
+        } catch (Exception e) {
+            return new CommonResult().failed(e.getMessage());
+        }
+
 
     }
+
     @IgnoreAuth
     @ApiOperation("注册")
     @SysLog(MODULE = "applet", REMARK = "小程序注册")
     @PostMapping("login_by_weixin")
-    public Object loginByWeixin(@RequestBody  AppletLoginParam param) {
-        return memberService.loginByWeixin(param);
+    public Object loginByWeixin(@RequestBody AppletLoginParam param) {
+        try {
+            return memberService.loginByWeixin(param);
+        } catch (Exception e) {
+            return new CommonResult().failed(e.getMessage());
+        }
 
     }
+    @IgnoreAuth
+    @ApiOperation("获取小程序openid")
+    @SysLog(MODULE = "applet", REMARK = "获取小程序openid")
+    @PostMapping("getAppletOpenId")
+    public Object getAppletOpenId(@RequestBody AppletLoginParam param) {
+        try {
+            return memberService.getAppletOpenId(param);
+        } catch (Exception e) {
+            return new CommonResult().failed(e.getMessage());
+        }
+    }
 
 
+    @IgnoreAuth
+    @ApiOperation("小程序绑定手机号解密")
+    @SysLog(MODULE = "applet", REMARK = "小程序绑定手机号解密")
+    @PostMapping("getWxPhone")
+    public Object getWxPhone(@RequestParam String openid,
+                             @RequestParam String keyStr,
+                             @RequestParam String ivStr,
+                             @RequestParam String encDataStr) {
+        try {
+            String phone= memberService.getWxPhone(openid,keyStr,ivStr,encDataStr);
+            if (phone!=null){
+                return  new CommonResult().success(phone);
+            }else{
+                return new CommonResult().failed("获取失败");
+            }
+        } catch (Exception e) {
+            return new CommonResult().failed(e.getMessage());
+        }
+    }
 
     /**
      * 小程序主页
@@ -167,10 +200,10 @@ public class AppletMemberController extends ApiBaseAction {
                 bannerList = JsonUtils.jsonToList(bannerJson, SmsHomeAdvertise.class);
             }
             if (bannerJson == null || bannerList.size() <= 0) {
-                queryT.setType(2);
+
                 bannerList = advertiseService.list(new QueryWrapper<>(queryT));
                 redisService.set(Rediskey.appletBannerKey + "2", JsonUtils.objectToJson(bannerList));
-                redisService.expire(Rediskey.appletBannerKey + "2", 24);
+                redisService.expire(Rediskey.appletBannerKey + "2", 60);
             }
             //获取轮播结束
             //获取分类
@@ -193,163 +226,136 @@ public class AppletMemberController extends ApiBaseAction {
             nav_icon_list.add(c8);
             //获取分类结束
             //获取秒杀活动商品
-            //查询当前在线秒杀活动
-            HomeFlashPromotion homeFlashPromotion = null;
-            HomeFlashPromotion tempsmsFlashList = new HomeFlashPromotion();
-//            String smsFlashPromotionProductJson = redisService.get(Rediskey.appletsmsFlashPromotionProductKey);
-//            if(smsFlashPromotionProductJson!=null){
-//                homeFlashPromotion = JsonUtils.jsonToList(smsFlashPromotionProductJson,SmsFlashPromotionProducts.class);
-//            }
-//            if(smsFlashPromotionProductJson==null||homeFlashPromotion.size()<=0){
-            SmsFlashPromotion queryS = new SmsFlashPromotion();
-            queryS.setIsIndex(1);
-            SmsFlashPromotion indexFlashPromotion = smsFlashPromotionService.getOne(new QueryWrapper<>(queryS));
-            Long flashPromotionId = 0L;
-            //数据库中有当前秒杀活动时赋值
-            if (indexFlashPromotion != null) {
-                flashPromotionId = indexFlashPromotion.getId();
-            }
-            //首页秒杀活动数据
-
-            //根据时间计算当前点档
-            Date now = new Date();
-            String formatNow = DateFormatUtils.format(now, "HH:mm:ss");
-
-
-//            }
-            //获取秒杀活动结束
-            //获取首页分类商品列表
-            List<CateProduct> cateProductList = null;
-            List<CateProduct> temp = new ArrayList<>();
-            String cateProductJson = redisService.get(Rediskey.appletCateProductsKey);
-            if (cateProductJson != null) {
-                cateProductList = JsonUtils.jsonToList(cateProductJson, CateProduct.class);
-            }
-            if (cateProductJson == null || cateProductList.size() <= 0) {
-                PmsProductCategory queryP = new PmsProductCategory();
-                queryP.setIndexStatus(1);
-                List<PmsProductCategory> pmsProductCategoryList = pmsProductCategoryService.list(new QueryWrapper<>(queryP));
-                if (pmsProductCategoryList.size() > 0) {
-                    for (PmsProductCategory item : pmsProductCategoryList) {
-                        PmsProduct queryProduct = new PmsProduct();
-                        queryProduct.setProductCategoryId(item.getId());
-                        List<PmsProduct> pmsProductList = pmsProductService.list(new QueryWrapper<>(queryProduct));//商品列表
-                        List<HomeProductAttr> temphomeProductattr = new ArrayList<>();
-
-                        for (PmsProduct pmsProduct : pmsProductList
-                                ) {
-                            HomeProductAttr productAttr = new HomeProductAttr();
-                            productAttr.setId(pmsProduct.getId());
-                            productAttr.setProductName(pmsProduct.getName());
-                            productAttr.setProductImg(pmsProduct.getPic());
-                            productAttr.setProductPrice(pmsProduct.getPrice() != null ? pmsProduct.getPrice() : BigDecimal.ZERO);
-                            temphomeProductattr.add(productAttr);
-                        }
-
-                        CateProduct cateProduct = new CateProduct();
-                        cateProduct.setCategoryId(item.getId());
-                        cateProduct.setCategoryName(item.getName());
-                        cateProduct.setCategoryImage(item.getIcon());
-                        cateProduct.setPmsProductList(temphomeProductattr);
-                        //存入分类+商品对象vo
-                        temp.add(cateProduct);
-                    }
-                    cateProductList = temp;
-                    redisService.set(Rediskey.appletCateProductsKey, JsonUtils.objectToJson(cateProductList));
-                    redisService.expire(Rediskey.appletCateProductsKey, 24 * 60 * 60);
-                }
-            }
-
-            //获取首页分类商品列表结束
 
-            //获取热门商品列表
-            List<HomeProductAttr> hot_productList = null;
-            String hotProductJson = redisService.get(Rediskey.appletHotProductsKey);
-            if (hotProductJson != null) {
-                hot_productList = JsonUtils.jsonToList(hotProductJson, HomeProductAttr.class);
-            }
-            if (hotProductJson == null || hot_productList.size() <= 0) {
-                hot_productList = smsHomeRecommendProductMapper.queryList();
-                if (hot_productList != null) {
-                    redisService.set(Rediskey.appletHotProductsKey, JsonUtils.objectToJson(hot_productList));
-                    redisService.expire(Rediskey.appletHotProductsKey, 24 * 60 * 60);
-                }
-            }
 
-            //获取热门商品列表结束
-            //获取首页新品列表
-            List<HomeProductAttr> new_productList = null;
-            String newProductJson = redisService.get(Rediskey.appletNewProductsKey);
-            if (newProductJson != null) {
-                new_productList = JsonUtils.jsonToList(newProductJson, HomeProductAttr.class);
-            }
-            if (newProductJson == null || new_productList.size() <= 0) {
-                new_productList = smsHomeNewProductMapper.queryList();
-                if (new_productList != null) {
-                    redisService.set(Rediskey.appletNewProductsKey, JsonUtils.objectToJson(new_productList));
-                    redisService.expire(Rediskey.appletNewProductsKey, 24 * 60 * 60);
-                }
-            }
-            //获取首页新品列表结束
-            //品牌推荐列表开始
-
-            //品牌推荐列表结束
-            //获取优惠券
-            List<SmsCoupon> couponList = new ArrayList<>();
-            couponList = couponService.selectNotRecive();
-            //获取优惠券结束
-            List<PmsProductAttributeCategory> productAttributeCategoryList = null;
-            String catJson = redisService.get(Rediskey.appletCategoryKey);
-            if (catJson != null) {
-                productAttributeCategoryList = JsonUtils.jsonToList(catJson, PmsProductAttributeCategory.class);
-            } else {
-                productAttributeCategoryList = productAttributeCategoryService.list(new QueryWrapper<>());
-                for (PmsProductAttributeCategory gt : productAttributeCategoryList) {
-                    PmsProduct productQueryParam = new PmsProduct();
-                    productQueryParam.setProductAttributeCategoryId(gt.getId());
-                    productQueryParam.setPublishStatus(1);
-                    productQueryParam.setVerifyStatus(1);
-                    gt.setGoodsList(pmsProductService.list(new QueryWrapper<>(productQueryParam)));
-                }
-                redisService.set(Rediskey.appletCategoryKey, JsonUtils.objectToJson(productAttributeCategoryList));
-                redisService.expire(Rediskey.appletCategoryKey, 24 * 60 * 60);
-            }
-            List<CmsSubject> subjectList = subjectService.list(new QueryWrapper<CmsSubject>().select(ConstansValue.sampleSubjectList));
-            data.setSubjectList(subjectList);
             data.setCat_goods_cols(2);
-            data.setCat_list(productAttributeCategoryList);
             data.setNav_icon_list(nav_icon_list);
             data.setBanner_list(bannerList);
-            data.setCoupon_list(couponList);
-            data.setHomeFlashPromotion(homeFlashPromotion);
-            data.setCate_products(cateProductList);
-            data.setHot_products(hot_productList);
-            data.setNew_products(new_productList);
             data.setModule_list(model_list);
-//            List<SmsRedPacket> redPacketList = redPacketService.list(new QueryWrapper<>());
-//            SmsUserRedPacket userRedPacket = new SmsUserRedPacket();
-//            userRedPacket.setUserId(memberService.getNewCurrentMember().getId());
-//            List<SmsUserRedPacket> list = userRedPacketService.list(new QueryWrapper<>(userRedPacket));
-//            for(SmsRedPacket vo : redPacketList){
-//                if (list!=null && list.size()>0){
-//                    for (SmsUserRedPacket vo1 : list){
-//                        if(vo.getId().equals(vo1.getRedPacketId())){
-//                            vo.setStatus(1);
-//                            vo.setReciveAmount(vo1.getAmount());
-//                            break;
-//                        }
-//                    }
-//                }
-//            }
-//            data.setRedPacketList(redPacketList);
+
             return new CommonResult().success(data);
         } catch (Exception e) {
             e.printStackTrace();
-            return new CommonResult().failed();
+            return new CommonResult().failed(e.getMessage());
         }
 
     }
 
+    @IgnoreAuth
+    @SysLog(MODULE = "applet", REMARK = "小程序首页")
+    @ApiOperation("小程序首页")
+    @GetMapping("/index1")
+    public Object index1() {
+
+        IndexData data = new IndexData();
+        //获取首页分类商品列表
+       /* List<CateProduct> cateProductList = null;
+        List<CateProduct> temp = new ArrayList<>();
+        String cateProductJson = redisService.get(Rediskey.appletCateProductsKey);
+        if (cateProductJson != null) {
+            cateProductList = JsonUtils.jsonToList(cateProductJson, CateProduct.class);
+        }
+        if (cateProductJson == null || cateProductList.size() <= 0) {
+            PmsProductCategory queryP = new PmsProductCategory();
+            queryP.setIndexStatus(1);
+            List<PmsProductCategory> pmsProductCategoryList = pmsProductCategoryService.list(new QueryWrapper<>(queryP));
+            if (pmsProductCategoryList.size() > 0) {
+                for (PmsProductCategory item : pmsProductCategoryList) {
+                    PmsProduct queryProduct = new PmsProduct();
+                    queryProduct.setProductCategoryId(item.getId());
+                    List<PmsProduct> pmsProductList = pmsProductService.list(new QueryWrapper<>(queryProduct));//商品列表
+                    List<HomeProductAttr> temphomeProductattr = new ArrayList<>();
+
+                    for (PmsProduct pmsProduct : pmsProductList
+                    ) {
+                        HomeProductAttr productAttr = new HomeProductAttr();
+                        productAttr.setId(pmsProduct.getId());
+                        productAttr.setProductName(pmsProduct.getName());
+                        productAttr.setProductImg(pmsProduct.getPic());
+                        productAttr.setProductPrice(pmsProduct.getPrice() != null ? pmsProduct.getPrice() : BigDecimal.ZERO);
+                        temphomeProductattr.add(productAttr);
+                    }
+
+                    CateProduct cateProduct = new CateProduct();
+                    cateProduct.setCategoryId(item.getId());
+                    cateProduct.setCategoryName(item.getName());
+                    cateProduct.setCategoryImage(item.getIcon());
+                    cateProduct.setPmsProductList(temphomeProductattr);
+                    //存入分类+商品对象vo
+                    temp.add(cateProduct);
+                }
+                cateProductList = temp;
+                redisService.set(Rediskey.appletCateProductsKey, JsonUtils.objectToJson(cateProductList));
+                redisService.expire(Rediskey.appletCateProductsKey, 60 );
+            }
+        }
+*/
+        //获取优惠券
+        List<SmsCoupon> couponList = new ArrayList<>();
+        couponList = couponService.selectNotRecive();
+        //获取优惠券结束
+        List<PmsProductAttributeCategory> productAttributeCategoryList = null;
+        String catJson = redisService.get(Rediskey.appletCategoryKey);
+        if (catJson != null) {
+            productAttributeCategoryList = JsonUtils.jsonToList(catJson, PmsProductAttributeCategory.class);
+        } else {
+            productAttributeCategoryList = productAttributeCategoryService.list(new QueryWrapper<>());
+            for (PmsProductAttributeCategory gt : productAttributeCategoryList) {
+                PmsProduct productQueryParam = new PmsProduct();
+                productQueryParam.setProductAttributeCategoryId(gt.getId());
+                productQueryParam.setPublishStatus(1);
+                productQueryParam.setVerifyStatus(1);
+                gt.setGoodsList(pmsProductService.list(new QueryWrapper<>(productQueryParam)));
+            }
+            redisService.set(Rediskey.appletCategoryKey, JsonUtils.objectToJson(productAttributeCategoryList));
+            redisService.expire(Rediskey.appletCategoryKey,  60);
+        }
+        List<CmsSubject> subjectList = subjectService.list(new QueryWrapper<CmsSubject>().select(ConstansValue.sampleSubjectList).last("limit 5"));
+        //获取轮播图
+        List<SmsHomeAdvertise> bannerList = null;
+        SmsHomeAdvertise queryT = new SmsHomeAdvertise();
+        String bannerJson = redisService.get(Rediskey.appletBannerKey + "2");
+        if (bannerJson != null) {
+            bannerList = JsonUtils.jsonToList(bannerJson, SmsHomeAdvertise.class);
+        }
+        if (bannerJson == null || bannerList.size() <= 0) {
+
+            bannerList = advertiseService.list(new QueryWrapper<>(queryT));
+            redisService.set(Rediskey.appletBannerKey + "2", JsonUtils.objectToJson(bannerList));
+            redisService.expire(Rediskey.appletBannerKey + "2", 60);
+        }
+        //获取轮播结束
+        //获取分类
+        List<TArticleDO> nav_icon_list = new ArrayList<>();
+        TArticleDO c1 = new TArticleDO("我的公告", "/pages/topic-list/topic-list", "navigate", "http://www.91weiyi.xyz/addons/zjhj_mall/core/web/uploads/image/86/863a7db352a936743faf8edd5162bb5c.png");
+        TArticleDO c2 = new TArticleDO("商品分类", "/pages/cat/cat", "switchTab", "http://www.91weiyi.xyz/addons/zjhj_mall/core/web/uploads/image/35/3570994c06e61b1f0cf719bdb52a0053.png");
+        TArticleDO c3 = new TArticleDO("购物车", "/pages/cart/cart", "switchTab", "http://www.91weiyi.xyz/addons/zjhj_mall/core/web/uploads/image/c2/c2b01cf78f79cbfba192d5896eeaecbe.png");
+        TArticleDO c4 = new TArticleDO("我的订单", "/pages/order/order?status=9", "navigate", "http://www.91weiyi.xyz/addons/zjhj_mall/core/web/uploads/image/7c/7c80acbbd479b099566cc6c3d34fbcb8.png");
+        TArticleDO c5 = new TArticleDO("用户中心", "/pages/user/user", "switchTab", "http://www.91weiyi.xyz/addons/zjhj_mall/core/web/uploads/image/46/46eabbff1e7dc5e416567fc45d4d5df3.png");
+        TArticleDO c6 = new TArticleDO("优惠劵", "/pages/coupon/coupon?status=0", "navigate", "http://www.91weiyi.xyz/addons/zjhj_mall/core/web/uploads/image/13/13312a6d56c202330f8c282d8cf84ada.png");
+        TArticleDO c7 = new TArticleDO("我的收藏", "/pages/favorite/favorite", "navigate", "http://www.91weiyi.xyz/addons/zjhj_mall/core/web/uploads/image/ca/cab6d8d4785e43bd46dcbb52ddf66f61.png");
+        TArticleDO c8 = new TArticleDO("售后订单", "/pages/order/order?status=4", "navigate", "http://www.91weiyi.xyz/addons/zjhj_mall/core/web/uploads/image/cf/cfb32a65d845b4e9a9778020ed2ccac6.png");
+        nav_icon_list.add(c1);
+        nav_icon_list.add(c2);
+        nav_icon_list.add(c3);
+        nav_icon_list.add(c4);
+        nav_icon_list.add(c5);
+        nav_icon_list.add(c6);
+        nav_icon_list.add(c7);
+        nav_icon_list.add(c8);
+        //获取分类结束
+        //获取秒杀活动商品
+
+
+        data.setCat_goods_cols(2);
+        data.setNav_icon_list(nav_icon_list);
+        data.setBanner_list(bannerList);
+        data.setSubjectList(subjectList);
+        data.setCat_list(productAttributeCategoryList);
+       // data.setCate_products(cateProductList);
+        data.setCoupon_list(couponList);
+        return new CommonResult().success(data);
+    }
     @IgnoreAuth
     @ApiOperation("小程序用户详情")
     @SysLog(MODULE = "applet", REMARK = "小程序用户详情")
@@ -368,22 +374,22 @@ public class AppletMemberController extends ApiBaseAction {
             int status5 = 0;
             OrderStatusCount count = new OrderStatusCount();
             for (OmsOrder consult : list) {
-                if (consult.getStatus() == 0) {
+                if (consult.getStatus() == OrderStatus.INIT.getValue()) {
                     status0++;
                 }
-                if (consult.getStatus() == 1) {
+                if (consult.getStatus() == OrderStatus.TO_DELIVER.getValue()) {
                     status1++;
                 }
-                if (consult.getStatus() == 2) {
+                if (consult.getStatus() == OrderStatus.DELIVERED.getValue()) {
                     status2++;
                 }
-                if (consult.getStatus() == 3) {
+                if (consult.getStatus() == OrderStatus.TO_COMMENT.getValue()) {
                     status2++;
                 }
-                if (consult.getStatus() == 4) {
+                if (consult.getStatus() == OrderStatus.TRADE_SUCCESS.getValue()) {
                     status4++;
                 }
-                if (consult.getStatus() == 5) {
+                if (consult.getStatus() == OrderStatus.CLOSED.getValue()) {
                     status5++;
                 }
             }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/controller/HomeController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/controller/HomeController.java
index 80201330edad668939a65d4e449801da3ade2909..176347c94282708ddb31edb1ca391cbf40687d0b 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/controller/HomeController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/controller/HomeController.java
@@ -63,7 +63,7 @@ public class HomeController {
     @SysLog(MODULE = "home", REMARK = "首页内容页信息展示")
     @RequestMapping(value = "/content", method = RequestMethod.GET)
     public Object content() {
-        List<UmsMember> log =  memberMapper.selectList(new QueryWrapper<UmsMember>().ne("id",2).last("limit 5"));
+        List<UmsMember> log = memberMapper.selectList(new QueryWrapper<UmsMember>().ne("id", 2).last("limit 5"));
 
         HomeContentResult contentResult = null;
         String bannerJson = redisService.get(Rediskey.HomeContentResult);
@@ -151,8 +151,7 @@ public class HomeController {
     @RequestMapping(value = "/navList", method = RequestMethod.GET)
     @ApiOperation(value = "获取导航栏")
     public Object getNavList() {
-
-        return new CommonResult().success(null);
+        return new CommonResult().success(advertiseService.getNav());
     }
 
 
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/controller/UmsMemberController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/controller/UmsMemberController.java
index bd55bcc03ee59247dcd10a99c869300dfc93da9b..2fe601e64dfae49c4fe53f7556c5c7f01727ec21 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/controller/UmsMemberController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/controller/UmsMemberController.java
@@ -116,5 +116,4 @@ public class UmsMemberController extends ApiBaseAction {
     }
 
 
-
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/controller/UmsMemberCouponController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/controller/UmsMemberCouponController.java
index a09f371978ff5256f5c847824d79eb4d4334e8a7..34efb244c3c3b69d23afe15b8716136b7dd30cdd 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/controller/UmsMemberCouponController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/controller/UmsMemberCouponController.java
@@ -84,5 +84,4 @@ public class UmsMemberCouponController {
     }
 
 
-
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/controller/UmsMemberReceiveAddressController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/controller/UmsMemberReceiveAddressController.java
index 5d659052fbb9beb1f36722c7b592eb447af62b9a..c06a4b83f17faa14a7dba67dd41e7133c4f8199f 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/controller/UmsMemberReceiveAddressController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/controller/UmsMemberReceiveAddressController.java
@@ -52,7 +52,7 @@ public class UmsMemberReceiveAddressController {
     public Object update(UmsMemberReceiveAddress address) {
         boolean count = false;
         address.setMemberId(memberService.getNewCurrentMember().getId());
-        if (address.getDefaultStatus()==1){
+        if (address.getDefaultStatus() == 1) {
             addressMapper.updateStatusByMember(address.getMemberId());
         }
         if (address != null && address.getId() != null) {
@@ -63,7 +63,8 @@ public class UmsMemberReceiveAddressController {
         if (count) {
             return new CommonResult().success(count);
         }
-        return new CommonResult().failed();    }
+        return new CommonResult().failed();
+    }
 
     @IgnoreAuth
     @ApiOperation("显示所有收货地址")
@@ -72,7 +73,7 @@ public class UmsMemberReceiveAddressController {
     public Object list() {
         UmsMember umsMember = memberService.getNewCurrentMember();
         if (umsMember != null && umsMember.getId() != null) {
-            List<UmsMemberReceiveAddress> addressList = memberReceiveAddressService.list(new QueryWrapper<UmsMemberReceiveAddress>().eq("member_id",umsMember.getId()));
+            List<UmsMemberReceiveAddress> addressList = memberReceiveAddressService.list(new QueryWrapper<UmsMemberReceiveAddress>().eq("member_id", umsMember.getId()));
             return new CommonResult().success(addressList);
         }
         return new ArrayList<UmsMemberReceiveAddress>();
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/IOmsCartItemService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/IOmsCartItemService.java
index 473a5eb79ec9c1a98e43d697f30a2a04218d1100..76cbfbb81ef78f27adc3b9d6019bf1a671b9c12b 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/IOmsCartItemService.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/IOmsCartItemService.java
@@ -3,7 +3,6 @@ package com.zscat.mallplus.oms.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zscat.mallplus.oms.entity.OmsCartItem;
 import com.zscat.mallplus.oms.vo.CartProduct;
-import com.zscat.mallplus.oms.vo.StoreCart;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -70,5 +69,5 @@ public interface IOmsCartItemService extends IService<OmsCartItem> {
     Integer countCart(Long id);
 
     Map<String, List<OmsCartItem>> listStoreCart(Long id);
-  //  List<StoreCart> listStoreCart(Long id);
+    //  List<StoreCart> listStoreCart(Long id);
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/IOmsOrderService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/IOmsOrderService.java
index b1df514ca690e4713f8d1577694891710e7e434e..3717aad7d28a9bd9b5b8e07cb50ee9d103ddf12d 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/IOmsOrderService.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/IOmsOrderService.java
@@ -3,7 +3,6 @@ package com.zscat.mallplus.oms.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zscat.mallplus.oms.entity.OmsOrder;
 import com.zscat.mallplus.oms.vo.*;
-import com.zscat.mallplus.ums.entity.UmsMember;
 import com.zscat.mallplus.utils.CommonResult;
 import com.zscat.mallplus.vo.CartParam;
 import org.springframework.transaction.annotation.Transactional;
@@ -49,6 +48,7 @@ public interface IOmsOrderService extends IService<OmsOrder> {
 
     /**
      * 预览订单
+     *
      * @param orderParam
      * @return
      */
@@ -56,6 +56,7 @@ public interface IOmsOrderService extends IService<OmsOrder> {
 
     /**
      * 多店铺预览订单
+     *
      * @param orderParam
      * @return
      */
@@ -63,6 +64,7 @@ public interface IOmsOrderService extends IService<OmsOrder> {
 
     /**
      * pc 支付
+     *
      * @param tbThanks
      * @return
      */
@@ -70,6 +72,7 @@ public interface IOmsOrderService extends IService<OmsOrder> {
 
     /**
      * 添加购物车
+     *
      * @param cartParam
      * @return
      */
@@ -77,13 +80,15 @@ public interface IOmsOrderService extends IService<OmsOrder> {
 
     /**
      * 开团
+     *
      * @param orderParam
      * @return
      */
-    ConfirmOrderResult addGroup(OrderParam orderParam);
+    Object addGroup(OrderParam orderParam);
 
     /**
      * 参团
+     *
      * @param orderParam
      * @return
      */
@@ -91,6 +96,7 @@ public interface IOmsOrderService extends IService<OmsOrder> {
 
     /**
      * 积分兑换
+     *
      * @param payParam
      * @return
      */
@@ -98,6 +104,7 @@ public interface IOmsOrderService extends IService<OmsOrder> {
 
     /**
      * 关闭订单
+     *
      * @param newE
      * @return
      */
@@ -105,12 +112,14 @@ public interface IOmsOrderService extends IService<OmsOrder> {
 
     /**
      * 释放库存和销量
+     *
      * @param newE
      */
     void releaseStock(OmsOrder newE);
 
     /**
      * 取消发货
+     *
      * @param order
      * @param remark
      * @return
@@ -119,6 +128,7 @@ public interface IOmsOrderService extends IService<OmsOrder> {
 
     /**
      * 确认收货
+     *
      * @param id
      * @return
      */
@@ -126,13 +136,17 @@ public interface IOmsOrderService extends IService<OmsOrder> {
 
     /**
      * 余额支付
+     *
      * @param order
      * @return
      */
     OmsOrder blancePay(OmsOrder order);
 
+    OmsOrder blancePay(PayParam payParam);
+
     /**
      * 团购商品订单预览
+     *
      * @param orderParam
      * @return
      */
@@ -140,6 +154,7 @@ public interface IOmsOrderService extends IService<OmsOrder> {
 
     /**
      * 申请退款
+     *
      * @param id
      * @return
      */
@@ -147,9 +162,17 @@ public interface IOmsOrderService extends IService<OmsOrder> {
 
     /**
      * 订单评论
+     *
      * @param orderId
      * @param items
      * @return
      */
     Object orderComment(Long orderId, String items);
+
+    CommonResult generateStoreOrder(OrderParam orderParam);
+
+    Object applyRe(String items);
+
+
+    Object quitGroup(Long id);
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsCartItemServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsCartItemServiceImpl.java
index 21b939fedcaa1a27ddec22a8a951a19756f01300..3e0dbb3d238e9fbb8329207bbd4cf0880b91c725 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsCartItemServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsCartItemServiceImpl.java
@@ -8,7 +8,6 @@ import com.zscat.mallplus.oms.mapper.OmsCartItemMapper;
 import com.zscat.mallplus.oms.service.IOmsCartItemService;
 import com.zscat.mallplus.oms.vo.CartProduct;
 import com.zscat.mallplus.oms.vo.CartPromotionItem;
-import com.zscat.mallplus.oms.vo.StoreCart;
 import com.zscat.mallplus.pms.entity.PmsProduct;
 import com.zscat.mallplus.pms.entity.PmsProductFullReduction;
 import com.zscat.mallplus.pms.entity.PmsProductLadder;
@@ -123,7 +122,7 @@ public class OmsCartItemServiceImpl extends ServiceImpl<OmsCartItemMapper, OmsCa
         List<OmsCartItem> cartItemList = list(memberId, ids);
         List<CartPromotionItem> cartPromotionItemList = new ArrayList<>();
         if (!CollectionUtils.isEmpty(cartItemList)) {
-         //   cartPromotionItemList = this.calcCartPromotion(cartItemList);
+            //   cartPromotionItemList = this.calcCartPromotion(cartItemList);
         }
         return cartItemList;
     }
@@ -162,7 +161,7 @@ public class OmsCartItemServiceImpl extends ServiceImpl<OmsCartItemMapper, OmsCa
 
     @Override
     public int clear(Long memberId) {
-        return cartItemMapper.delete(new QueryWrapper<OmsCartItem>().eq("member_id",memberId));
+        return cartItemMapper.delete(new QueryWrapper<OmsCartItem>().eq("member_id", memberId));
     }
 
     @Override
@@ -195,7 +194,7 @@ public class OmsCartItemServiceImpl extends ServiceImpl<OmsCartItemMapper, OmsCa
 
     @Override
     public List<OmsCartItem> calcCartPromotion(List<OmsCartItem> cartItemList) {
-        if (cartItemList==null && cartItemList.size()<1){
+        if (cartItemList == null && cartItemList.size() < 1) {
             throw new ApiMallPlusException("订单已提交");
         }
 
@@ -257,9 +256,9 @@ public class OmsCartItemServiceImpl extends ServiceImpl<OmsCartItemMapper, OmsCa
             cartPromotionItem.setPromotionMessage("无优惠");
             cartPromotionItem.setReduceAmount(new BigDecimal(0));
             PmsSkuStock skuStock = getOriginalPrice(promotionProduct, item.getProductSkuId());
-            if (ValidatorUtils.notEmpty(skuStock)){
+            if (ValidatorUtils.notEmpty(skuStock)) {
                 cartPromotionItem.setRealStock(skuStock.getStock() - skuStock.getLockStock());
-            }else{
+            } else {
                 PmsProduct pmsProduct = pmsProductMapper.selectById(item.getProductId());
                 cartPromotionItem.setRealStock(pmsProduct.getStock());
             }
@@ -369,17 +368,17 @@ public class OmsCartItemServiceImpl extends ServiceImpl<OmsCartItemMapper, OmsCa
     }
 
     @Override
-    public Integer countCart(Long id){
+    public Integer countCart(Long id) {
         return cartItemMapper.countCart(id);
     }
 
     @Override
     public Map<String, List<OmsCartItem>> listStoreCart(Long id) {
-        List<OmsCartItem> list = cartItemMapper.selectList(new QueryWrapper<OmsCartItem>().eq("member_id",id));
-        for (OmsCartItem item : list){
-            if (ValidatorUtils.notEmpty(item.getProductSkuId())){
+        List<OmsCartItem> list = cartItemMapper.selectList(new QueryWrapper<OmsCartItem>().eq("member_id", id));
+        for (OmsCartItem item : list) {
+            if (ValidatorUtils.notEmpty(item.getProductSkuId())) {
                 item.setSkuStock(pmsSkuStockService.getById(item.getProductSkuId()));
-            }else {
+            } else {
                 item.setProduct(pmsProductMapper.selectById(item.getProductId()));
             }
         }
@@ -393,7 +392,7 @@ public class OmsCartItemServiceImpl extends ServiceImpl<OmsCartItemMapper, OmsCa
             storeCartList.add(storeCart);
         }*/
 
-        return  map;
+        return map;
 
     }
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
index ea341d38f4ed3586b5b9704a8c8d2f3761dfaba1..7b0136ed68246694a038dfa24d484eadbb48c164 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
@@ -8,6 +8,7 @@ import com.zscat.mallplus.exception.ApiMallPlusException;
 import com.zscat.mallplus.oms.entity.*;
 import com.zscat.mallplus.oms.mapper.OmsCartItemMapper;
 import com.zscat.mallplus.oms.mapper.OmsOrderMapper;
+import com.zscat.mallplus.oms.mapper.OmsOrderReturnApplyMapper;
 import com.zscat.mallplus.oms.mapper.OmsOrderSettingMapper;
 import com.zscat.mallplus.oms.service.IOmsCartItemService;
 import com.zscat.mallplus.oms.service.IOmsOrderItemService;
@@ -26,6 +27,7 @@ import com.zscat.mallplus.pms.vo.ProductConsultParam;
 import com.zscat.mallplus.sms.entity.*;
 import com.zscat.mallplus.sms.mapper.SmsGroupMapper;
 import com.zscat.mallplus.sms.mapper.SmsGroupMemberMapper;
+import com.zscat.mallplus.sms.mapper.SmsGroupRecordMapper;
 import com.zscat.mallplus.sms.service.*;
 import com.zscat.mallplus.sms.vo.SmsCouponHistoryDetail;
 import com.zscat.mallplus.ums.entity.*;
@@ -42,6 +44,7 @@ import com.zscat.mallplus.util.applet.TemplateData;
 import com.zscat.mallplus.util.applet.WX_TemplateMsgUtil;
 import com.zscat.mallplus.utils.CommonResult;
 import com.zscat.mallplus.utils.ValidatorUtils;
+import com.zscat.mallplus.vo.ApplyRefundVo;
 import com.zscat.mallplus.vo.CartParam;
 import com.zscat.mallplus.vo.Rediskey;
 import lombok.extern.slf4j.Slf4j;
@@ -107,6 +110,8 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
     private ISmsCouponHistoryService couponHistoryService;
     @Resource
     private IOmsOrderService orderService;
+    @Resource
+    private SmsGroupRecordMapper groupRecordMapper;
     @Autowired
     private IPmsProductConsultService pmsProductConsultService;
     @Resource
@@ -166,9 +171,6 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         if (orderMapper.updateById(tbOrder) != 1) {
             throw new ApiMallPlusException("更新订单失败");
         }
-        if (tbOrder.getPid()==null){
-            orderService.update(tbOrder,new QueryWrapper<OmsOrder>().eq("pid",tbOrder.getId()));
-        }
         //恢复所有下单商品的锁定库存，扣减真实库存
         OmsOrderItem queryO = new OmsOrderItem();
         queryO.setOrderId(tbThanks.getOrderId());
@@ -228,6 +230,9 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
                 result.setCartPromotionItemList(list);
                 //获取用户收货地址列表
                 UmsMemberReceiveAddress queryU = new UmsMemberReceiveAddress();
+                if (currentMember==null){
+                    return new CommonResult().fail(100);
+                }
                 queryU.setMemberId(currentMember.getId());
                 List<UmsMemberReceiveAddress> memberReceiveAddressList = addressService.list(new QueryWrapper<>(queryU));
                 result.setMemberReceiveAddressList(memberReceiveAddressList);
@@ -386,7 +391,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         }
 
         //计算总金额、活动优惠、应付金额
-        if (newCartList != null && newCartList.size() > 0) {
+        if (list != null && list.size() > 0) {
             ConfirmOrderResult.CalcAmount calcAmount = calcCartAmount(newCartList, transFee, BigDecimal.ZERO);
             result.setCalcAmount(calcAmount);
             result.setAddress(address);
@@ -428,7 +433,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         }
         BigDecimal totalPayAmount=BigDecimal.ZERO;
         Map<Integer, List<OmsCartItem>> map = null;
-                //list.stream().collect(Collectors.groupingBy(OmsCartItem::getStoreId));
+        //list.stream().collect(Collectors.groupingBy(OmsCartItem::getStoreId));
         if (map.size() > 1) {
             for (Map.Entry<Integer, List<OmsCartItem>> entry : map.entrySet()) {
                 List<OmsCartItem> subList = entry.getValue();
@@ -491,6 +496,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
 
     }
 
+
     @Override
     public CommonResult generateOrder(OrderParam orderParam) {
         if (ValidatorUtils.empty(orderParam.getTotal())) {
@@ -498,21 +504,23 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         }
         String type = orderParam.getType();
         UmsMember currentMember = memberService.getNewCurrentMember();
-
+        OmsOrder order = new OmsOrder();
         // 1. 获取购物车商品
         List<OmsCartItem> cartPromotionItemList = new ArrayList<>();
-
+        StopWatch stopWatch = new StopWatch("下单orderType=" + orderParam.getOrderType());
+        stopWatch.start("1. 获取购物车商品");
         if (ValidatorUtils.empty(orderParam.getAddressId())) {
             return new CommonResult().failed("address is null");
         }
         //团购订单
+        SmsGroupActivity smsGroupActivity = null;
         if (orderParam.getOrderType() == 3) {
-            SmsGroupActivity smsGroupActivity = smsGroupActivityService.getById(orderParam.getGroupActivityId());
+            smsGroupActivity = smsGroupActivityService.getById(orderParam.getGroupActivityId());
             if (ValidatorUtils.notEmpty(smsGroupActivity.getGoodsIds())) {
                 List<PmsProduct> productList = (List<PmsProduct>) productService.listByIds(
                         Arrays.asList(smsGroupActivity.getGoodsIds().split(",")).stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()));
                 if (productList != null && productList.size() > 0) {
-                  //  order.setFreightAmount(smsGroupActivity.getTransfee());
+                    order.setFreightAmount(smsGroupActivity.getTransfee());
                     //获取购物车信息
                     cartPromotionItemList = goodsToCartList(productList);
                 }
@@ -541,38 +549,6 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
                     resultList.add(Long.valueOf(s));
                 }
                 cartPromotionItemList = cartItemService.listPromotion(currentMember.getId(), resultList);
-                if (cartPromotionItemList == null || cartPromotionItemList.size() < 1) {
-                    throw new ApiMallPlusException("没有下单的商品！");
-                }
-
-                BookOrder bookOrder1 = new BookOrder(orderParam, currentMember,  cartPromotionItemList,null,false).invoke();
-                if (bookOrder1.is())
-                    return new CommonResult().failed("没有下单的商品");
-
-
-
-                OmsOrder pidOrder = bookOrder1.order;
-                List<OmsOrderItem> orderItemList = bookOrder1.orderItemList;
-                Long pid = pidOrder.getId();
-                String name = bookOrder1.getName();
-                Map<String, Object> result = new HashMap<>();
-
-
-                if (ValidatorUtils.empty(orderParam.getFormId())) {
-                    push(currentMember, pidOrder, orderParam.getPage(), orderParam.getFormId(), name);
-                }
-                Map<Integer, List<OmsCartItem>> map = null;
-                        //cartPromotionItemList.stream().collect(Collectors.groupingBy(OmsCartItem::getStoreId));
-                if (map.size() > 1) {
-                    for (Map.Entry<Integer, List<OmsCartItem>> entry : map.entrySet()) {
-                        BookOrder bookOrder = new BookOrder(orderParam, currentMember,  entry.getValue(),pid,true).invoke();
-                        if (bookOrder.is())
-                            return new CommonResult().failed("没有下单的商品");
-                    }
-                }
-                result.put("order", pidOrder);
-                result.put("orderItemList", orderItemList);
-                return new CommonResult().success("下单成功", result);
             } else if ("6".equals(type)) { // 秒杀
                 SmsFlashPromotionProductRelation relation = smsFlashPromotionProductRelationService.getById(orderParam.getSkillId());
                 PmsProduct product = productService.getById(relation.getProductId());
@@ -593,28 +569,199 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
                 cartPromotionItemList.add(omsCartItem);
             }
         }
+        stopWatch.stop();
+        if (cartPromotionItemList == null || cartPromotionItemList.size() < 1) {
+            return new CommonResult().failed("没有下单的商品");
+        }
+        List<OmsOrderItem> orderItemList = new ArrayList<>();
+        //获取购物车及优惠信息
+        String name = "";
+        BigDecimal transFee = BigDecimal.ZERO;
+        List<OmsCartItem> newCartItemList = new ArrayList<>();
+        Integer isFirst = 1;
+        stopWatch.start("2. 校验商品库存，舍弃商品不存或没有库存 计算运费");
+        // 2. 校验商品库存，舍弃商品不存或没有库存 计算运费
+        for (OmsCartItem cartPromotionItem : cartPromotionItemList) {
+            boolean flag = false;
+            PmsProduct goods = productService.getById(cartPromotionItem.getProductId());
+            if (!ValidatorUtils.empty(cartPromotionItem.getProductSkuId()) && cartPromotionItem.getProductSkuId() > 0) {
+                if (goods != null && goods.getId() != null && goods.getStock() > 0 && goods.getStock() > cartPromotionItem.getQuantity()) {
+                    PmsSkuStock skuStock = skuStockMapper.selectById(cartPromotionItem.getProductSkuId());
+                    if (skuStock.getStock() > 0 && skuStock.getStock() >= cartPromotionItem.getQuantity()) {
+                        flag = true;
+                    }
+                }
+            } else {
+                if (goods != null && goods.getId() != null && goods.getStock() > 0 && goods.getStock() >= cartPromotionItem.getQuantity()) {
+                    flag = true;
+                }
+            }
+            if (flag) {
+                if (goods.getTransfee().compareTo(transFee) > 0) {
+                    transFee = goods.getTransfee();
+                }
+                //生成下单商品信息
+                OmsOrderItem orderItem = createOrderItem(cartPromotionItem);
+                orderItem.setType(AllEnum.OrderItemType.GOODS.code());
+                orderItemList.add(orderItem);
+                if (isFirst == 1) {
+                    name = cartPromotionItem.getProductName();
+                    order.setGoodsId(cartPromotionItem.getProductId());
+                    order.setGoodsName(cartPromotionItem.getProductName());
+                }
 
-        BookOrder bookOrder = new BookOrder(orderParam, currentMember,  cartPromotionItemList,null,false).invoke();
-        if (bookOrder.is())
+                newCartItemList.add(cartPromotionItem);
+            }
+        }
+        if (newCartItemList == null || newCartItemList.size() < 1) {
             return new CommonResult().failed("没有下单的商品");
-        List<OmsOrderItem> orderItemList = bookOrder.getOrderItemList();
-        OmsOrder order = bookOrder.order;
-        String name = bookOrder.getName();
+        }
+
+        //3.计算优惠券
+        SmsCouponHistory couponHistory = new SmsCouponHistory();
+        SmsCoupon coupon = null;
+        if (orderParam.getCouponId() != null) {
+         //   couponHistory = couponHistoryService.getById(orderParam.getMemberCouponId());
+            coupon = couponService.getById(orderParam.getCouponId());
+        }
+        UmsMemberReceiveAddress address = addressService.getById(orderParam.getAddressId());
+        //根据商品合计、运费、活动优惠、优惠券、积分计算应付金额
+
+        createOrderObj(order, orderParam, currentMember, orderItemList, address);
+        if (smsGroupActivity != null) {
+            order.setTotalAmount(smsGroupActivity.getPrice());
+        }
+        if (orderParam.getOrderType() != 3) {
+            order.setFreightAmount(transFee);
+        }
+        if (orderParam.getCouponId() == null || orderParam.getCouponId() == 0) {
+            order.setCouponAmount(new BigDecimal(0));
+        } else {
+            order.setCouponId(orderParam.getCouponId());
+            order.setCouponAmount(coupon.getAmount());
+        }
+        //获取积分使用规则
+       /* UmsIntegrationConsumeSetting integrationConsumeSetting = integrationConsumeSettingMapper.selectOne(new QueryWrapper<>());
+
+        if (integrationConsumeSetting!=null && currentMember.getIntegration()>0){
+            order.setUseIntegration(currentMember.getIntegration()*integrationConsumeSetting.getMaxPercentPerOrder()/100);
+            order.setIntegrationAmount(BigDecimal.valueOf((currentMember.getIntegration()*integrationConsumeSetting.getMaxPercentPerOrder()/100/integrationConsumeSetting.getDeductionPerAmount())));
+        }*/
+        CartMarkingVo vo = new CartMarkingVo();
+        vo.setCartList(newCartItemList);
+        SmsBasicMarking basicMarking = basicMarkingService.matchOrderBasicMarking(vo);
+        log.info("basicMarking=" + com.alibaba.fastjson.JSONObject.toJSONString(basicMarking));
+        if (basicMarking != null) {
+            order.setPromotionAmount(basicMarking.getMinAmount());
+        }
+        order.setPayAmount(calcPayAmount(order));
+        if (order.getPayAmount().compareTo(BigDecimal.ZERO) < 0) {
+            order.setPayAmount(new BigDecimal("0.01"));
+        }
+        stopWatch.stop();
+
+        stopWatch.start("3.计算赠品营销");
+        if (ValidatorUtils.notEmpty(orderParam.getBasicGiftsVar())) {
+            String[] basicGiftsList = orderParam.getBasicGiftsVar().split("@");
+            if (basicGiftsList != null && basicGiftsList.length > 0) {
+                for (String basicGifts : basicGiftsList) {
+                    if (ValidatorUtils.notEmpty(basicGifts)) {
+                        String[] beanKv = basicGifts.split(":");
+                        if (beanKv != null && beanKv.length > 1) {
+                            String[] ids = beanKv[1].split(",");
+                            if (ids != null && ids.length > 0) {
+                                for (String id : ids) {
+                                    PmsGifts pmsGifts = pmsGiftsService.getById(id);
+                                    if (pmsGifts != null) {
+                                        OmsOrderItem orderItem = new OmsOrderItem();
+                                        orderItem.setOrderSn(beanKv[0]);
+                                        orderItem.setProductId(pmsGifts.getId());
+                                        orderItem.setProductName(pmsGifts.getTitle());
+                                        orderItem.setProductPic(pmsGifts.getIcon());
+                                        orderItem.setProductPrice(pmsGifts.getPrice());
+                                        orderItem.setProductQuantity(1);
+                                        orderItem.setType(AllEnum.OrderItemType.GIFT.code());
+
+                                        orderItemList.add(orderItem);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        stopWatch.stop();
+        stopWatch.start("4.计算优惠券 插入订单");
+        // TODO: 2018/9/3 bill_*,delivery_*
+        //插入order表和order_item表
+        orderService.save(order);
+        for (OmsOrderItem orderItem : orderItemList) {
+            orderItem.setOrderId(order.getId());
+            orderItem.setOrderSn(order.getOrderSn());
+            if (ValidatorUtils.notEmpty(orderParam.getSkillId())) {
+                orderItem.setGiftIntegration(orderParam.getSkillId().intValue());
+            }
+        }
+        orderItemService.saveBatch(orderItemList);
+        //如使用优惠券更新优惠券使用状态
+        if (orderParam.getCouponId() != null && orderParam.getCouponId() > 0) {
+            couponHistory.setId(orderParam.getMemberCouponId());
+            couponHistory.setUseStatus(1);
+            couponHistory.setUseTime(new Date());
+            couponHistory.setOrderId(order.getId());
+            couponHistory.setOrderSn(order.getOrderSn());
+            couponHistoryService.updateById(couponHistory);
+        }
+        OmsOrderOperateHistory history = new OmsOrderOperateHistory();
+        history.setOrderId(order.getId());
+        history.setCreateTime(new Date());
+        history.setOperateMan("shop");
+        history.setPreStatus(-1);
+        history.setOrderStatus(OrderStatus.INIT.getValue());
+        history.setNote("创建订单");
+        orderOperateHistoryService.save(history);
+        stopWatch.stop();
+        //如使用积分需要扣除积分
+        if (order.getUseIntegration() != null) {
+            memberService.updateIntegration(currentMember.getId(), currentMember.getIntegration() - order.getUseIntegration());
+        }
+        stopWatch.start("5.锁库存 删除购物车");
+        lockStockByOrder(orderItemList, type);
+        //删除购物车中的下单商品
+        deleteCartItemList(cartPromotionItemList, currentMember);
         Map<String, Object> result = new HashMap<>();
         result.put("order", order);
         result.put("orderItemList", orderItemList);
-
+        stopWatch.stop();
         if (ValidatorUtils.empty(orderParam.getFormId())) {
+            stopWatch.start("5.小程序推送消息");
             push(currentMember, order, orderParam.getPage(), orderParam.getFormId(), name);
+            stopWatch.stop();
         }
-
+        log.info(stopWatch.prettyPrint());
         return new CommonResult().success("下单成功", result);
     }
 
+    @Override
+    public Object quitGroup(Long id){
+        groupMemberMapper.deleteById(id);
+
+        return new CommonResult().success("下单成功");
+    }
+
     @Override
     public CommonResult acceptGroup(OrderParam orderParam) {
+        if (orderParam.getGroupType() == 2) {
+
+        }
         OmsOrder order = new OmsOrder();
+
         UmsMember currentMember = memberService.getNewCurrentMember();
+        if (currentMember==null){
+            return new CommonResult().fail(100);
+        }
         List<OmsCartItem> list = new ArrayList<>();
         if (ValidatorUtils.empty(orderParam.getTotal())) {
             orderParam.setTotal(1);
@@ -643,7 +790,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         //根据商品合计、运费、活动优惠、优惠券、积分计算应付金额
         UmsMemberReceiveAddress address = addressService.getById(orderParam.getAddressId());
         createOrderObj(order, orderParam, currentMember, orderItemList, address);
-        order.setMemberId(memberService.getNewCurrentMember().getId());
+        order.setMemberId(currentMember.getId());
         SmsGroup group = groupMapper.getByGoodsId(orderParam.getGoodsId());
         Date endTime = DateUtils.convertStringToDate(DateUtils.addHours(group.getEndTime(), group.getHours()), "yyyy-MM-dd HH:mm:ss");
 
@@ -653,36 +800,44 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         Long nowT = System.currentTimeMillis();
         if (nowT > group.getStartTime().getTime() && nowT < endTime.getTime()) {
             SmsGroupMember groupMember = new SmsGroupMember();
-            if (orderParam.getGroupType() == 1) {
-                groupMember.setMainId(memberService.getNewCurrentMember().getId());
+            SmsGroupRecord groupRecord = new SmsGroupRecord();
+            if (orderParam.getGroupType() == 1) { // 1 发起拼团 2 参与拼团
+                groupRecord.setCreateTime(new Date());
+                groupRecord.setGroupId(group.getId());
+                groupRecord.setStatus("1");
+                groupRecordMapper.insert(groupRecord);
+
                 groupMember.setGoodsId(orderParam.getGoodsId());
-                SmsGroupMember exist = groupMemberMapper.selectOne(new QueryWrapper<>(groupMember));
-                if (exist != null) {
-                    return new CommonResult().failed("你已经参加过此活动");
-                }
-                groupMember.setName(currentMember.getIcon());
-                groupMember.setStatus(2);
+                groupMember.setName(currentMember.getNickname());
+                groupMember.setMemberId(currentMember.getId());
+                groupMember.setPic(currentMember.getIcon());
+                groupMember.setStatus(1);
                 groupMember.setOrderId(order.getId() + "");
-                groupMember.setMainId(memberService.getNewCurrentMember().getId());
                 groupMember.setCreateTime(new Date());
-                groupMember.setGroupId(group.getId());
-
-                groupMember.setMemberId(memberService.getNewCurrentMember().getId() + "");
-                groupMember.setExipreTime(System.currentTimeMillis() + (group.getHours() * 60 * 60 * 60));
+                groupMember.setGroupRecordId(groupRecord.getId());
                 groupMemberMapper.insert(groupMember);
             } else {
-                groupMember = groupMemberMapper.selectById(orderParam.getMgId());
-                String[] mids = groupMember.getMemberId().split(",");
-                for (int i = 0; i < mids.length; i++) {
-                    if (memberService.getNewCurrentMember().getId().toString().equals(mids[i])) {
-                        return new CommonResult().failed("你已经参加过此活动");
+                List<SmsGroupMember> list1 = groupMemberMapper.selectList(new QueryWrapper<SmsGroupMember>().eq("group_record_id",orderParam.getMgId()));
+                if (list1!=null && list1.size()>group.getMaxPeople()){
+                    return new CommonResult().failed("此拼团已达最大人数");
+                }
+                for (SmsGroupMember smsGroupMember : list1){
+                    if (smsGroupMember.getMemberId().equals(currentMember.getId())){
+                        return new CommonResult().failed("你已经参加过此团");
                     }
                 }
-                groupMember.setName(groupMember.getName() + "," + currentMember.getIcon());
-                groupMember.setOrderId(groupMember.getOrderId() + "," + order.getId());
-                groupMember.setMemberId(groupMember.getMemberId() + "," + order.getMemberId());
-                groupMemberMapper.updateById(groupMember);
+                groupMember.setGoodsId(orderParam.getGoodsId());
+                groupMember.setName(currentMember.getNickname());
+                groupMember.setMemberId(currentMember.getId());
+                groupMember.setPic(currentMember.getIcon());
+                groupMember.setStatus(1);
+                groupMember.setOrderId(order.getId() + "");
+                groupMember.setCreateTime(new Date());
+                groupMember.setGroupRecordId(orderParam.getMgId());
+                groupMemberMapper.insert(groupMember);
             }
+            order.setGroupId(groupMember.getId());
+            orderMapper.updateById(order);
         } else {
             return new CommonResult().failed("活动已经结束");
         }
@@ -690,6 +845,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
             orderItem.setOrderId(order.getId());
             orderItem.setOrderSn(order.getOrderSn());
         }
+
         orderItemService.saveBatch(orderItemList);
         //如使用优惠券更新优惠券使用状态
         if (orderParam.getCouponId() != null) {
@@ -941,30 +1097,78 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
 
     @Transactional
     @Override
-    public OmsOrder blancePay(OmsOrder order) {
+    public OmsOrder blancePay(PayParam payParam){
+        OmsOrder order = orderMapper.selectById(payParam.getOrderId());
         UmsMember userDO = memberService.getNewCurrentMember();
+        if (order.getPayAmount().compareTo(userDO.getBlance()) > 0) {
+            throw new ApiMallPlusException("余额不足！");
+        }
         order.setStatus(OrderStatus.TO_DELIVER.getValue());
         order.setPayType(AllEnum.OrderPayType.balancePay.code());
         order.setPaymentTime(new Date());
+        orderService.updateById(order);
+        if (ValidatorUtils.notEmpty(order.getGroupId())) {
+            SmsGroupMember member= new SmsGroupMember();
+            member.setId(order.getGroupId());
+            member.setStatus(2);
+            groupMemberMapper.updateById(member);
+
+            SmsGroupMember groupMember = groupMemberMapper.selectById(order.getGroupId());
+            SmsGroupRecord groupRecord = groupRecordMapper.selectById(groupMember.getGroupRecordId());
+            SmsGroup group = groupMapper.selectById(groupRecord.getGroupId());
+
+                List<SmsGroupMember> groupMembers = groupMemberMapper.selectList(new QueryWrapper<SmsGroupMember>().eq("group_record_id", groupRecord.getId()).eq("status",2));
+                groupRecord.setList(groupMembers);
+                if (groupMembers!=null && groupMembers.size()==group.getMaxPeople()){
+                    groupRecord.setStatus("2");
+                    groupRecordMapper.updateById(groupRecord);
+                }
 
-        if (order.getPid()==null){
-            OmsOrder neworder = new OmsOrder();
-            neworder.setStatus(OrderStatus.TO_DELIVER.getValue());
-            neworder.setPayType(AllEnum.OrderPayType.balancePay.code());
-            neworder.setPaymentTime(new Date());
-            orderService.update(neworder,new QueryWrapper<OmsOrder>().eq("pid",order.getId()));
         }
+        if (order.getPayAmount().compareTo(BigDecimal.ZERO) < 0) {
+            order.setPayAmount(new BigDecimal("0.01"));
+        }
+        userDO.setBlance(userDO.getBlance().subtract(order.getPayAmount()));
+        memberService.updateById(userDO);
+        UmsMemberBlanceLog blog = new UmsMemberBlanceLog();
+        blog.setMemberId(userDO.getId());
+        blog.setCreateTime(new Date());
+        blog.setNote("支付订单：" + order.getId());
+        blog.setPrice(order.getPayAmount());
+        blog.setType(1);
+        memberBlanceLogService.save(blog);
+        OmsOrderOperateHistory history = new OmsOrderOperateHistory();
+        history.setOrderId(order.getId());
+        history.setCreateTime(new Date());
+        history.setOperateMan("shop");
+        history.setPreStatus(OrderStatus.INIT.getValue());
+        history.setOrderStatus(OrderStatus.TO_DELIVER.getValue());
+        history.setNote("余额支付");
+        orderOperateHistoryService.save(history);
+        memberService.addIntegration(userDO.getId(), order.getPayAmount().multiply(new BigDecimal("0.1")).intValue(), 1, "余额支付添加积分", AllEnum.ChangeSource.order.code(), userDO.getUsername());
+
+        return order;
+    }
+    @Transactional
+    @Override
+    public OmsOrder blancePay(OmsOrder order) {
+        UmsMember userDO = memberService.getNewCurrentMember();
+        if (order.getPayAmount().compareTo(userDO.getBlance()) > 0) {
+            throw new ApiMallPlusException("余额不足！");
+        }
+        order.setStatus(OrderStatus.TO_DELIVER.getValue());
+        order.setPayType(AllEnum.OrderPayType.balancePay.code());
+        order.setPaymentTime(new Date());
+        orderService.updateById(order);
         if (ValidatorUtils.notEmpty(order.getGroupId())) {
-            SmsGroup group = new SmsGroup();
-            group.setId(order.getGroupId());
-            group.setPeoples(group.getPeoples() - 1);
-            groupMapper.updateById(group);
+            SmsGroupMember member= new SmsGroupMember();
+            member.setId(order.getGroupId());
+            member.setStatus(2);
+            groupMemberMapper.updateById(member);
         }
         if (order.getPayAmount().compareTo(BigDecimal.ZERO) < 0) {
             order.setPayAmount(new BigDecimal("0.01"));
         }
-        orderService.updateById(order);
-
         userDO.setBlance(userDO.getBlance().subtract(order.getPayAmount()));
         memberService.updateById(userDO);
         UmsMemberBlanceLog blog = new UmsMemberBlanceLog();
@@ -972,7 +1176,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         blog.setCreateTime(new Date());
         blog.setNote("支付订单：" + order.getId());
         blog.setPrice(order.getPayAmount());
-        blog.setType(AllEnum.BlanceType.CONSUMER.code());
+        blog.setType(1);
         memberBlanceLogService.save(blog);
         OmsOrderOperateHistory history = new OmsOrderOperateHistory();
         history.setOrderId(order.getId());
@@ -1647,7 +1851,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
 
 
     @Override
-    public ConfirmOrderResult addGroup(OrderParam orderParam) {
+    public Object addGroup(OrderParam orderParam) {
         List<OmsCartItem> list = new ArrayList<>();
         if (ValidatorUtils.empty(orderParam.getTotal())) {
             orderParam.setTotal(1);
@@ -1673,6 +1877,9 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         result.setCartPromotionItemList(newCartList);
         //获取用户收货地址列表
         UmsMemberReceiveAddress queryU = new UmsMemberReceiveAddress();
+        if (memberService.getNewCurrentMember()==null){
+            return new CommonResult().fail(100);
+        }
         queryU.setMemberId(memberService.getNewCurrentMember().getId());
         List<UmsMemberReceiveAddress> memberReceiveAddressList = addressService.list(new QueryWrapper<>(queryU));
         result.setMemberReceiveAddressList(memberReceiveAddressList);
@@ -1681,6 +1888,10 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         List<SmsCouponHistoryDetail> couponHistoryDetailList = couponService.listCart(newCartList, 1);
         result.setCouponHistoryDetailList(couponHistoryDetailList);
         UmsMember member = memberService.getById(memberService.getNewCurrentMember().getId());
+        if(member==null){
+            return new CommonResult().fail(100);
+        }
+
         //获取用户积分
         result.setMemberIntegration(member.getIntegration());
         //获取积分使用规则
@@ -1726,7 +1937,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
                 cartItem.setProductCategoryId(pmsProduct.getProductCategoryId());
                 cartItem.setProductBrand(pmsProduct.getBrandName());
                 cartItem.setCreateDate(new Date());
-                cartItem.setStoreId(pmsProduct.getStoreId());
+                //   cartItem.setStoreId(pmsProduct.getStoreId());
                 cartItem.setStoreName(pmsProduct.getStoreName());
                 cartItemMapper.insert(cartItem);
             } else {
@@ -1751,7 +1962,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
                 cartItem.setMemberId(memberService.getNewCurrentMember().getId());
                 cartItem.setProductCategoryId(pmsProduct.getProductCategoryId());
                 cartItem.setProductBrand(pmsProduct.getBrandName());
-                cartItem.setStoreId(pmsProduct.getStoreId());
+                //  cartItem.setStoreId(pmsProduct.getStoreId());
                 cartItem.setStoreName(pmsProduct.getStoreName());
                 cartItemMapper.insert(cartItem);
             } else {
@@ -1782,6 +1993,164 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
             throw new ApiMallPlusException("库存不足!");
         }
     }
+    @Override
+    public CommonResult generateStoreOrder(OrderParam orderParam) {
+        if (ValidatorUtils.empty(orderParam.getTotal())) {
+            orderParam.setTotal(1);
+        }
+        String type = orderParam.getType();
+        UmsMember currentMember = memberService.getNewCurrentMember();
+
+        // 1. 获取购物车商品
+        List<OmsCartItem> cartPromotionItemList = new ArrayList<>();
+
+        if (ValidatorUtils.empty(orderParam.getAddressId())) {
+            return new CommonResult().failed("address is null");
+        }
+        //团购订单
+        if (orderParam.getOrderType() == 3) {
+            SmsGroupActivity smsGroupActivity = smsGroupActivityService.getById(orderParam.getGroupActivityId());
+            if (ValidatorUtils.notEmpty(smsGroupActivity.getGoodsIds())) {
+                List<PmsProduct> productList = (List<PmsProduct>) productService.listByIds(
+                        Arrays.asList(smsGroupActivity.getGoodsIds().split(",")).stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()));
+                if (productList != null && productList.size() > 0) {
+                    //  order.setFreightAmount(smsGroupActivity.getTransfee());
+                    //获取购物车信息
+                    cartPromotionItemList = goodsToCartList(productList);
+                }
+            }
+        } else {
+            if ("3".equals(type)) { // 1 商品详情 2 勾选购物车 3全部购物车的商品
+                cartPromotionItemList = cartItemService.listPromotion(currentMember.getId(), null);
+            }
+            if ("1".equals(type)) {
+                Long cartId = Long.valueOf(orderParam.getCartId());
+                OmsCartItem omsCartItem = cartItemService.selectById(cartId);
+                List<OmsCartItem> list = new ArrayList<>();
+                if (omsCartItem != null) {
+                    list.add(omsCartItem);
+                } else {
+                    throw new ApiMallPlusException("订单已提交");
+                }
+                if (!CollectionUtils.isEmpty(list)) {
+                    cartPromotionItemList = cartItemService.calcCartPromotion(list);
+                }
+            } else if ("2".equals(type)) {
+                String cart_id_list1 = orderParam.getCartIds();
+                String[] ids1 = cart_id_list1.split(",");
+                List<Long> resultList = new ArrayList<>(ids1.length);
+                for (String s : ids1) {
+                    resultList.add(Long.valueOf(s));
+                }
+                cartPromotionItemList = cartItemService.listPromotion(currentMember.getId(), resultList);
+                if (cartPromotionItemList == null || cartPromotionItemList.size() < 1) {
+                    throw new ApiMallPlusException("没有下单的商品！");
+                }
+
+                BookOrder bookOrder1 = new BookOrder(orderParam, currentMember,  cartPromotionItemList,null,false).invoke();
+                if (bookOrder1.is())
+                    return new CommonResult().failed("没有下单的商品");
+
+
+
+                OmsOrder pidOrder = bookOrder1.order;
+                List<OmsOrderItem> orderItemList = bookOrder1.orderItemList;
+                Long pid = pidOrder.getId();
+                String name = bookOrder1.getName();
+                Map<String, Object> result = new HashMap<>();
+
+
+                if (ValidatorUtils.empty(orderParam.getFormId())) {
+                    push(currentMember, pidOrder, orderParam.getPage(), orderParam.getFormId(), name);
+                }
+                Map<Integer, List<OmsCartItem>> map = null;
+                //cartPromotionItemList.stream().collect(Collectors.groupingBy(OmsCartItem::getStoreId));
+                if (map.size() > 1) {
+                    for (Map.Entry<Integer, List<OmsCartItem>> entry : map.entrySet()) {
+                        BookOrder bookOrder = new BookOrder(orderParam, currentMember,  entry.getValue(),pid,true).invoke();
+                        if (bookOrder.is())
+                            return new CommonResult().failed("没有下单的商品");
+                    }
+                }
+                result.put("order", pidOrder);
+                result.put("orderItemList", orderItemList);
+                return new CommonResult().success("下单成功", result);
+            } else if ("6".equals(type)) { // 秒杀
+                SmsFlashPromotionProductRelation relation = smsFlashPromotionProductRelationService.getById(orderParam.getSkillId());
+                PmsProduct product = productService.getById(relation.getProductId());
+                OmsCartItem omsCartItem = new OmsCartItem();
+                omsCartItem.setQuantity(orderParam.getTotal());
+                if (orderParam.getTotal() > relation.getFlashPromotionLimit()) {
+                    throw new ApiMallPlusException("超过秒杀个数！");
+                }
+                omsCartItem.setPrice(relation.getFlashPromotionPrice());
+                omsCartItem.setProductBrand(product.getBrandId() + "");
+                omsCartItem.setProductCategoryId(product.getProductCategoryId());
+                omsCartItem.setProductName(product.getName());
+                omsCartItem.setProductPic(product.getPic());
+                omsCartItem.setProductId(product.getId());
+                omsCartItem.setChecked(1);
+                omsCartItem.setProductSn(product.getProductSn());
+
+                cartPromotionItemList.add(omsCartItem);
+            }
+        }
+
+        BookOrder bookOrder = new BookOrder(orderParam, currentMember,  cartPromotionItemList,null,false).invoke();
+        if (bookOrder.is())
+            return new CommonResult().failed("没有下单的商品");
+        List<OmsOrderItem> orderItemList = bookOrder.getOrderItemList();
+        OmsOrder order = bookOrder.order;
+        String name = bookOrder.getName();
+        Map<String, Object> result = new HashMap<>();
+        result.put("order", order);
+        result.put("orderItemList", orderItemList);
+
+        if (ValidatorUtils.empty(orderParam.getFormId())) {
+            push(currentMember, order, orderParam.getPage(), orderParam.getFormId(), name);
+        }
+
+        return new CommonResult().success("下单成功", result);
+    }
+
+    @Resource
+    private OmsOrderReturnApplyMapper orderReturnApplyMapper;
+    @Override
+    public Object applyRe(String items) {
+        ApplyRefundVo itemss = JsonUtils.fromJson(items, ApplyRefundVo.class);
+
+        try {
+            OmsOrderItem item = orderItemService.getById(itemss.getItemId());
+            OmsOrderReturnApply apply = new OmsOrderReturnApply();
+            UmsMember member= memberService.getNewCurrentMember();
+            apply.setStatus(1);
+            apply.setCreateTime(new Date());
+            apply.setReturnAmount(item.getRealAmount());
+            apply.setDescription(itemss.getDesc());
+            apply.setOrderId(item.getOrderId());
+            apply.setMemberUsername(member.getUsername());
+            apply.setProductAttr(item.getProductAttr());
+            apply.setProductCount(item.getProductQuantity());
+            apply.setProductId(item.getProductId());
+            apply.setProductName(item.getProductName());
+            apply.setProductPic(item.getProductPic());
+            apply.setProductPrice(item.getProductPrice());
+            apply.setProductRealPrice(item.getRealAmount());
+            apply.setProofPics(org.apache.commons.lang3.StringUtils.join(itemss.getImages(), ","));
+            apply.setReason(itemss.getDesc());
+            apply.setReturnPhone(member.getPhone());
+            apply.setReturnName(member.getNickname());
+            orderReturnApplyMapper.insert(apply);
+            /*OmsOrderOperateHistory history = updateOrderInfo(id, order, OrderStatus.REFUNDING);
+            history.setOrderStatus(OrderStatus.REFUNDING.getValue());
+            history.setNote("申请退款");
+            orderOperateHistoryService.save(history);*/
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return new CommonResult().success();
+    }
 
     private class BookOrder {
         private Long pid;
@@ -1856,7 +2225,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
                     orderItem.setType(AllEnum.OrderItemType.GOODS.code());
                     orderItemList.add(orderItem);
                     if (isFirst == 1) {
-                       // storeId = cartPromotionItem.getStoreId();
+                        // storeId = cartPromotionItem.getStoreId();
                         storeName = cartPromotionItem.getStoreName();
                         name = cartPromotionItem.getProductName();
                         order.setGoodsId(cartPromotionItem.getProductId());
@@ -1945,14 +2314,14 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
                 order.setPid(pid);
             }
             if (flagStore){
-               // order.setStoreId(storeId);
+                // order.setStoreId(storeId);
                 order.setStoreName(storeName);
             }
             //插入order表和order_item表
             orderService.save(order);
             for (OmsOrderItem orderItem : orderItemList) {
                 if (flagStore){
-              //      orderItem.setStoreId(storeId);
+                    //      orderItem.setStoreId(storeId);
                 }
                 orderItem.setOrderId(order.getId());
                 orderItem.setOrderSn(order.getOrderSn());
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/WechatApiService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/WechatApiService.java
index 84866dfa526c24fc0def1636f90cd1c9995990dd..e50d01254b7b75277777dc88448a25dc53bade93 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/WechatApiService.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/WechatApiService.java
@@ -1,6 +1,10 @@
 package com.zscat.mallplus.oms.service.impl;
 
-import com.zscat.mallplus.config.WxAppletProperties;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zscat.mallplus.exception.ApiMallPlusException;
+import com.zscat.mallplus.ums.entity.SysAppletSet;
+import com.zscat.mallplus.ums.mapper.SysAppletSetMapper;
 import com.zscat.mallplus.util.JedisLock;
 import com.zscat.mallplus.util.JsonUtils;
 import com.zscat.mallplus.util.MyX509TrustManager;
@@ -44,8 +48,9 @@ public class WechatApiService {
     private static final String WECHAT_API_TOKEN = WECHAT_API + "/token";
     private static final String WECHAT_API_TICKET = WECHAT_API + "/ticket/getticket?type=jsapi&access_token=";
     private final HttpClient httpclient;
+
     @Resource
-    private WxAppletProperties wxAppletProperties;
+    private SysAppletSetMapper appletSetMapper;
     private Jedis jedis;
     @Resource
     private JedisPool jedisPool;
@@ -127,7 +132,11 @@ public class WechatApiService {
      * @throws Exception
      */
     public String getAccessToken() throws Exception {
-        return getAccessToken(wxAppletProperties.getAppId(), wxAppletProperties.getSecret());
+        SysAppletSet appletSet = appletSetMapper.selectOne(new QueryWrapper<>());
+        if (null == appletSet) {
+            throw new ApiMallPlusException("没有设置支付配置");
+        }
+        return getAccessToken(appletSet.getAppid(), appletSet.getAppsecret());
     }
 
     /**
@@ -191,8 +200,11 @@ public class WechatApiService {
      */
 
     public String getJsTicket() throws Exception {
-
-        return getJsTicket(wxAppletProperties.getAppId(), wxAppletProperties.getSecret());
+        SysAppletSet appletSet = appletSetMapper.selectOne(new QueryWrapper<>());
+        if (null == appletSet) {
+            throw new ApiMallPlusException("没有设置支付配置");
+        }
+        return getJsTicket(appletSet.getAppid(), appletSet.getAppsecret());
     }
 
 
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/Test.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/Test.java
deleted file mode 100644
index 70852a230476b57b8b344d80819a1fe17d9a40a5..0000000000000000000000000000000000000000
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/Test.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.zscat.mallplus.pay;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-public class Test {
-
-    public static void main(String[] args) throws  Exception{
-        String host = "https://goexpress.market.alicloudapi.com";       //【1】请求地址  支持http 和 https 及 WEBSOCKET
-        String path = "/goexpress";                                     //【2】后缀
-        String appcode = "436e99b5b81044698cbaf100d164aa63";                             //【3】AppCode  你自己的AppCode 在买家中心查看
-        String no = "780098068058";                                     //【4】参数，具体参照api接口参数
-        String type = "zto";                                            //【5】参数，具体参照api接口参数
-        String urlSend = host + path + "?no=" + no + "&type=" + type;   //【6】拼接请求链接
-        /*【1】 ~ 【6】 需要修改为对应的 可以参考产品详情 */
-        URL url = new URL(urlSend);
-        HttpURLConnection httpURLConnection = (HttpURLConnection) url.openConnection();
-        httpURLConnection.setRequestProperty("Authorization", "APPCODE " + appcode);//格式Authorization:APPCODE (中间是英文空格)
-        int httpCode = httpURLConnection.getResponseCode();
-        String json = read(httpURLConnection.getInputStream());
-        System.out.println("/* 获取服务器响应状态码 200 正常；400 权限错误 ； 403 次数用完； */ ");
-        System.out.println(httpCode);
-        System.out.println("/* 获取返回的json   */ ");
-        System.out.print(json);
-    }
-    /*
-        读取返回结果
-     */
-    private static String read(InputStream is) throws IOException {
-        StringBuffer sb = new StringBuffer();
-        BufferedReader br = new BufferedReader(new InputStreamReader(is));
-        String line = null;
-        while ((line = br.readLine()) != null) {
-            line = new String(line.getBytes(), "utf-8");
-            sb.append(line);
-        }
-        br.close();
-        return sb.toString();
-    }
-}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/config/EnjoyConfig.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/config/EnjoyConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..09d127e8fa954b3bac08dbec867e2f585fb056ef
--- /dev/null
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/config/EnjoyConfig.java
@@ -0,0 +1,29 @@
+package com.zscat.mallplus.pay.config;
+
+import com.jfinal.template.ext.spring.JFinalViewResolver;
+import com.jfinal.template.source.ClassPathSourceFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+
+@Configuration
+public class EnjoyConfig {
+    @Bean(name = "jfinalViewResolver")
+    public JFinalViewResolver getJFinalViewResolver() {
+        JFinalViewResolver jfr = new JFinalViewResolver();
+        // setDevMode 配置放在最前面
+        jfr.setDevMode(true);
+
+        // 使用 ClassPathSourceFactory 从 class path 与 jar 包中加载模板文件
+        jfr.setSourceFactory(new ClassPathSourceFactory());
+
+        // 在使用 ClassPathSourceFactory 时要使用 setBaseTemplatePath
+        // 代替 jfr.setPrefix("/view/")
+        JFinalViewResolver.engine.setBaseTemplatePath("/view/");
+
+        //jfr.setSuffix(".html");
+        jfr.setContentType("text/html;charset=UTF-8");
+        jfr.setOrder(0);
+        return jfr;
+    }
+}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/config/ErrorPageConfig.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/config/ErrorPageConfig.java
deleted file mode 100644
index 3b38c8d2d3db6c8796c57887ea3196333a7b6c01..0000000000000000000000000000000000000000
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/config/ErrorPageConfig.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.zscat.mallplus.pay.config;
-
-import org.springframework.boot.web.server.ErrorPage;
-import org.springframework.boot.web.server.ErrorPageRegistrar;
-import org.springframework.boot.web.server.ErrorPageRegistry;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ErrorPageConfig implements ErrorPageRegistrar{
-
-	@Override
-	public void registerErrorPages(ErrorPageRegistry registry) {
-		ErrorPage error401Page = new ErrorPage(HttpStatus.UNAUTHORIZED, "/static/error/401.html");
-		ErrorPage error404Page = new ErrorPage(HttpStatus.NOT_FOUND, "/static/error/404.html");
-		ErrorPage error500Page = new ErrorPage(HttpStatus.INTERNAL_SERVER_ERROR, "/static/error/500.html");
-		registry.addErrorPages(error401Page,error404Page,error500Page);
-	}
-
-}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/config/IJPayConfigurer.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/config/IJPayConfigurer.java
new file mode 100644
index 0000000000000000000000000000000000000000..2ff94d68dba747b25408e0d7bdbec35407677aa1
--- /dev/null
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/config/IJPayConfigurer.java
@@ -0,0 +1,69 @@
+package com.zscat.mallplus.pay.config;
+
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.support.config.FastJsonConfig;
+import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
+
+@Configuration
+public class IJPayConfigurer extends WebMvcConfigurationSupport {
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+       /* registry.addInterceptor(new AliPayInterceptor()).addPathPatterns("/api/aliPay/**");
+        registry.addInterceptor(new WxPayInterceptor()).addPathPatterns("/api/wxPay/**");*/
+        super.addInterceptors(registry);
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        // 将所有/static/** 访问都映射到classpath:/static/ 目录下
+        registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
+    }
+
+    @Override
+    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+        super.configureMessageConverters(converters);
+
+        FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter();
+        FastJsonConfig config = new FastJsonConfig();
+        config.setSerializerFeatures(
+
+                SerializerFeature.WriteMapNullValue, // 保留map空的字段
+
+                SerializerFeature.WriteNullStringAsEmpty, // 将String类型的null转成""
+
+                SerializerFeature.WriteNullNumberAsZero, // 将Number类型的null转成0
+
+                SerializerFeature.WriteNullListAsEmpty, // 将List类型的null转成[]
+
+                SerializerFeature.WriteNullBooleanAsFalse, // 将Boolean类型的null转成false
+
+                SerializerFeature.DisableCircularReferenceDetect);// 避免循环引用
+
+        converter.setFastJsonConfig(config);
+        converter.setDefaultCharset(Charset.forName("UTF-8"));
+        List<MediaType> mediaTypeList = new ArrayList<>();
+        // 解决中文乱码问题，相当于在Controller上的@RequestMapping中加了个属性produces = "application/json"
+        mediaTypeList.add(MediaType.APPLICATION_JSON);
+        converter.setSupportedMediaTypes(mediaTypeList);
+        converters.add(converter);
+
+        converters.add(responseBodyConverter());
+    }
+
+    @Bean
+    public HttpMessageConverter<String> responseBodyConverter() {
+        return new StringHttpMessageConverter(Charset.forName("UTF-8"));
+    }
+}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/config/StartupRunner.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/config/StartupRunner.java
index 9dc95a50708834e5498fb53eb0b1b85e31bbdeab..a5874d421fdaa7ec20c023f759416b29cd602f80 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/config/StartupRunner.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/config/StartupRunner.java
@@ -1,6 +1,8 @@
 package com.zscat.mallplus.pay.config;
 
-import com.jpay.unionpay.SDKConfig;
+import com.zscat.mallplus.core.kit.HttpKit;
+import com.zscat.mallplus.pay.custom.OkHttpKit;
+import com.zscat.mallplus.unionpay.SDKConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.CommandLineRunner;
@@ -8,12 +10,15 @@ import org.springframework.core.annotation.Order;
 
 @Order(1)
 public class StartupRunner implements CommandLineRunner {
-	private static final Logger logger = LoggerFactory.getLogger(StartupRunner.class);
-	@Override
-	public void run(String... args) throws Exception {
-		 logger.info("startup runner");
-		 //银联加载配置
-		 SDKConfig.getConfig().loadPropertiesFromSrc();// 从classpath加载acp_sdk.properties文件
-	}
+    private static final Logger logger = LoggerFactory.getLogger(StartupRunner.class);
+
+    @Override
+    public void run(String... args) throws Exception {
+        logger.info("startup runner");
+        // 银联加载配置
+        SDKConfig.getConfig().loadPropertiesFromSrc();// 从classpath加载acp_sdk.properties文件
+        // 自定义 Http 客户端
+        HttpKit.setDelegate(new OkHttpKit());
+    }
 
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/config/TaskRunner.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/config/TaskRunner.java
deleted file mode 100644
index 6f3a51848eaf303111c5fb2c3d09c2bb2771c14a..0000000000000000000000000000000000000000
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/config/TaskRunner.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.zscat.mallplus.pay.config;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.core.Ordered;
-
-public class TaskRunner implements ApplicationRunner, Ordered {
-    private static final Logger logger = LoggerFactory.getLogger(TaskRunner.class);
-	@Override
-	public int getOrder() {
-		return 3;
-	}
-
-	@Override
-	public void run(ApplicationArguments args) throws Exception {
-        logger.info("task runner");
-	}
-
-}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/config/WebMvcConfigurer.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/config/WebMvcConfigurer.java
deleted file mode 100644
index c3e6e29f47f6a1d0eac5a0523922a6909ec97cc7..0000000000000000000000000000000000000000
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/config/WebMvcConfigurer.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.zscat.mallplus.pay.config;
-
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.alibaba.fastjson.support.config.FastJsonConfig;
-import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
-import com.zscat.mallplus.pay.interceptor.AliPayInterceptor;
-import com.zscat.mallplus.pay.interceptor.CharacterEncodInterceptor;
-import com.zscat.mallplus.pay.interceptor.WxPayInterceptor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.MediaType;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
-
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-
-
-@Configuration
-public class WebMvcConfigurer extends WebMvcConfigurationSupport {
-	@Override
-	public void addInterceptors(InterceptorRegistry registry) {
-		registry.addInterceptor(new AliPayInterceptor()).addPathPatterns("/alipay/**");
-		registry.addInterceptor(new WxPayInterceptor()).addPathPatterns("/wxpay/**", "/wxsubpay/**");
-		registry.addInterceptor(new CharacterEncodInterceptor()).addPathPatterns("/unionpay/**");
-		super.addInterceptors(registry);
-	}
-
-	@Override
-	public void addResourceHandlers(ResourceHandlerRegistry registry) {
-		// 将所有/static/** 访问都映射到classpath:/static/ 目录下
-		registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
-	}
-
-	@Override
-	public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-		super.configureMessageConverters(converters);
-
-		FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter();
-		FastJsonConfig config = new FastJsonConfig();
-		config.setSerializerFeatures(
-
-				SerializerFeature.WriteMapNullValue, // 保留map空的字段
-
-				SerializerFeature.WriteNullStringAsEmpty, // 将String类型的null转成""
-
-				SerializerFeature.WriteNullNumberAsZero, // 将Number类型的null转成0
-
-				SerializerFeature.WriteNullListAsEmpty, // 将List类型的null转成[]
-
-				SerializerFeature.WriteNullBooleanAsFalse, // 将Boolean类型的null转成false
-
-				SerializerFeature.DisableCircularReferenceDetect);// 避免循环引用
-
-		converter.setFastJsonConfig(config);
-		converter.setDefaultCharset(Charset.forName("UTF-8"));
-		List<MediaType> mediaTypeList = new ArrayList<MediaType>();
-		// 解决中文乱码问题，相当于在Controller上的@RequestMapping中加了个属性produces = "application/json"
-		mediaTypeList.add(MediaType.APPLICATION_JSON);
-		converter.setSupportedMediaTypes(mediaTypeList);
-		converters.add(converter);
-
-		converters.add(responseBodyConverter());
-	}
-
-	@Bean
-	public HttpMessageConverter<String> responseBodyConverter() {
-		StringHttpMessageConverter converter = new StringHttpMessageConverter(Charset.forName("UTF-8"));
-		return converter;
-	}
-}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/IndexController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/IndexController.java
index 3b149b93dc321b3ecf49c22618c6582e69977b22..e117f2011214e82b149284a2c75a112982d06513 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/IndexController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/IndexController.java
@@ -2,80 +2,84 @@ package com.zscat.mallplus.pay.controller;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-
-@RestController
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * @author Javen
+ */
+@Controller
 public class IndexController {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @RequestMapping("")
-    @ResponseBody
-    public String index(){
-	    	logger.info("欢迎使用IJPay -By Javen <br/><br>  交流群：895616401");
-	    	return "欢迎使用IJPay -By Javen <br/><br>  交流群：895616401";
+    public String index() {
+        logger.error("欢迎使用 IJPay -By Javen  交流群：723992875");
+        return "index.html";
     }
 
     @RequestMapping("/toWxH5Pay")
-    public String toWxH5Pay(){
-		return "wxh5pay.html";
-	}
-
-    @RequestMapping("/towxpay")
-    public String towxpay() {
-		return "wxpay.html";
-	}
-    @RequestMapping("/towxsubpay")
-	public String towxsubpay() {
-		return "wxsubpay.html";
-	}
-
+    public String toWxH5Pay() {
+        return "wxh5pay.html";
+    }
 
+    @RequestMapping("/toWxPay")
+    public String toWxPay() {
+        return "wxpay.html";
+    }
 
-    @RequestMapping(value = "/pay_input_money")
-    public ModelAndView pay_input_money(){
-    	 ModelAndView mav = new ModelAndView("pay_input_money.html");
-         mav.addObject("content", "xxx");
-         return mav;
+    @RequestMapping("/toWxSuPay")
+    public String toWxSuPay() {
+        return "wxsubpay.html";
     }
 
-    @RequestMapping(value = "/pay_keyboard")
-    public String pay_keyboard(){
-    	return "pay_keyboard.html";
+    @RequestMapping(value = "/payInputMoney")
+    public ModelAndView payInputMoney() {
+        ModelAndView mav = new ModelAndView("pay_input_money.html");
+        mav.addObject("content", "xxx");
+        return mav;
     }
 
-    @RequestMapping(value = "/pay_select_money")
-    public String pay_select_money(){
-    	return "pay_select_money.html";
+    @RequestMapping(value = "/payKeyBoard")
+    public String payKeyBoard() {
+        return "pay_keyboard.html";
     }
 
+    @RequestMapping(value = "/paySelectMoney")
+    public String paySelectMoney() {
+        return "pay_select_money.html";
+    }
 
     @RequestMapping("/success")
-	public String success() {
-		return "success.html";
-	}
-
+    public String success() {
+        return "success.html";
+    }
 
-    @RequestMapping(value = "/ss/{id}",method = RequestMethod.GET)
+    @RequestMapping(value = "/ss/{id}", method = RequestMethod.GET)
     @ResponseBody
-    public String pa(@PathVariable("id") Integer id){
-        return  "id>" + id;
+    public String pa(@PathVariable("id") Integer id) {
+        return "id>" + id;
     }
 
-    //获取参数
-    @RequestMapping(value = "/xx",method = RequestMethod.GET)
+    @RequestMapping(value = "/xx", method = RequestMethod.GET)
     @ResponseBody
-    public String param(@RequestParam("id") Integer xx){
-        return  "id>"+xx;
+    public String param(@RequestParam("id") Integer xx) {
+        return "id>" + xx;
     }
-    //设置默认值
-    @RequestMapping(value = "/xxx",method = RequestMethod.GET)
+
+    @RequestMapping(value = "/xxx", method = RequestMethod.GET)
     @ResponseBody
-    public String param2(@RequestParam(value = "id",required = false ,defaultValue = "2") Integer xx){
-        return  "id>"+xx;
+    public String param2(@RequestParam(value = "id", required = false, defaultValue = "2") Integer xx) {
+        return "id>" + xx;
     }
 
-
-
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/alipay/AbstractAliPayApiController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/alipay/AbstractAliPayApiController.java
new file mode 100644
index 0000000000000000000000000000000000000000..e128196fc5bed2fb09f23d1278ea8fa19cb5b299
--- /dev/null
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/alipay/AbstractAliPayApiController.java
@@ -0,0 +1,16 @@
+package com.zscat.mallplus.pay.controller.alipay;
+
+
+import com.zscat.mallplus.alipay.AliPayApiConfig;
+
+/**
+ * @author Javen
+ */
+public abstract class AbstractAliPayApiController {
+    /**
+     * 获取支付宝配置
+     *
+     * @return {@link AliPayApiConfig} 支付宝配置
+     */
+    public abstract AliPayApiConfig getApiConfig();
+}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/alipay/AliPayApiController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/alipay/AliPayApiController.java
deleted file mode 100644
index 35c69a4f4087605a5e7e16f9b4b3ab4ef4f962b6..0000000000000000000000000000000000000000
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/alipay/AliPayApiController.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.zscat.mallplus.pay.controller.alipay;
-
-import com.jpay.alipay.AliPayApiConfig;
-
-public abstract class AliPayApiController{
-	public abstract  AliPayApiConfig getApiConfig();
-}
\ No newline at end of file
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/alipay/AliPayController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/alipay/AliPayController.java
index e6492b63f3d93a95499b20fa9ce4a9fff18cb4c3..697a69e1d5c6f25ed3c5475c4072a0fb9aa5055f 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/alipay/AliPayController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/alipay/AliPayController.java
@@ -1,18 +1,30 @@
 package com.zscat.mallplus.pay.controller.alipay;
 
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.domain.*;
 import com.alipay.api.internal.util.AlipaySignature;
-import com.alipay.api.response.AlipayFundAuthOrderFreezeResponse;
-import com.alipay.api.response.AlipayFundCouponOrderAgreementPayResponse;
 import com.alipay.api.response.AlipayTradeCreateResponse;
-import com.jpay.alipay.AliPayApi;
-import com.jpay.alipay.AliPayApiConfig;
-import com.jpay.alipay.AliPayApiConfigKit;
-import com.jpay.util.StringUtils;
-import com.jpay.vo.AjaxResult;
-import com.zscat.mallplus.pay.entity.AliPayBean;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zscat.mallplus.alipay.AliPayApi;
+import com.zscat.mallplus.alipay.AliPayApiConfig;
+import com.zscat.mallplus.alipay.AliPayApiConfigKit;
+import com.zscat.mallplus.alipay.AliPayBean;
+import com.zscat.mallplus.core.kit.PayKit;
+import com.zscat.mallplus.core.kit.RsaKit;
+import com.zscat.mallplus.enums.OrderStatus;
+import com.zscat.mallplus.exception.ApiMallPlusException;
+import com.zscat.mallplus.oms.entity.OmsOrder;
+import com.zscat.mallplus.oms.entity.OmsPayments;
+import com.zscat.mallplus.oms.service.IOmsOrderItemService;
+import com.zscat.mallplus.oms.service.IOmsOrderService;
+import com.zscat.mallplus.oms.service.IOmsPaymentsService;
+import com.zscat.mallplus.pay.utils.StringUtils;
+import com.zscat.mallplus.ums.service.IUmsMemberService;
+import com.zscat.mallplus.util.JsonUtils;
+import com.zscat.mallplus.utils.CommonResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,608 +33,738 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
-
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>支付宝支付 Demo</p>
+ *
+ * @author Javen
+ */
 @RestController
-@RequestMapping("/alipay")
-public class AliPayController extends AliPayApiController {
+@RequestMapping("/api/aliPay")
+public class AliPayController extends AbstractAliPayApiController {
     private static final Logger log = LoggerFactory.getLogger(AliPayController.class);
-
-	@Autowired
-	private AliPayBean aliPayBean;
-
-	private AjaxResult result = new AjaxResult();
-
-	@Override
-	public AliPayApiConfig getApiConfig() {
-		return AliPayApiConfig.New()
-				.setAppId(aliPayBean.getAppId())
-				.setAlipayPublicKey(aliPayBean.getPublicKey())
-				.setCharset("UTF-8")
-				.setPrivateKey(aliPayBean.getPrivateKey())
-				.setServiceUrl(aliPayBean.getServerUrl())
-				.setSignType("RSA2")
-				.build();
-	}
-
-	@RequestMapping("")
-	@ResponseBody
-	public String index() {
-		return "欢迎使用IJPay 中的支付宝支付 -By Javen";
-	}
-
-	@RequestMapping("/test")
-	@ResponseBody
-	public String test(){
-		String charset = AliPayApiConfigKit.getAliPayApiConfig().getCharset();
-		log.info("charset>"+charset);
-		return aliPayBean.toString();
-	}
-
-
-	/**
-	 * app支付
-	 */
-	@RequestMapping(value = "/appPay")
-	@ResponseBody
-	public AjaxResult appPay() {
-		try {
-			AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
-			model.setBody("我是测试数据-By Javen");
-			model.setSubject("App支付测试-By Javen");
-			model.setOutTradeNo(StringUtils.getOutTradeNo());
-			model.setTimeoutExpress("30m");
-			model.setTotalAmount("0.01");
-			model.setPassbackParams("callback params");
-			model.setProductCode("QUICK_MSECURITY_PAY");
-			String orderInfo = AliPayApi.appPayToResponse(model, aliPayBean.getDomain() + "/alipay/notify_url").getBody();
-			result.success(orderInfo);
-		} catch (AlipayApiException e) {
-			e.printStackTrace();
-			result.addError("system error:"+e.getMessage());
-		}
-		return result;
-	}
-
-
-	@RequestMapping(value = "/wapPay")
-	@ResponseBody
-	public void wapPay(HttpServletResponse response) {
-		String body = "我是测试数据-By Javen";
-		String subject = "Javen Wap支付测试";
-		String totalAmount = "1";
-		String passbackParams = "1";
-		String returnUrl = aliPayBean.getDomain() + "/alipay/return_url";
-		String notifyUrl = aliPayBean.getDomain() + "/alipay/notify_url";
-
-		AlipayTradeWapPayModel model = new AlipayTradeWapPayModel();
-		model.setBody(body);
-		model.setSubject(subject);
-		model.setTotalAmount(totalAmount);
-		model.setPassbackParams(passbackParams);
-		String outTradeNo = StringUtils.getOutTradeNo();
-		System.out.println("wap outTradeNo>"+outTradeNo);
-		model.setOutTradeNo(outTradeNo);
-		model.setProductCode("QUICK_WAP_PAY");
-
-		try {
-			AliPayApi.wapPay(response, model, returnUrl, notifyUrl);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-
-	/**
-	 * PC支付
-	 */
-	@RequestMapping(value = "/pcPay")
-	@ResponseBody
-	public void pcPay(HttpServletResponse response){
-		try {
-			String totalAmount = "88.88";
-			String outTradeNo =StringUtils.getOutTradeNo();
-			log.info("pc outTradeNo>"+outTradeNo);
-
-			String returnUrl = aliPayBean.getDomain() + "/alipay/return_url";
-			String notifyUrl = aliPayBean.getDomain() + "/alipay/notify_url";
-			AlipayTradePagePayModel model = new AlipayTradePagePayModel();
-
-			model.setOutTradeNo(outTradeNo);
-			model.setProductCode("FAST_INSTANT_TRADE_PAY");
-			model.setTotalAmount(totalAmount);
-			model.setSubject("Javen PC支付测试");
-			model.setBody("Javen IJPay PC支付测试");
-			model.setPassbackParams("passback_params");
-			//花呗分期相关的设置
-			/**
-			 * 测试环境不支持花呗分期的测试
-			 * hb_fq_num代表花呗分期数，仅支持传入3、6、12，其他期数暂不支持，传入会报错；
-			 * hb_fq_seller_percent代表卖家承担收费比例，商家承担手续费传入100，用户承担手续费传入0，仅支持传入100、0两种，其他比例暂不支持，传入会报错。
-			 */
-//			ExtendParams extendParams = new ExtendParams();
-//			extendParams.setHbFqNum("3");
-//			extendParams.setHbFqSellerPercent("0");
-//			model.setExtendParams(extendParams);
-
-			AliPayApi.tradePage(response,model , notifyUrl, returnUrl);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-
-
-	/**
-	 * 条形码支付
-	 * https://doc.open.alipay.com/docs/doc.htm?spm=a219a.7629140.0.0.Yhpibd&
-	 * treeId=194&articleId=105170&docType=1#s4
-	 */
-	@RequestMapping(value ="/tradePay")
-	@ResponseBody
-	public String  tradePay(@RequestParam("auth_code") String authCode) {
-		String subject = "Javen 支付宝条形码支付测试";
-		String totalAmount = "100";
-		String notifyUrl = aliPayBean.getDomain() + "/alipay/notify_url";
-
-		AlipayTradePayModel model = new AlipayTradePayModel();
-		model.setAuthCode(authCode);
-		model.setSubject(subject);
-		model.setTotalAmount(totalAmount);
-		model.setOutTradeNo(StringUtils.getOutTradeNo());
-		model.setScene("bar_code");
-		try {
-			return AliPayApi.tradePayToResponse(model,notifyUrl).getBody();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		return null;
-	}
-
-	/**
-	 * 声波支付
-	 * https://doc.open.alipay.com/docs/doc.htm?treeId=194&articleId=105072&docType=1#s2
-	 */
-	@RequestMapping(value ="/tradeWavePay")
-	@ResponseBody
-	public String tradeWavePay(@RequestParam("auth_code") String authCode) {
-		String subject = "Javen 支付宝声波支付测试";
-		String totalAmount = "100";
-		String notifyUrl = aliPayBean.getDomain() + "/alipay/notify_url";
-
-		AlipayTradePayModel model = new AlipayTradePayModel();
-		model.setAuthCode(authCode);
-		model.setSubject(subject);
-		model.setTotalAmount(totalAmount);
-		model.setOutTradeNo(StringUtils.getOutTradeNo());
-		model.setScene("wave_code");
-		try {
-			return AliPayApi.tradePayToResponse(model,notifyUrl).getBody();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return  null;
-	}
-
-	/**
-	 * 扫码支付
-	 */
-	@RequestMapping(value ="/tradePrecreatePay")
-	@ResponseBody
-	public String tradePrecreatePay() {
-		String subject = "Javen 支付宝扫码支付测试";
-		String totalAmount = "86";
-		String storeId = "123";
-		String notifyUrl = aliPayBean.getDomain() + "/alipay/notify_url";
-
-		AlipayTradePrecreateModel model = new AlipayTradePrecreateModel();
-		model.setSubject(subject);
-		model.setTotalAmount(totalAmount);
-		model.setStoreId(storeId);
-		model.setTimeoutExpress("5m");
-		model.setOutTradeNo(StringUtils.getOutTradeNo());
-		try {
-			String resultStr = AliPayApi.tradePrecreatePayToResponse(model, notifyUrl).getBody();
-			JSONObject jsonObject = JSONObject.parseObject(resultStr);
-			return jsonObject.getJSONObject("alipay_trade_precreate_response").getString("qr_code");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	/**
-	 * 单笔转账到支付宝账户
-	 * https://doc.open.alipay.com/docs/doc.htm?spm=a219a.7629140.0.0.54Ty29&
-	 * treeId=193&articleId=106236&docType=1
-	 */
-	@RequestMapping(value = "/transfer")
-	@ResponseBody
-	public boolean transfer() {
-		boolean isSuccess = false;
-		String total_amount = "66";
-		AlipayFundTransToaccountTransferModel model = new AlipayFundTransToaccountTransferModel();
-		model.setOutBizNo(StringUtils.getOutTradeNo());
-		model.setPayeeType("ALIPAY_LOGONID");
-		model.setPayeeAccount("abpkvd0206@sandbox.com");
-		model.setAmount(total_amount);
-		model.setPayerShowName("测试退款");
-		model.setPayerRealName("沙箱环境");
-		model.setRemark("javen测试单笔转账到支付宝");
-
-		try {
-			isSuccess = AliPayApi.transfer(model);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return isSuccess;
-	}
-
-	/**
-	 * 资金授权冻结接口
-	 */
-	@RequestMapping(value = "/authOrderFreeze")
-	@ResponseBody
-	public AlipayFundAuthOrderFreezeResponse authOrderFreeze(@RequestParam("auth_code") String authCode){
-		try {
-			AlipayFundAuthOrderFreezeModel model = new AlipayFundAuthOrderFreezeModel();
-			model.setOutOrderNo(StringUtils.getOutTradeNo());
-			model.setOutRequestNo(StringUtils.getOutTradeNo());
-			model.setAuthCode(authCode);
-			model.setAuthCodeType("bar_code");
-			model.setOrderTitle("资金授权冻结-By IJPay");
-			model.setAmount("36");
-//			model.setPayTimeout("");
-			model.setProductCode("PRE_AUTH");
-
-			AlipayFundAuthOrderFreezeResponse response = AliPayApi.authOrderFreezeToResponse(model);
-			return response;
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-
-	/**
-	 * 红包协议支付接口
-	 * https://docs.open.alipay.com/301/106168/
-	 */
-	@RequestMapping(value = "/agreementPay")
-	@ResponseBody
-	public AlipayFundCouponOrderAgreementPayResponse agreementPay(){
-		try {
-			AlipayFundCouponOrderAgreementPayModel model = new AlipayFundCouponOrderAgreementPayModel();
-			model.setOutOrderNo(StringUtils.getOutTradeNo());
-			model.setOutRequestNo(StringUtils.getOutTradeNo());
-			model.setOrderTitle("红包协议支付接口-By IJPay");
-			model.setAmount("36");
-			model.setPayerUserId("2088102180432465");
-
-
-			AlipayFundCouponOrderAgreementPayResponse response = AliPayApi.fundCouponOrderAgreementPayToResponse(model);
-			return response;
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * 下载对账单
-	 */
-	@RequestMapping(value = "/dataDataserviceBill")
-	@ResponseBody
-	public String dataDataserviceBill(@RequestParam("billDate") String billDate) {
-		try {
-			AlipayDataDataserviceBillDownloadurlQueryModel model = new AlipayDataDataserviceBillDownloadurlQueryModel();
-			model.setBillType("trade");
-			model.setBillDate(billDate);
-			return AliPayApi.billDownloadurlQuery(model);
-		} catch (AlipayApiException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	/**
-	 * 退款
-	 */
-	@RequestMapping(value = "/tradeRefund")
-	@ResponseBody
-	public String tradeRefund() {
-
-		try {
-			AlipayTradeRefundModel model = new AlipayTradeRefundModel();
-//			model.setOutTradeNo("042517111114931");
-//			model.setTradeNo("2017042521001004200200236813");
-			model.setOutTradeNo("081014283315023");
-			model.setTradeNo("2017081021001004200200273870");
-			model.setRefundAmount("86.00");
-			model.setRefundReason("正常退款");
-			return AliPayApi.tradeRefundToResponse(model).getBody();
-		} catch (AlipayApiException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * 交易查询
-	 */
-	@RequestMapping(value = "/tradeQuery")
-	@ResponseBody
-	public boolean tradeQuery() {
-		boolean isSuccess = false;
-		try {
-			AlipayTradeQueryModel model = new AlipayTradeQueryModel();
-			model.setOutTradeNo("081014283315023");
-			model.setTradeNo("2017081021001004200200273870");
-
-			isSuccess = AliPayApi.tradeQueryToResponse(model).isSuccess();
-		} catch (AlipayApiException e) {
-			e.printStackTrace();
-		}
-		return isSuccess;
-	}
-	@RequestMapping(value = "/tradeQueryByStr")
-	@ResponseBody
-	public String  tradeQueryByStr(@RequestParam("out_trade_no") String out_trade_no) {
-		AlipayTradeQueryModel model = new AlipayTradeQueryModel();
-		model.setOutTradeNo(out_trade_no);
-
-		try {
-			return AliPayApi.tradeQueryToResponse(model).getBody();
-		} catch (AlipayApiException e) {
-			e.printStackTrace();
-		}
-
-		return null;
-	}
-
-	/**
-	 * 创建订单
-	 * {"alipay_trade_create_response":{"code":"10000","msg":"Success","out_trade_no":"081014283315033","trade_no":"2017081021001004200200274066"},"sign":"ZagfFZntf0loojZzdrBNnHhenhyRrsXwHLBNt1Z/dBbx7cF1o7SZQrzNjRHHmVypHKuCmYifikZIqbNNrFJauSuhT4MQkBJE+YGPDtHqDf4Ajdsv3JEyAM3TR/Xm5gUOpzCY7w+RZzkHevsTd4cjKeGM54GBh0hQH/gSyhs4pEN3lRWopqcKkrkOGZPcmunkbrUAF7+AhKGUpK+AqDw4xmKFuVChDKaRdnhM6/yVsezJFXzlQeVgFjbfiWqULxBXq1gqicntyUxvRygKA+5zDTqE5Jj3XRDjVFIDBeOBAnM+u03fUP489wV5V5apyI449RWeybLg08Wo+jUmeOuXOA=="}
-	 */
-	@RequestMapping(value = "/tradeCreate")
-	@ResponseBody
-	public String tradeCreate(@RequestParam("out_trade_no") String outTradeNo){
-
-		String notifyUrl = aliPayBean.getDomain()+ "/alipay/notify_url";
-
-		AlipayTradeCreateModel model = new AlipayTradeCreateModel();
-		model.setOutTradeNo(outTradeNo);
-		model.setTotalAmount("88.88");
-		model.setBody("Body");
-		model.setSubject("Javen 测试统一收单交易创建接口");
-		model.setBuyerLogonId("abpkvd0206@sandbox.com");//买家支付宝账号，和buyer_id不能同时为空
-		try {
-			AlipayTradeCreateResponse response = AliPayApi.tradeCreateToResponse(model, notifyUrl);
-			return response.getBody();
-		} catch (AlipayApiException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * 撤销订单
-	 */
-	@RequestMapping(value = "/tradeCancel")
-	@ResponseBody
-	public boolean tradeCancel() {
-		boolean isSuccess = false;
-		try {
-			AlipayTradeCancelModel model = new AlipayTradeCancelModel();
-			model.setOutTradeNo("081014283315033");
-			model.setTradeNo("2017081021001004200200274066");
-
-			isSuccess = AliPayApi.tradeCancelToResponse(model).isSuccess();
-		} catch (AlipayApiException e) {
-			e.printStackTrace();
-		}
-		return isSuccess;
-	}
-
-	/**
-	 * 关闭订单
-	 */
-	@RequestMapping(value = "/tradeClose")
-	@ResponseBody
-	public String tradeClose(@RequestParam("out_trade_no") String outTradeNo,@RequestParam("trade_no") String tradeNo){
-		try {
-			AlipayTradeCloseModel model = new AlipayTradeCloseModel();
-			model.setOutTradeNo(outTradeNo);
-
-			model.setTradeNo(tradeNo);
-
-			return AliPayApi.tradeCloseToResponse(model).getBody();
-		} catch (AlipayApiException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * 结算
-	 */
-	@RequestMapping(value = "/tradeOrderSettle")
-	@ResponseBody
-	public String  tradeOrderSettle(@RequestParam("trade_no") String tradeNo){
-		try {
-			AlipayTradeOrderSettleModel model = new AlipayTradeOrderSettleModel();
-			model.setOutRequestNo(StringUtils.getOutTradeNo());
-			model.setTradeNo(tradeNo);
-
-			return AliPayApi.tradeOrderSettleToResponse(model ).getBody();
-		} catch (AlipayApiException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * 获取应用授权URL并授权
-	 */
-	@RequestMapping(value = "/toOauth")
-	@ResponseBody
-	public void toOauth(HttpServletResponse response) {
-		try {
-			String redirectUri = aliPayBean.getDomain()+ "/alipay/redirect_uri";
-			String oauth2Url = AliPayApi.getOauth2Url(aliPayBean.getAppId(), redirectUri);
-			response.sendRedirect(oauth2Url);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	/**
-	 * 应用授权回调
-	 */
-	@RequestMapping(value = "/redirect_uri")
-	@ResponseBody
-	public String redirect_uri(@RequestParam("app_id") String app_id,@RequestParam("app_auth_code") String app_auth_code) {
-		try {
-			System.out.println("app_id:"+app_id);
-			System.out.println("app_auth_code:"+app_auth_code);
-			//使用app_auth_code换取app_auth_token
-			AlipayOpenAuthTokenAppModel model = new AlipayOpenAuthTokenAppModel();
-			model.setGrantType("authorization_code");
-			model.setCode(app_auth_code);
-			return  AliPayApi.openAuthTokenAppToResponse(model).getBody();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	/**
-	 * 查询授权信息
-	 */
-	@RequestMapping(value = "/openAuthTokenAppQuery")
-	@ResponseBody
-	public String openAuthTokenAppQuery(@RequestParam("app_auth_token") String app_auth_token) {
-		try {
-			AlipayOpenAuthTokenAppQueryModel model = new AlipayOpenAuthTokenAppQueryModel();
-			model.setAppAuthToken(app_auth_token);
-			return  AliPayApi.openAuthTokenAppQueryToResponse(model).getBody();
-		} catch (AlipayApiException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * 批量付款到支付宝账户有密接口
-	 */
-	@RequestMapping(value = "/batchTrans")
-	@ResponseBody
-	public  void batchTrans(HttpServletResponse response) {
-		try {
-			String sign_type = "MD5";
-			String notifyUrl = aliPayBean.getDomain()+ "/alipay/notify_url";;
-			Map<String, String> params = new HashMap<>();
-			params.put("partner", "PID");
-			params.put("sign_type", sign_type);
-			params.put("notify_url", notifyUrl);
-			params.put("account_name", "xxx");
-			params.put("detail_data", "流水号1^收款方账号1^收款账号姓名1^付款金额1^备注说明1|流水号2^收款方账号2^收款账号姓名2^付款金额2^备注说明2");
-			params.put("batch_no",String.valueOf(System.currentTimeMillis()));
-			params.put("batch_num", 1+"");
-			params.put("batch_fee", 10.00+"");
-			params.put("email", "xx@xxx.com");
-
-			AliPayApi.batchTrans(params, aliPayBean.getPrivateKey(), sign_type, response);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-
-	/**
-	 * 地铁购票核销码发码
-	 */
-	@RequestMapping(value = "/voucherGenerate")
-	@ResponseBody
-	public String voucherGenerate(@RequestParam("tradeNo") String tradeNo) {
-		try {
-			//需要支付成功的订单号
+    String domain = "";
+    String privateKey = "";
+    String publicKey = "";
+    String appId = "";
+    @Resource
+    private IOmsOrderService orderService;
+    @Resource
+    private IUmsMemberService memberService;
+    @Resource
+    private IOmsOrderItemService orderItemService;
+
+    @Autowired
+    private IOmsPaymentsService paymentsService;
+
+
+    @Override
+    public AliPayApiConfig getApiConfig() {
+        AliPayApiConfig aliPayApiConfig = null;
+        try {
+            //aliPayApiConfig = AliPayApiConfigKit.getApiConfig(aliPayBean.getAppId());
+            OmsPayments payments = paymentsService.getById(2);
+            if (payments != null) {
+                AliPayBean aliPayBean = JsonUtils.jsonToPojo(payments.getParams(), AliPayBean.class);
+                aliPayApiConfig = AliPayApiConfig.builder()
+                        .setAppId(aliPayBean.getAppId())
+                        .setAliPayPublicKey(aliPayBean.getPublicKey())
+                        .setCharset("UTF-8")
+                        .setPrivateKey(aliPayBean.getPrivateKey())
+                        .setServiceUrl(aliPayBean.getServerUrl())
+                        .setSignType("RSA2")
+                        .build();
+                domain = aliPayBean.getDomain();
+                privateKey = aliPayBean.getPrivateKey();
+                publicKey = aliPayBean.getPublicKey();
+                appId = aliPayBean.getAppId();
+            }
+
+        } catch (Exception e) {
+            AliPayBean aliPayBean = new AliPayBean();
+            aliPayBean.setAppId("2017010804923732");
+            aliPayBean.setDomain("http://www.yjlive.cn/api/api");
+            aliPayBean.setServerUrl("https://openapi.alipay.com/gateway.do");
+            aliPayBean.setPublicKey("MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzQsSWsgXJO7HTWLd/8Y9de6kPBlGqvnBCdL6N8pbg9TZ5LDQOpPxef940nY/dHQiBw61bVZQULSps2mhOs7xjebhEJfhXiGV+aZBjacxr+qJ4EpM/pjH3MrfA8IB5MpB9OFEeOTGos3FMzeQHPiqeeDAIDEFs4fO112/3OWfCD6rLI88H0FoDqZ4oSsAkniFZAW1IjwW9Whgicgo4v3IjcWV+k4eFCSCORpnNKjLbsco0qJic1FaHqbkccnpW8/40j/Vo/ZZG/qCDyZ/Lt7+OKDgO8dzelFfG/IoAuEMGsgb26tCAZMVyjMxXUgLrqnTESAx6121pqy1fiwyMC6cRwIDAQAB\n");
+            aliPayBean.setPrivateKey("MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDNCxJayBck7sdNYt3/xj117qQ8GUaq+cEJ0vo3yluD1NnksNA6k/F5/3jSdj90dCIHDrVtVlBQtKmzaaE6zvGN5uEQl+FeIZX5pkGNpzGv6ongSkz+mMfcyt8DwgHkykH04UR45MaizcUzN5Ac+Kp54MAgMQWzh87XXb/c5Z8IPqssjzwfQWgOpnihKwCSeIVkBbUiPBb1aGCJyCji/ciNxZX6Th4UJII5Gmc0qMtuxyjSomJzUVoepuRxyelbz/jSP9Wj9lkb+oIPJn8u3v44oOA7x3N6UV8b8igC4QwayBvbq0IBkxXKMzFdSAuuqdMRIDHrXbWmrLV+LDIwLpxHAgMBAAECggEACYIM7NbAc/76kPUXtEeeC/zv8rV9WGpScEEvRy0EB130aK1mSoEXvn+BO8kt8hl8hnVBJnvNJ6DpCZ/JUS/NdbYSE7HnSnUmPjhea9In9K9ci2EGpvuwsOVbaBI0Akb6vf9ALJb3Ow9tqI1YCm/hf9tTLWr4h7Wxer0nK3geYsRn6O92AKFYjxvImR/qj9sr2DNHg83lX/2YkdDuxhLWF8oTZzunhqvEWo17mEcCrFpx/vY3bME+ZMG/IAtp89PFXXsNHii4nI0buR8mx4z6CgIetgL0qFJUeMUir1ZKn+uAyy9Jv1V9Bu7R07LXsjlZlA/xnew5ie/42iyGcusYiQKBgQDvRiPWCX0eEe4rVcPHAZJ1d/jsOGwvhzmE4TUQdnjVU0bKdgY4hHS9BrvjCTAWmzEE0siS85inzQj26DGGNr5U+D0HYfTEymNQNBMLin/ApLvNPL7xzFdpA19sVvatVV+c5Vl9JaVGuBraK69Q7Cz/6OQwXU1NGQWohZhOyMX6MwKBgQDbYF2BM7npaXFQVbigGmXgdvLHeWdZag7M4dB0lHsqGWAdtQzIIn05q9rBWNMusEfal/eZKuvmoXaDquh/g0VDCmmxxIE4OS9j37g64/4QbWJxwM8rDzA6Z58peng7CUse9Pb3Q/F8JQ/EvniEa6JT1qXWGWhQcpGsACCZEYYpnQKBgGQPAsFo6md+vAhnLx2zbJmu9+tglO0zMTx+KQCfalxbHMlhnaxYx7Ccdkm09+UcNN19f97j+zyAo3UNGFi139YMkQjbT85TjEBn5mb3HgFjYh2rf3YCK7OAc5EMtM87WmZ0Cn4pFfqC1sfRaNkASrkhnPsUqVTKV/FnHJAlqZS9AoGBAJgAKCmajolEzwerrXX5dHdX05YU72AL1V9uY0IzkzczR96tkMKm6v9nrPXktsaVy+ORAjS1gahWXciTRe78JKRz9ZH/ps0vCj/4Ri0/xczaDajlwGWEa5U8MRLLUb0ODmfPscLX591tzIQ0uUp/TYUrp9I13opHJ9n2aJ/GfaAdAoGARUzil6jIO3mASNaH7MPR4MqvxMO0LuBwaVxR1mvM7GtDDDYWU3fTJ6lFpyr340cYgEmHAVnLezbLmP75Jqo42j7H5V3BplPITSSik9ti3WOHFlPRYsZBewL7cJb4VX5oRrbfOX8to9wfw2TvofHE82NDtQn9fQUoFpqKlkIraL4=\n");
+            aliPayApiConfig = AliPayApiConfig.builder()
+                    .setAppId(aliPayBean.getAppId())
+                    .setAliPayPublicKey(aliPayBean.getPublicKey())
+                    .setCharset("UTF-8")
+                    .setPrivateKey(aliPayBean.getPrivateKey())
+                    .setServiceUrl(aliPayBean.getServerUrl())
+                    .setSignType("RSA2")
+                    .build();
+            domain = aliPayBean.getDomain();
+            privateKey = aliPayBean.getPrivateKey();
+            publicKey = aliPayBean.getPublicKey();
+            appId = aliPayBean.getAppId();
+        }
+        return aliPayApiConfig;
+
+    }
+
+    @RequestMapping("")
+    @ResponseBody
+    public String index() {
+        return "欢迎使用 IJPay 中的支付宝支付 -By Javen  <br/><br>  交流群：723992875";
+    }
+
+    @RequestMapping("/test")
+    @ResponseBody
+    public AliPayApiConfig test() {
+        AliPayApiConfig aliPayApiConfig = AliPayApiConfigKit.getAliPayApiConfig();
+        String charset = aliPayApiConfig.getCharset();
+        log.info("charset>" + charset);
+        return aliPayApiConfig;
+    }
+
+
+    /**
+     * app支付
+     */
+    @RequestMapping(value = "/appPay")
+    @ResponseBody
+    public Object appPay(@RequestParam(value = "orderId", required = false, defaultValue = "0") Long orderId) {
+        try {
+
+            OmsOrder orderInfo = orderService.getById(orderId);
+            if (null == orderInfo) {
+                return new CommonResult().failed("订单已取消" );
+            }
+            if (orderInfo.getStatus() == OrderStatus.CLOSED.getValue()) {
+                return new CommonResult().failed( "订单已已关闭，请不要重复操作" );
+            }
+            if (orderInfo.getStatus() != OrderStatus.INIT.getValue()) {
+                return new CommonResult().failed( "订单已支付，请不要重复操作" );
+            }
+
+            AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
+            model.setBody("zhifu");
+            model.setSubject("mallplus app支付");
+            model.setOutTradeNo(orderInfo.getOrderSn());
+            model.setTimeoutExpress("30m");
+            model.setTotalAmount(orderInfo.getPayAmount().floatValue()+"");
+            model.setPassbackParams("callback params");
+            model.setProductCode("QUICK_MSECURITY_PAY");
+            String order = AliPayApi.appPayToResponse(model, domain + "/aliPay/notify_url",this.getApiConfig()).getBody();
+            System.out.println(JSONObject.toJSONString(orderInfo));
+            return new CommonResult().success(order);
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+            return new CommonResult().failed(e.getMessage());
+        }
+    }
+
+    @RequestMapping(value = "/wapPayNoSdk")
+    @ResponseBody
+    public void wapPayNoSdk(HttpServletResponse response,@RequestParam(value = "orderId", required = false, defaultValue = "0") Long orderId) {
+        try {
+            OmsOrder orderInfo = orderService.getById(orderId);
+            if (null == orderInfo) {
+                throw new ApiMallPlusException("订单已取消" );
+            }
+            if (orderInfo.getStatus() == OrderStatus.CLOSED.getValue()) {
+                throw new ApiMallPlusException( "订单已已关闭，请不要重复操作" );
+            }
+            if (orderInfo.getStatus() != OrderStatus.INIT.getValue()) {
+                throw new ApiMallPlusException( "订单已支付，请不要重复操作" );
+            }
+            AliPayApiConfig aliPayApiConfig = AliPayApiConfigKit.getAliPayApiConfig();
+            Map<String, String> paramsMap = new HashMap<>();
+            paramsMap.put("app_id", aliPayApiConfig.getAppId());
+            paramsMap.put("method", "alipay.trade.wap.pay");
+            paramsMap.put("return_url", domain + "aliPay/return_url");
+            paramsMap.put("charset", aliPayApiConfig.getCharset());
+            paramsMap.put("sign_type", aliPayApiConfig.getSignType());
+            paramsMap.put("timestamp", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+            paramsMap.put("version", "1.0");
+            paramsMap.put("notify_url", domain + "/aliPay/notify_url");
+
+            Map<String, String> bizMap = new HashMap<>();
+            bizMap.put("body", "mallplus 聚合支付-H5");
+            bizMap.put("subject", "IJPay 让支付触手可及");
+            bizMap.put("out_trade_no", StringUtils.getOutTradeNo());
+            bizMap.put("total_amount", orderInfo.getPayAmount().toString());
+            bizMap.put("product_code", "QUICK_WAP_WAY");
+
+            paramsMap.put("biz_content", JSON.toJSONString(bizMap));
+
+            String content = PayKit.createLinkString(paramsMap);
+
+            System.out.println(content);
+
+            String encrypt = RsaKit.encryptByPrivateKey(content, aliPayApiConfig.getPrivateKey());
+//            encrypt = AlipaySignature.rsaSign(content,aliPayApiConfig.getPrivateKey(), "UTF-8","RSA2");
+//            System.out.println(encrypt);
+            paramsMap.put("sign", encrypt);
+
+            String url = aliPayApiConfig.getServiceUrl() + "?" + PayKit.createLinkString(paramsMap, true);
+            System.out.println(url);
+            response.sendRedirect(url);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @RequestMapping(value = "/wapPay")
+    @ResponseBody
+    public Object wapPay(HttpServletResponse response,@RequestParam(value = "orderId", required = true, defaultValue = "0") Long orderId) {
+        OmsOrder orderInfo = orderService.getById(orderId);
+        if (null == orderInfo) {
+            return new CommonResult().failed("订单已取消" );
+        }
+        if (orderInfo.getStatus() == OrderStatus.CLOSED.getValue()) {
+            return new CommonResult().failed( "订单已已关闭，请不要重复操作" );
+        }
+        if (orderInfo.getStatus() != OrderStatus.INIT.getValue()) {
+            return new CommonResult().failed( "订单已支付，请不要重复操作" );
+        }
+
+        String body = orderInfo.getGoodsName();
+        String subject = "mallplus支付测试";
+        String passbackParams = "1";
+        String returnUrl = domain + "/aliPay/return_url";
+        String notifyUrl = domain + "/aliPay/notify_url";
+
+        AlipayTradeWapPayModel model = new AlipayTradeWapPayModel();
+        model.setBody(subject);
+        model.setSubject(subject);
+        model.setTotalAmount(orderInfo.getPayAmount().floatValue()+"");
+        model.setPassbackParams(passbackParams);
+        model.setOutTradeNo(orderInfo.getOrderSn());
+        model.setProductCode(orderInfo.getOrderSn());
+
+        try {
+            return new CommonResult().success(AliPayApi.wapPayStr( model, returnUrl, notifyUrl,this.getApiConfig()));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new CommonResult().failed(e.getMessage());
+        }
+
+    }
+
+
+    /**
+     * PC支付
+     */
+    @RequestMapping(value = "/pcPay")
+    @ResponseBody
+    public void pcPay(HttpServletResponse response ,@RequestParam(value = "orderId", required = true, defaultValue = "0") Long orderId) {
+        try {
+            OmsOrder orderInfo = orderService.getById(orderId);
+            if (null == orderInfo) {
+                throw new ApiMallPlusException("订单已取消" );
+            }
+            if (orderInfo.getStatus() == OrderStatus.CLOSED.getValue()) {
+                throw new ApiMallPlusException( "订单已已关闭，请不要重复操作" );
+            }
+            if (orderInfo.getStatus() != OrderStatus.INIT.getValue()) {
+                throw new ApiMallPlusException( "订单已支付，请不要重复操作" );
+            }
+            String returnUrl = domain + "/aliPay/return_url";
+            String notifyUrl = domain + "/aliPay/notify_url";
+            AlipayTradePagePayModel model = new AlipayTradePagePayModel();
+
+            model.setOutTradeNo(orderInfo.getOrderSn());
+            model.setProductCode("FAST_INSTANT_TRADE_PAY");
+            model.setTotalAmount(orderInfo.getPayAmount().floatValue()+"");
+            model.setSubject("Javen PC支付测试");
+            model.setBody("Javen IJPay PC支付测试");
+            model.setPassbackParams("passback_params");
+            /**
+             * 花呗分期相关的设置,测试环境不支持花呗分期的测试
+             * hb_fq_num代表花呗分期数，仅支持传入3、6、12，其他期数暂不支持，传入会报错；
+             * hb_fq_seller_percent代表卖家承担收费比例，商家承担手续费传入100，用户承担手续费传入0，仅支持传入100、0两种，其他比例暂不支持，传入会报错。
+             */
+            ExtendParams extendParams = new ExtendParams();
+            extendParams.setHbFqNum("3");
+            extendParams.setHbFqSellerPercent("0");
+            model.setExtendParams(extendParams);
+
+            AliPayApi.tradePage(response, model, notifyUrl, returnUrl,this.getApiConfig());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    /**
+     * 统一收单交易支付接口接口
+     *
+     * @param authCode
+     * @param scene
+     * @return
+     */
+    @RequestMapping(value = "/tradePay")
+    @ResponseBody
+    public Object tradePay(@RequestParam("auth_code") String authCode, @RequestParam("scene") String scene) {
+        String subject = null;
+        String waveCode = "wave_code";
+        String barCode = "bar_code";
+        if (scene.equals(waveCode)) {
+            subject = "Javen 支付宝声波支付测试";
+        } else if (scene.equals(barCode)) {
+            subject = "Javen 支付宝条形码支付测试";
+        }
+        String totalAmount = "100";
+        String notifyUrl = domain + "/aliPay/notify_url";
+
+        AlipayTradePayModel model = new AlipayTradePayModel();
+        model.setAuthCode(authCode);
+        model.setSubject(subject);
+        model.setTotalAmount(totalAmount);
+        model.setOutTradeNo(StringUtils.getOutTradeNo());
+        model.setScene(scene);
+        try {
+            return new CommonResult().success(AliPayApi.tradePayToResponse(model, notifyUrl,this.getApiConfig()).getBody());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    /**
+     * 扫码支付
+     */
+    @RequestMapping(value = "/tradePrecreatePay")
+    @ResponseBody
+    public String tradePrecreatePay() {
+        String subject = "Javen 支付宝扫码支付测试";
+        String totalAmount = "86";
+        String storeId = "123";
+        String notifyUrl = domain + "/aliPay/notify_url";
+
+        AlipayTradePrecreateModel model = new AlipayTradePrecreateModel();
+        model.setSubject(subject);
+        model.setTotalAmount(totalAmount);
+        model.setStoreId(storeId);
+        model.setTimeoutExpress("5m");
+        model.setOutTradeNo(StringUtils.getOutTradeNo());
+        try {
+            String resultStr = AliPayApi.tradePrecreatePayToResponse(model, notifyUrl,this.getApiConfig()).getBody();
+            JSONObject jsonObject = JSONObject.parseObject(resultStr);
+            return jsonObject.getJSONObject("alipay_trade_precreate_response").getString("qr_code");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 单笔转账到支付宝账户
+     * https://doc.open.alipay.com/docs/doc.htm?spm=a219a.7629140.0.0.54Ty29&
+     * treeId=193&articleId=106236&docType=1
+     */
+    @RequestMapping(value = "/transfer")
+    @ResponseBody
+    public boolean transfer() {
+        boolean isSuccess = false;
+        String totalAmount = "66";
+        AlipayFundTransToaccountTransferModel model = new AlipayFundTransToaccountTransferModel();
+        model.setOutBizNo(StringUtils.getOutTradeNo());
+        model.setPayeeType("ALIPAY_LOGONID");
+        model.setPayeeAccount("abpkvd0206@sandbox.com");
+        model.setAmount(totalAmount);
+        model.setPayerShowName("测试退款");
+        model.setPayerRealName("沙箱环境");
+        model.setRemark("javen测试单笔转账到支付宝");
+
+        try {
+            isSuccess = AliPayApi.transfer(model,this.getApiConfig());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return isSuccess;
+    }
+
+    /**
+     * 资金授权冻结接口
+     */
+    @RequestMapping(value = "/authOrderFreeze")
+    @ResponseBody
+    public Object authOrderFreeze(@RequestParam("auth_code") String authCode) {
+        try {
+            AlipayFundAuthOrderFreezeModel model = new AlipayFundAuthOrderFreezeModel();
+            model.setOutOrderNo(StringUtils.getOutTradeNo());
+            model.setOutRequestNo(StringUtils.getOutTradeNo());
+            model.setAuthCode(authCode);
+            model.setAuthCodeType("bar_code");
+            model.setOrderTitle("资金授权冻结-By IJPay");
+            model.setAmount("36");
+            model.setProductCode("PRE_AUTH");
+
+            return new CommonResult().success(AliPayApi.authOrderFreezeToResponse(model,this.getApiConfig()));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    /**
+     * 红包协议支付接口
+     * https://docs.open.alipay.com/301/106168/
+     */
+    @RequestMapping(value = "/agreementPay")
+    @ResponseBody
+    public Object agreementPay() {
+        try {
+            AlipayFundCouponOrderAgreementPayModel model = new AlipayFundCouponOrderAgreementPayModel();
+            model.setOutOrderNo(StringUtils.getOutTradeNo());
+            model.setOutRequestNo(StringUtils.getOutTradeNo());
+            model.setOrderTitle("红包协议支付接口-By IJPay");
+            model.setAmount("36");
+            model.setPayerUserId("2088102180432465");
+
+            return new CommonResult().success(AliPayApi.fundCouponOrderAgreementPayToResponse(model,this.getApiConfig()));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 下载对账单
+     */
+    @RequestMapping(value = "/dataDataserviceBill")
+    @ResponseBody
+    public Object dataDataserviceBill(@RequestParam("billDate") String billDate) {
+        try {
+            AlipayDataDataserviceBillDownloadurlQueryModel model = new AlipayDataDataserviceBillDownloadurlQueryModel();
+            model.setBillType("trade");
+            model.setBillDate(billDate);
+            return new CommonResult().success(AliPayApi.billDownloadurlQuery(model,this.getApiConfig()));
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 退款
+     */
+    @RequestMapping(value = "/tradeRefund")
+    @ResponseBody
+    public Object tradeRefund() {
+
+        try {
+            AlipayTradeRefundModel model = new AlipayTradeRefundModel();
+            model.setOutTradeNo("081014283315023");
+            model.setTradeNo("2017081021001004200200273870");
+            model.setRefundAmount("86.00");
+            model.setRefundReason("正常退款");
+            return new CommonResult().success(AliPayApi.tradeRefundToResponse(model,this.getApiConfig()).getBody());
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 交易查询
+     */
+    @RequestMapping(value = "/tradeQuery")
+    @ResponseBody
+    public boolean tradeQuery() {
+        boolean isSuccess = false;
+        try {
+            AlipayTradeQueryModel model = new AlipayTradeQueryModel();
+            model.setOutTradeNo("081014283315023");
+            model.setTradeNo("2017081021001004200200273870");
+
+            isSuccess = AliPayApi.tradeQueryToResponse(model,this.getApiConfig()).isSuccess();
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+        }
+        return isSuccess;
+    }
+
+    @RequestMapping(value = "/tradeQueryByStr")
+    @ResponseBody
+    public Object tradeQueryByStr(@RequestParam("out_trade_no") String outTradeNo) {
+        AlipayTradeQueryModel model = new AlipayTradeQueryModel();
+        model.setOutTradeNo(outTradeNo);
+
+        try {
+            return new CommonResult().success(AliPayApi.tradeQueryToResponse(model,this.getApiConfig()).getBody());
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    /**
+     * 创建订单
+     * {"alipay_trade_create_response":{"code":"10000","msg":"Success","out_trade_no":"081014283315033","trade_no":"2017081021001004200200274066"},"sign":"ZagfFZntf0loojZzdrBNnHhenhyRrsXwHLBNt1Z/dBbx7cF1o7SZQrzNjRHHmVypHKuCmYifikZIqbNNrFJauSuhT4MQkBJE+YGPDtHqDf4Ajdsv3JEyAM3TR/Xm5gUOpzCY7w+RZzkHevsTd4cjKeGM54GBh0hQH/gSyhs4pEN3lRWopqcKkrkOGZPcmunkbrUAF7+AhKGUpK+AqDw4xmKFuVChDKaRdnhM6/yVsezJFXzlQeVgFjbfiWqULxBXq1gqicntyUxvRygKA+5zDTqE5Jj3XRDjVFIDBeOBAnM+u03fUP489wV5V5apyI449RWeybLg08Wo+jUmeOuXOA=="}
+     */
+    @RequestMapping(value = "/tradeCreate")
+    @ResponseBody
+    public Object tradeCreate(@RequestParam("out_trade_no") String outTradeNo) {
+
+        String notifyUrl = domain + "/aliPay/notify_url";
+
+        AlipayTradeCreateModel model = new AlipayTradeCreateModel();
+        model.setOutTradeNo(outTradeNo);
+        model.setTotalAmount("88.88");
+        model.setBody("Body");
+        model.setSubject("Javen 测试统一收单交易创建接口");
+        //买家支付宝账号，和buyer_id不能同时为空
+        model.setBuyerLogonId("abpkvd0206@sandbox.com");
+        try {
+            AlipayTradeCreateResponse response = AliPayApi.tradeCreateToResponse(model, notifyUrl,this.getApiConfig());
+            return new CommonResult().success(response.getBody());
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 撤销订单
+     */
+    @RequestMapping(value = "/tradeCancel")
+    @ResponseBody
+    public Object tradeCancel() {
+        boolean isSuccess = false;
+        try {
+            AlipayTradeCancelModel model = new AlipayTradeCancelModel();
+            model.setOutTradeNo("081014283315033");
+            model.setTradeNo("2017081021001004200200274066");
+
+            isSuccess = AliPayApi.tradeCancelToResponse(model,this.getApiConfig()).isSuccess();
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+        }
+        return new CommonResult().success(isSuccess);
+    }
+
+    /**
+     * 关闭订单
+     */
+    @RequestMapping(value = "/tradeClose")
+    @ResponseBody
+    public Object tradeClose(@RequestParam("out_trade_no") String outTradeNo, @RequestParam("trade_no") String tradeNo) {
+        try {
+            AlipayTradeCloseModel model = new AlipayTradeCloseModel();
+            model.setOutTradeNo(outTradeNo);
+
+            model.setTradeNo(tradeNo);
+
+            return new CommonResult().success(AliPayApi.tradeCloseToResponse(model,this.getApiConfig()).getBody());
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 结算
+     */
+    @RequestMapping(value = "/tradeOrderSettle")
+    @ResponseBody
+    public Object tradeOrderSettle(@RequestParam("trade_no") String tradeNo) {
+        try {
+            AlipayTradeOrderSettleModel model = new AlipayTradeOrderSettleModel();
+            model.setOutRequestNo(StringUtils.getOutTradeNo());
+            model.setTradeNo(tradeNo);
+
+            return new CommonResult().success(AliPayApi.tradeOrderSettleToResponse(model,this.getApiConfig()).getBody());
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 获取应用授权URL并授权
+     */
+    @RequestMapping(value = "/toOauth")
+    @ResponseBody
+    public void toOauth(HttpServletResponse response) {
+        try {
+            String redirectUri = domain + "/aliPay/redirect_uri";
+            String oauth2Url = AliPayApi.getOauth2Url(appId, redirectUri);
+            response.sendRedirect(oauth2Url);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 应用授权回调
+     */
+    @RequestMapping(value = "/redirect_uri")
+    @ResponseBody
+    public Object redirectUri(@RequestParam("app_id") String appId, @RequestParam("app_auth_code") String appAuthCode) {
+        try {
+            System.out.println("app_id:" + appId);
+            System.out.println("app_auth_code:" + appAuthCode);
+            //使用app_auth_code换取app_auth_token
+            AlipayOpenAuthTokenAppModel model = new AlipayOpenAuthTokenAppModel();
+            model.setGrantType("authorization_code");
+            model.setCode(appAuthCode);
+            return new CommonResult().success(AliPayApi.openAuthTokenAppToResponse(model,this.getApiConfig()).getBody());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 查询授权信息
+     */
+    @RequestMapping(value = "/openAuthTokenAppQuery")
+    @ResponseBody
+    public Object openAuthTokenAppQuery(@RequestParam("app_auth_token") String appAuthToken) {
+        try {
+            AlipayOpenAuthTokenAppQueryModel model = new AlipayOpenAuthTokenAppQueryModel();
+            model.setAppAuthToken(appAuthToken);
+            return new CommonResult().success(AliPayApi.openAuthTokenAppQueryToResponse(model,this.getApiConfig()).getBody());
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 批量付款到支付宝账户有密接口
+     */
+    @RequestMapping(value = "/batchTrans")
+    @ResponseBody
+    public void batchTrans(HttpServletResponse response) {
+        try {
+            String signType = "MD5";
+            String notifyUrl = domain + "/aliPay/notify_url";
+            Map<String, String> params = new HashMap<>(15);
+            params.put("partner", "PID");
+            params.put("sign_type", signType);
+            params.put("notify_url", notifyUrl);
+            params.put("account_name", "xxx");
+            params.put("detail_data", "流水号1^收款方账号1^收款账号姓名1^付款金额1^备注说明1|流水号2^收款方账号2^收款账号姓名2^付款金额2^备注说明2");
+            params.put("batch_no", String.valueOf(System.currentTimeMillis()));
+            params.put("batch_num", 1 + "");
+            params.put("batch_fee", 10.00 + "");
+            params.put("email", "xx@xxx.com");
+
+            AliPayApi.batchTrans(params, privateKey, signType, response);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    /**
+     * 地铁购票核销码发码
+     */
+    @RequestMapping(value = "/voucherGenerate")
+    @ResponseBody
+    public String voucherGenerate(@RequestParam("tradeNo") String tradeNo) {
+        try {
+            //需要支付成功的订单号
 //			String tradeNo = getPara("tradeNo");
 
-			AlipayCommerceCityfacilitatorVoucherGenerateModel model = new AlipayCommerceCityfacilitatorVoucherGenerateModel();
-			model.setCityCode("440300");
-			model.setTradeNo(tradeNo);
-			model.setTotalFee("8");
-			model.setTicketNum("2");
-			model.setTicketType("oneway");
-			model.setSiteBegin("001");
-			model.setSiteEnd("002");
-			model.setTicketPrice("4");
-			return AliPayApi.voucherGenerateToResponse(model).getBody();
-		} catch (AlipayApiException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	@RequestMapping(value = "/return_url")
-	@ResponseBody
-	public String return_url(HttpServletRequest request) {
-		try {
-			// 获取支付宝GET过来反馈信息
-			Map<String, String> map = AliPayApi.toMap(request);
-			for (Map.Entry<String, String> entry : map.entrySet()) {
-				System.out.println(entry.getKey() + " = " + entry.getValue());
-			}
-
-			boolean verify_result = AlipaySignature.rsaCheckV1(map, aliPayBean.getPublicKey(), "UTF-8",
-					"RSA2");
-
-			if (verify_result) {// 验证成功
-				// TODO 请在这里加上商户的业务逻辑程序代码
-				System.out.println("return_url 验证成功");
-
-				return "success";
-			} else {
-				System.out.println("return_url 验证失败");
-				// TODO
-				return "failure";
-			}
-		} catch (AlipayApiException e) {
-			e.printStackTrace();
-			return "failure";
-		}
-	}
-
-
-
-	@RequestMapping(value = "/notify_url")
-	@ResponseBody
-	public String  notify_url(HttpServletRequest request) {
-		try {
-			// 获取支付宝POST过来反馈信息
-			Map<String, String> params = AliPayApi.toMap(request);
-
-			for (Map.Entry<String, String> entry : params.entrySet()) {
-				System.out.println(entry.getKey() + " = " + entry.getValue());
-			}
-
-			boolean verify_result = AlipaySignature.rsaCheckV1(params, aliPayBean.getPublicKey(), "UTF-8",
-					"RSA2");
-
-			if (verify_result) {// 验证成功
-				// TODO 请在这里加上商户的业务逻辑程序代码 异步通知可能出现订单重复通知 需要做去重处理
-				System.out.println("notify_url 验证成功succcess");
-				return "success";
-			} else {
-				System.out.println("notify_url 验证失败");
-				// TODO
-				return "failure";
-			}
-		} catch (AlipayApiException e) {
-			e.printStackTrace();
-			return "failure";
-		}
-	}
+            AlipayCommerceCityfacilitatorVoucherGenerateModel model = new AlipayCommerceCityfacilitatorVoucherGenerateModel();
+            model.setCityCode("440300");
+            model.setTradeNo(tradeNo);
+            model.setTotalFee("8");
+            model.setTicketNum("2");
+            model.setTicketType("oneway");
+            model.setSiteBegin("001");
+            model.setSiteEnd("002");
+            model.setTicketPrice("4");
+            return AliPayApi.voucherGenerateToResponse(model,this.getApiConfig()).getBody();
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    @RequestMapping(value = "/return_url")
+    @ResponseBody
+    public Object returnUrl(HttpServletRequest request) {
+        try {
+            // 获取支付宝GET过来反馈信息
+            Map<String, String> map = AliPayApi.toMap(request);
+            System.out.println("return_url");
+            System.out.println(map.toString());
+            for (Map.Entry<String, String> entry : map.entrySet()) {
+                System.out.println(entry.getKey() + " = " + entry.getValue());
+            }
+
+            boolean verifyResult = AlipaySignature.rsaCheckV1(map, publicKey, "UTF-8",
+                    "RSA2");
+
+            if (verifyResult) {
+                // TODO 请在这里加上商户的业务逻辑程序代码
+                System.out.println("return_url 验证成功");
+
+                return new CommonResult().success();
+            } else {
+                System.out.println("return_url 验证失败");
+                // TODO
+                return new CommonResult().failed();
+            }
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+            return "failure";
+        }
+    }
+
+
+    @RequestMapping(value = "/notify_url")
+    @ResponseBody
+    public Object notifyUrl(HttpServletRequest request) {
+        try {
+            // 获取支付宝POST过来反馈信息
+            Map<String, String> params = AliPayApi.toMap(request);
+            System.out.println("notify_url");
+            System.out.println(params.toString());
+            for (Map.Entry<String, String> entry : params.entrySet()) {
+                System.out.println(entry.getKey() + " = " + entry.getValue());
+            }
+            String out_trade_no = params.get("out_trade_no");
+            OmsOrder param = new OmsOrder();
+            param.setOrderSn(out_trade_no);
+            List<OmsOrder> list = orderService.list(new QueryWrapper<>(param));
+            OmsOrder orderInfo = list.get(0);
+            orderInfo.setStatus(OrderStatus.TO_DELIVER.getValue());
+            orderInfo.setPaymentTime(new Date());
+            boolean verifyResult = AlipaySignature.rsaCheckV1(params, publicKey, "UTF-8", "RSA2");
+
+            if (verifyResult) {
+                // 更新订单信息
+                orderService.updateById(orderInfo);
+                // TODO 请在这里加上商户的业务逻辑程序代码 异步通知可能出现订单重复通知 需要做去重处理
+                System.out.println("notify_url 验证成功succcess");
+                return new CommonResult().success();
+            } else {
+                log.error("订单" + out_trade_no + "支付失败");
+                orderService.releaseStock(orderInfo);
+                // TODO
+                return new CommonResult().failed();
+            }
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+            return "failure";
+        }
+    }
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/jdpay/AppParams.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/jdpay/AppParams.java
new file mode 100644
index 0000000000000000000000000000000000000000..73b9705c65b3715f716433872f7fe118162612e7
--- /dev/null
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/jdpay/AppParams.java
@@ -0,0 +1,73 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p> 京东APP支付 </p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.pay.controller.jdpay;
+
+public class AppParams {
+    private String orderId;
+    private String merchant;
+    private String appId;
+    private String signData;
+    private String extraInfo;
+
+    public AppParams() {
+    }
+
+    public AppParams(String orderId, String merchant, String appId, String signData, String extraInfo) {
+        this.orderId = orderId;
+        this.merchant = merchant;
+        this.appId = appId;
+        this.signData = signData;
+        this.extraInfo = extraInfo;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getMerchant() {
+        return merchant;
+    }
+
+    public void setMerchant(String merchant) {
+        this.merchant = merchant;
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public String getSignData() {
+        return signData;
+    }
+
+    public void setSignData(String signData) {
+        this.signData = signData;
+    }
+
+    public String getExtraInfo() {
+        return extraInfo;
+    }
+
+    public void setExtraInfo(String extraInfo) {
+        this.extraInfo = extraInfo;
+    }
+}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/jdpay/JdPayController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/jdpay/JdPayController.java
new file mode 100644
index 0000000000000000000000000000000000000000..013ab437409fdabe3645cda8f23ddbb416f944cf
--- /dev/null
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/jdpay/JdPayController.java
@@ -0,0 +1,362 @@
+package com.zscat.mallplus.pay.controller.jdpay;
+
+import cn.hutool.core.codec.Base64;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.XmlUtil;
+import com.zscat.mallplus.jdpay.JdPayApi;
+import com.zscat.mallplus.jdpay.kit.JdPayKit;
+import com.zscat.mallplus.jdpay.model.*;
+import com.zscat.mallplus.pay.entity.JdPayBean;
+import com.zscat.mallplus.pay.vo.AjaxResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>微信支付 Demo</p>
+ *
+ * @author Javen
+ */
+@Controller
+@RequestMapping("/api/JDPay")
+public class JdPayController {
+    @Autowired
+    JdPayBean jdPayBean;
+    private Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @RequestMapping("")
+    @ResponseBody
+    public String index() {
+        log.info("欢迎使用 IJPay 中的京东支付 -By Javen  <br/><br>  交流群：723992875");
+        log.info(jdPayBean.toString());
+        return ("欢迎使用 IJPay 中的京东支付 -By Javen  <br/><br>  交流群：723992875");
+    }
+
+    @GetMapping("/test")
+    @ResponseBody
+    public JdPayBean test() {
+        return jdPayBean;
+    }
+
+    /**
+     * App 支付
+     *
+     * @return
+     */
+    @RequestMapping(value = "/appPay", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public AjaxResult appPay() {
+        String reqXml = UniOrderModel.builder()
+                .version("V2.0")
+                .merchant(jdPayBean.getMchId())
+                .tradeNum(System.currentTimeMillis() + "")
+                .tradeName("IJPay 让支付触手可及")
+                .tradeDesc("https://gitee.com/javen205/IJPay")
+                .tradeTime(DateUtil.format(new Date(), "yyyyMMddHHmmss"))
+                .amount("1")
+                .orderType("1")
+                .currency("CNY")
+                .note("备注")
+                .notifyUrl("http://jdpaydemo.jd.com/asynNotify.htm")
+                .tradeType("GEN")
+                .build()
+                .genReqXml(jdPayBean.getRsaPrivateKey(), jdPayBean.getDesKey(), "V2.0", jdPayBean.getMchId());
+
+        // 执行请求
+        String resultData = JdPayApi.uniOrder(reqXml);
+
+        log.info("resultData:" + resultData);
+
+        // 解析响应的 xml 数据
+        Map<String, String> map = JdPayKit.parseResp(resultData);
+
+        String code = map.get("code");
+        String encrypt = map.get("encrypt");
+        if (!"000000".equals(code)) {
+            String desc = map.get("desc");
+            return new AjaxResult().addError(desc);
+        }
+        // 解密并验证签名
+        String decrypt = JdPayKit.decrypt(jdPayBean.getRsaPublicKey(), jdPayBean.getDesKey(), encrypt);
+
+        log.info("decrypt>" + decrypt);
+
+        // 将 xml 转化为 map
+        Map<String, Object> toMap = XmlUtil.xmlToMap(decrypt);
+
+        log.info("result toMap>" + toMap);
+
+
+        String orderId = (String) toMap.get("orderId");
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("merchant=").append(jdPayBean.getMchId());
+        sb.append("&orderId=").append(orderId);
+        sb.append("&key=").append("test");
+        String sign = JdPayKit.md5LowerCase(sb.toString());
+
+        return new AjaxResult().success(new AppParams(orderId, jdPayBean.getMchId(), "123456789",
+                sign, "123456789"));
+    }
+
+    /**
+     * PC H5 支付
+     *
+     * @param payType
+     * @return
+     */
+    @RequestMapping(value = "/saveOrder", method = {RequestMethod.POST, RequestMethod.GET})
+    public ModelAndView saveOrder(@RequestParam("payType") String payType) {
+
+        ModelAndView mv = new ModelAndView();
+
+        Map<String, String> map = SaveOrderModel.builder()
+                .version("V2.0")
+                .merchant(jdPayBean.getMchId())
+                .tradeNum(System.currentTimeMillis() + "")
+                .tradeName("IJPay")
+                .tradeDesc("IJPay 让支付触手可及")
+                .tradeTime(DateUtil.format(new Date(), "yyyyMMddHHmmss"))
+                .amount("10000")
+                .orderType("0")
+                .currency("CNY")
+                .note("IJPay 了解一下")
+                .callbackUrl("https://jdpay.com")
+                .notifyUrl("https://jdpay.com")
+                .userId("IJPay001")
+                .build()
+                .createSign(jdPayBean.getRsaPrivateKey(), jdPayBean.getDesKey());
+
+        mv.addObject("map", map);
+        mv.addObject("payUrl", payType.equals("pc") ? JdPayApi.PC_SAVE_ORDER_URL : JdPayApi.H5_SAVE_ORDER_URL);
+        mv.setViewName("jd_pc_h5.html");
+        return mv;
+    }
+
+    /**
+     * 商户二维码支付
+     */
+    @RequestMapping(value = "/customerPay", method = {RequestMethod.POST, RequestMethod.GET})
+    public ModelAndView customerPay() {
+
+        ModelAndView mv = new ModelAndView();
+
+        Map<String, String> map = CustomerPayModel.builder()
+                .version("V2.0")
+                .merchant(jdPayBean.getMchId())
+                .tradeNum(System.currentTimeMillis() + "")
+                .tradeName("IJPay")
+                .tradeDesc("IJPay 让支付触手可及")
+                .tradeTime(DateUtil.format(new Date(), "yyyyMMddHHmmss"))
+//                .amount("1000")
+                .orderType("0")
+                .currency("CNY")
+                .note("IJPay 了解一下")
+                .notifyUrl("https://jdpay.com")
+                .build()
+                .createSign(jdPayBean.getRsaPrivateKey(), jdPayBean.getDesKey());
+
+        mv.addObject("map", map);
+        mv.addObject("payUrl", JdPayApi.CUSTOMER_PAY_URL);
+        mv.setViewName("jd_customer_pay.html");
+        return mv;
+    }
+
+    @RequestMapping(value = "/queryOrder", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public AjaxResult queryOrder(@RequestParam("tradeType") String tradeType,
+                                 @RequestParam("oTradeNum") String oTradeNum,
+                                 @RequestParam("tradeNum") String tradeNum) {
+        String reqXml = QueryOrderModel.builder()
+                .version("V2.0")
+                .merchant(jdPayBean.getMchId())
+                .tradeNum(tradeNum)
+                .tradeType(tradeType)
+                .oTradeNum(oTradeNum)
+                .build()
+                .genReqXml(jdPayBean.getRsaPrivateKey(), jdPayBean.getDesKey(), "V2.0", jdPayBean.getMchId());
+        String queryResult = JdPayApi.queryOrder(reqXml);
+        log.info("queryResult:" + queryResult);
+
+        // 解析响应的 xml 数据
+        Map<String, String> map = JdPayKit.parseResp(queryResult);
+
+        String code = map.get("code");
+        String encrypt = map.get("encrypt");
+        if (!"000000".equals(code)) {
+            String desc = map.get("desc");
+            return new AjaxResult().addError(desc);
+        }
+        // 解密并验证签名
+        String decrypt = JdPayKit.decrypt(jdPayBean.getRsaPublicKey(), jdPayBean.getDesKey(), encrypt);
+
+        log.info("decrypt>" + decrypt);
+
+        return new AjaxResult().success(decrypt);
+    }
+
+    @RequestMapping(value = "/fkmPay", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public AjaxResult fkmPay(@RequestParam("token") String token,
+                             @RequestParam("amount") String amount) {
+        String reqXml = FkmModel.builder()
+                .token(token)
+                .version("V2.0")
+                .merchant(jdPayBean.getMchId())
+                .device("IJPay Dev")
+                .tradeNum(System.currentTimeMillis() + "")
+                .tradeName("IJPay 刷卡支付")
+                .tradeDesc("IJPay 了解一下")
+                .tradeTime(DateUtil.format(new Date(), "yyyyMMddHHmmss"))
+                .amount(amount)
+                .currency("CNY")
+                .note("备注")
+                .notifyUrl("https://gitee.com/javen205/IJPay")
+                .build()
+                .genReqXml(jdPayBean.getRsaPrivateKey(), jdPayBean.getDesKey(), "V2.0", jdPayBean.getMchId());
+        String queryResult = JdPayApi.fkmPay(reqXml);
+        log.info("queryResult:" + queryResult);
+
+        // 解析响应的 xml 数据
+        Map<String, String> map = JdPayKit.parseResp(queryResult);
+
+        String code = map.get("code");
+        String encrypt = map.get("encrypt");
+        if (!"000000".equals(code)) {
+            String desc = map.get("desc");
+            return new AjaxResult().addError(desc);
+        }
+        // 解密并验证签名
+        String decrypt = JdPayKit.decrypt(jdPayBean.getRsaPublicKey(), jdPayBean.getDesKey(), encrypt);
+
+        log.info("decrypt>" + decrypt);
+
+        return new AjaxResult().success(decrypt);
+    }
+
+    @RequestMapping(value = "/userRelation", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public AjaxResult userRelation(@RequestParam("userId") String userId,
+                                   @RequestParam("type") String type) {
+        String reqXml = UserRelationModel.builder()
+                .version("V2.0")
+                .merchant(jdPayBean.getMchId())
+                .userId(userId)
+                .build()
+                .genReqXml(jdPayBean.getRsaPrivateKey(), jdPayBean.getDesKey(), "V2.0", jdPayBean.getMchId());
+
+        String result = null;
+
+        if ("get".equals(type)) {
+            result = JdPayApi.getUserRelation(reqXml);
+        } else {
+            result = JdPayApi.cancelUserRelation(reqXml);
+        }
+
+        log.info(result);
+
+        // 解析响应的 xml 数据
+        Map<String, String> map = JdPayKit.parseResp(result);
+
+        String code = map.get("code");
+        String encrypt = map.get("encrypt");
+        if (!"000000".equals(code)) {
+            String desc = map.get("desc");
+            return new AjaxResult().addError(desc);
+        }
+        // 解密并验证签名
+        String decrypt = JdPayKit.decrypt(jdPayBean.getRsaPublicKey(), jdPayBean.getDesKey(), encrypt);
+
+        log.info("decrypt>" + decrypt);
+
+        Map<String, Object> toMap = XmlUtil.xmlToMap(decrypt);
+        System.out.println(toMap);
+        return new AjaxResult().success(decrypt);
+    }
+
+    @RequestMapping(value = "/refund", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public AjaxResult refund(@RequestParam("amount") String amount,
+                             @RequestParam("oTradeNum") String oTradeNum,
+                             @RequestParam("tradeNum") String tradeNum) {
+
+        System.out.println(Base64.encode(FileUtil.readBytes(jdPayBean.getCertPath())));
+        String reqXml = RefundModel.builder()
+                .version("V2.0")
+                .merchant(jdPayBean.getMchId())
+                .tradeNum(tradeNum)
+                .oTradeNum(oTradeNum)
+                .amount(amount)
+                .currency("CNY")
+                .build()
+                .genReqXml(jdPayBean.getRsaPrivateKey(), jdPayBean.getDesKey(), "V2.0", jdPayBean.getMchId());
+        String queryResult = JdPayApi.refund(reqXml);
+        log.info("queryResult:" + queryResult);
+
+        // 解析响应的 xml 数据
+        Map<String, String> map = JdPayKit.parseResp(queryResult);
+
+        String code = map.get("code");
+        String encrypt = map.get("encrypt");
+        if (!"000000".equals(code)) {
+            String desc = map.get("desc");
+            return new AjaxResult().addError(desc);
+        }
+        // 解密并验证签名
+        String decrypt = JdPayKit.decrypt(jdPayBean.getRsaPublicKey(), jdPayBean.getDesKey(), encrypt);
+
+        log.info("decrypt>" + decrypt);
+
+        return new AjaxResult().success(decrypt);
+    }
+
+
+    @RequestMapping(value = "/queryBaiTiaoFq", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public AjaxResult queryBaiTiaoFq(@RequestParam("amount") String amount) {
+        String reqXml = QueryBaiTiaoFqModel.builder()
+                .version("V2.0")
+                .merchant(jdPayBean.getMchId())
+                .tradeNum(System.currentTimeMillis() + "")
+                .amount(amount)
+                .build()
+                .genReqXml(jdPayBean.getRsaPrivateKey(), jdPayBean.getDesKey(), "V2.0", jdPayBean.getMchId());
+
+        String baiTiaoResult = JdPayApi.queryBaiTiaoFq(reqXml);
+
+        log.info(baiTiaoResult);
+
+        // 解析响应的 xml 数据
+        Map<String, String> map = JdPayKit.parseResp(baiTiaoResult);
+
+        String code = map.get("code");
+        String encrypt = map.get("encrypt");
+        if (!"000000".equals(code)) {
+            String desc = map.get("desc");
+            return new AjaxResult().addError(desc);
+        }
+        // 解密并验证签名
+        String decrypt = JdPayKit.decrypt(jdPayBean.getRsaPublicKey(), jdPayBean.getDesKey(), encrypt);
+
+        log.info("decrypt>" + decrypt);
+
+        Map<String, Object> toMap = XmlUtil.xmlToMap(decrypt);
+        System.out.println(toMap);
+        return new AjaxResult().success(decrypt);
+    }
+}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/unionpay/DemoBase.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/unionpay/DemoBase.java
index bc5ba01d69eacb637c046859e896864ad5553d5b..4d190564bfcf8f003063ce9e83b4a80adab8a7ab 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/unionpay/DemoBase.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/unionpay/DemoBase.java
@@ -1,7 +1,7 @@
 package com.zscat.mallplus.pay.controller.unionpay;
 
-import com.jpay.unionpay.SDKConfig;
-import com.jpay.unionpay.SDKConstants;
+import com.zscat.mallplus.unionpay.SDKConfig;
+import com.zscat.mallplus.unionpay.SDKConstants;
 
 import java.io.*;
 import java.text.SimpleDateFormat;
@@ -14,198 +14,202 @@ import java.util.zip.ZipInputStream;
 /**
  * 名称： demo中用到的方法<br>
  * 日期： 2015-09<br>
- * 版本： 1.0.0
+ * <p>
  * 版权： 中国银联<br>
  * 声明：以下代码只是为了方便商户测试而提供的样例代码，商户可以根据自己需要，按照技术文档编写。该代码仅供参考，不提供编码，性能，规范性等方面的保障<br>
  */
 public class DemoBase {
 
-	//默认配置的是UTF-8
-	public static String encoding = "UTF-8";
-
-	//全渠道固定值
-	public static String version = SDKConfig.getConfig().getVersion();
-
-	//后台服务对应的写法参照 FrontRcvResponse.java
-	public static String frontUrl = SDKConfig.getConfig().getFrontUrl();
-
-	//后台服务对应的写法参照 BackRcvResponse.java
-	public static String backUrl = SDKConfig.getConfig().getBackUrl();//受理方和发卡方自选填写的域[O]--后台通知地址
-
-	// 商户发送交易时间 格式:YYYYMMDDhhmmss
-	public static String getCurrentTime() {
-		return new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
-	}
-
-	// AN8..40 商户订单号，不能含"-"或"_"
-	public static String getOrderId() {
-		return new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date());
-	}
-
-   /**
-	 * 组装请求，返回报文字符串用于显示
-	 * @param data
-	 * @return
-	 */
-    public static String genHtmlResult(Map<String, String> data){
-
-    	TreeMap<String, String> tree = new TreeMap<String, String>();
-		Iterator<Entry<String, String>> it = data.entrySet().iterator();
-		while (it.hasNext()) {
-			Entry<String, String> en = it.next();
-			tree.put(en.getKey(), en.getValue());
-		}
-		it = tree.entrySet().iterator();
-		StringBuffer sf = new StringBuffer();
-		while (it.hasNext()) {
-			Entry<String, String> en = it.next();
-			String key = en.getKey();
-			String value =  en.getValue();
-			if("respCode".equals(key)){
-				sf.append("<b>"+key + SDKConstants.EQUAL + value+"</br></b>");
-			}else
-				sf.append(key + SDKConstants.EQUAL + value+"</br>");
-		}
-		return sf.toString();
+    //默认配置的是UTF-8
+    public static String encoding = "UTF-8";
+
+    //全渠道固定值
+    public static String version = SDKConfig.getConfig().getVersion();
+
+    //后台服务对应的写法参照 FrontRcvResponse.java
+    public static String frontUrl = SDKConfig.getConfig().getFrontUrl();
+
+    //后台服务对应的写法参照 BackRcvResponse.java
+    public static String backUrl = SDKConfig.getConfig().getBackUrl();//受理方和发卡方自选填写的域[O]--后台通知地址
+
+    // 商户发送交易时间 格式:YYYYMMDDhhmmss
+    public static String getCurrentTime() {
+        return new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
+    }
+
+    // AN8..40 商户订单号，不能含"-"或"_"
+    public static String getOrderId() {
+        return new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date());
+    }
+
+    /**
+     * 组装请求，返回报文字符串用于显示
+     *
+     * @param data
+     * @return
+     */
+    public static String genHtmlResult(Map<String, String> data) {
+
+        TreeMap<String, String> tree = new TreeMap<String, String>();
+        Iterator<Entry<String, String>> it = data.entrySet().iterator();
+        while (it.hasNext()) {
+            Entry<String, String> en = it.next();
+            tree.put(en.getKey(), en.getValue());
+        }
+        it = tree.entrySet().iterator();
+        StringBuffer sf = new StringBuffer();
+        while (it.hasNext()) {
+            Entry<String, String> en = it.next();
+            String key = en.getKey();
+            String value = en.getValue();
+            if ("respCode".equals(key)) {
+                sf.append("<b>" + key + SDKConstants.EQUAL + value + "</br></b>");
+            } else
+                sf.append(key + SDKConstants.EQUAL + value + "</br>");
+        }
+        return sf.toString();
+    }
+
+    /**
+     * 功能：解析全渠道商户对账文件中的ZM文件并以List<Map>方式返回
+     * 适用交易：对账文件下载后对文件的查看
+     *
+     * @param filePath ZM文件全路径
+     * @return 包含每一笔交易中 序列号 和 值 的map序列
+     */
+    public static List<Map<Integer, String>> parseZMFile(String filePath) {
+        int lengthArray[] = {3, 11, 11, 6, 10, 19, 12, 4, 2, 21, 2, 32, 2, 6, 10, 13, 13, 4, 15, 2, 2, 6, 2, 4, 32, 1, 21, 15, 1, 15, 32, 13, 13, 8, 32, 13, 13, 12, 2, 1, 32, 98};
+        return parseFile(filePath, lengthArray);
+    }
+
+    /**
+     * 功能：解析全渠道商户对账文件中的ZME文件并以List<Map>方式返回
+     * 适用交易：对账文件下载后对文件的查看
+     *
+     * @param filePath ZME文件全路径
+     * @return 包含每一笔交易中 序列号 和 值 的map序列
+     */
+    public static List<Map<Integer, String>> parseZMEFile(String filePath) {
+        int lengthArray[] = {3, 11, 11, 6, 10, 19, 12, 4, 2, 2, 6, 10, 4, 12, 13, 13, 15, 15, 1, 12, 2, 135};
+        return parseFile(filePath, lengthArray);
     }
+
     /**
-	 * 功能：解析全渠道商户对账文件中的ZM文件并以List<Map>方式返回
-	 * 适用交易：对账文件下载后对文件的查看
-	 * @param filePath ZM文件全路径
-	 * @return 包含每一笔交易中 序列号 和 值 的map序列
-	 */
-	public static List<Map> parseZMFile(String filePath){
-		int lengthArray[] = {3,11,11,6,10,19,12,4,2,21,2,32,2,6,10,13,13,4,15,2,2,6,2,4,32,1,21,15,1,15,32,13,13,8,32,13,13,12,2,1,32,98};
-		return parseFile(filePath,lengthArray);
-	}
-
-	/**
-	 * 功能：解析全渠道商户对账文件中的ZME文件并以List<Map>方式返回
-	 * 适用交易：对账文件下载后对文件的查看
-	 * @param filePath ZME文件全路径
-	 * @return 包含每一笔交易中 序列号 和 值 的map序列
-	 */
-	public static List<Map> parseZMEFile(String filePath){
-		int lengthArray[] = {3,11,11,6,10,19,12,4,2,2,6,10,4,12,13,13,15,15,1,12,2,135};
-		return parseFile(filePath,lengthArray);
-	}
-
-	/**
-	 * 功能：解析全渠道商户 ZM,ZME对账文件
-	 * @param filePath
-	 * @param lengthArray 参照《全渠道平台接入接口规范 第3部分 文件接口》 全渠道商户对账文件 6.1 ZM文件和6.2 ZME 文件 格式的类型长度组成int型数组
-	 * @return
-	 */
-	private static List<Map> parseFile(String filePath,int lengthArray[]){
-	 	List<Map> ZmDataList = new ArrayList<Map>();
-	 	try {
-            String encoding="gbk"; //文件是gbk编码
-            File file=new File(filePath);
-            if(file.isFile() && file.exists()){ //判断文件是否存在
+     * 功能：解析全渠道商户 ZM,ZME对账文件
+     *
+     * @param filePath
+     * @param lengthArray 参照《全渠道平台接入接口规范 第3部分 文件接口》 全渠道商户对账文件 6.1 ZM文件和6.2 ZME 文件 格式的类型长度组成int型数组
+     * @return
+     */
+    private static List<Map<Integer, String>> parseFile(String filePath, int lengthArray[]) {
+        List<Map<Integer, String>> ZmDataList = new ArrayList<Map<Integer, String>>();
+        try {
+            String encoding = "UTF-8";
+            File file = new File(filePath);
+            if (file.isFile() && file.exists()) { //判断文件是否存在
                 InputStreamReader read = new InputStreamReader(
-                new FileInputStream(file), "iso-8859-1");
+                        new FileInputStream(file), encoding);//考虑到编码格式
                 BufferedReader bufferedReader = new BufferedReader(read);
                 String lineTxt = null;
-                while((lineTxt = bufferedReader.readLine()) != null){
-                	byte[] bs = lineTxt.getBytes("iso-8859-1");
-                	//解析的结果MAP，key为对账文件列序号，value为解析的值
-        		 	Map<Integer,String> ZmDataMap = new LinkedHashMap<Integer,String>();
+                while ((lineTxt = bufferedReader.readLine()) != null) {
+                    //解析的结果MAP，key为对账文件列序号，value为解析的值
+                    Map<Integer, String> ZmDataMap = new LinkedHashMap<Integer, String>();
                     //左侧游标
                     int leftIndex = 0;
                     //右侧游标
                     int rightIndex = 0;
-                    for(int i=0;i<lengthArray.length;i++){
-                    	rightIndex = leftIndex + lengthArray[i];
-                    	String filed = new String(Arrays.copyOfRange(bs, leftIndex,rightIndex), encoding);
-                    	leftIndex = rightIndex+1;
-                    	ZmDataMap.put(i, filed);
+                    for (int i = 0; i < lengthArray.length; i++) {
+                        rightIndex = leftIndex + lengthArray[i];
+                        String filed = lineTxt.substring(leftIndex, rightIndex);
+                        leftIndex = rightIndex + 1;
+                        ZmDataMap.put(i, filed);
                     }
                     ZmDataList.add(ZmDataMap);
                 }
                 read.close();
-        }else{
-            System.out.println("找不到指定的文件");
-        }
+            } else {
+                System.out.println("找不到指定的文件");
+            }
         } catch (Exception e) {
             System.out.println("读取文件内容出错");
             e.printStackTrace();
         }
 
-		return ZmDataList;
-	}
-
-    public static String getFileContentTable(List<Map> dataList,String file){
-    	StringBuffer  tableSb = new StringBuffer("对账文件的规范参考 https://open.unionpay.com/ajweb/help/file/ 产品接口规范->平台接口规范:文件接口</br> 文件【"+file + "】解析后内容如下：");
-    	tableSb.append("<table border=\"1\">");
-    	if(dataList.size() > 0){
-    		Map<Integer,String> dataMapTmp = dataList.get(0);
-    		tableSb.append("<tr>");
-	 		for(Iterator<Integer> it = dataMapTmp.keySet().iterator();it.hasNext();){
-	 			Integer key = it.next();
-	 			String value = dataMapTmp.get(key);
-		 		System.out.println("序号："+ (key+1) + " 值: '"+ value +"'");
-		 		tableSb.append("<td>序号"+(key+1)+"</td>");
-		 	}
-	 		tableSb.append("</tr>");
-    	}
-
-    	for(int i=0;i<dataList.size();i++){
-	 		System.out.println("行数: "+ (i+1));
-	 		Map<Integer,String> dataMapTmp = dataList.get(i);
-	 		tableSb.append("<tr>");
-	 		for(Iterator<Integer> it = dataMapTmp.keySet().iterator();it.hasNext();){
-	 			Integer key = it.next();
-	 			String value = dataMapTmp.get(key);
-		 		System.out.println("序号："+ (key+1) + " 值: '"+ value +"'");
-		 		tableSb.append("<td>"+value+"</td>");
-		 	}
-	 		tableSb.append("</tr>");
-	 	}
-    	tableSb.append("</table>");
-    	return tableSb.toString();
+        return ZmDataList;
     }
 
+    public static String getFileContentTable(List<Map<Integer, String>> dataList, String file) {
+        StringBuffer tableSb = new StringBuffer("对账文件的规范参考 https://open.unionpay.com/ajweb/help/file/ 产品接口规范->平台接口规范:文件接口</br> 文件【" + file + "】解析后内容如下：");
+        tableSb.append("<table border=\"1\">");
+        if (dataList.size() > 0) {
+            Map<Integer, String> dataMapTmp = dataList.get(0);
+            tableSb.append("<tr>");
+            for (Iterator<Integer> it = dataMapTmp.keySet().iterator(); it.hasNext(); ) {
+                Integer key = it.next();
+                String value = dataMapTmp.get(key);
+                System.out.println("序号：" + (key + 1) + " 值: '" + value + "'");
+                tableSb.append("<td>序号" + (key + 1) + "</td>");
+            }
+            tableSb.append("</tr>");
+        }
 
-	public static List<String> unzip(String zipFilePath,String outPutDirectory){
-		List<String> fileList = new ArrayList<String>();
-		try {
+        for (int i = 0; i < dataList.size(); i++) {
+            System.out.println("行数: " + (i + 1));
+            Map<Integer, String> dataMapTmp = dataList.get(i);
+            tableSb.append("<tr>");
+            for (Iterator<Integer> it = dataMapTmp.keySet().iterator(); it.hasNext(); ) {
+                Integer key = it.next();
+                String value = dataMapTmp.get(key);
+                System.out.println("序号：" + (key + 1) + " 值: '" + value + "'");
+                tableSb.append("<td>" + value + "</td>");
+            }
+            tableSb.append("</tr>");
+        }
+        tableSb.append("</table>");
+        return tableSb.toString();
+    }
+
+
+    public static List<String> unzip(String zipFilePath, String outPutDirectory) {
+        List<String> fileList = new ArrayList<String>();
+        try {
             ZipInputStream zin = new ZipInputStream(new FileInputStream(zipFilePath));//输入源zip路径
             BufferedInputStream bin = new BufferedInputStream(zin);
             BufferedOutputStream bout = null;
-            File file=null;
+            File file = null;
             ZipEntry entry;
             try {
-                while((entry = zin.getNextEntry())!=null && !entry.isDirectory()){
-                	file = new File(outPutDirectory,entry.getName());
-                    if(!file.exists()){
+                while ((entry = zin.getNextEntry()) != null && !entry.isDirectory()) {
+                    file = new File(outPutDirectory, entry.getName());
+                    if (!file.exists()) {
                         (new File(file.getParent())).mkdirs();
                     }
                     bout = new BufferedOutputStream(new FileOutputStream(file));
                     int b;
-                    while((b=bin.read())!=-1){
-                    	bout.write(b);
+                    while ((b = bin.read()) != -1) {
+                        bout.write(b);
                     }
                     bout.flush();
                     fileList.add(file.getAbsolutePath());
-                    System.out.println(file+"解压成功");
+                    System.out.println(file + "解压成功");
                 }
             } catch (IOException e) {
                 e.printStackTrace();
-            }finally{
+            } finally {
                 try {
-					bin.close();
-					zin.close();
-					if(bout!=null){
-						bout.close();
-					}
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
+                    bin.close();
+                    zin.close();
+                    if (bout != null) {
+                        bout.close();
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
             }
         } catch (FileNotFoundException e) {
             e.printStackTrace();
         }
-		return fileList;
-	}
+        return fileList;
+    }
 
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/unionpay/UnionPayController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/unionpay/UnionPayController.java
index b243b1b652917dad731d27dd6fb4213b23ca517d..b015360dbb1751cfa6b61ff0f582e35d0dac419e 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/unionpay/UnionPayController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/unionpay/UnionPayController.java
@@ -1,973 +1,996 @@
 package com.zscat.mallplus.pay.controller.unionpay;
 
-import com.jpay.ext.kit.DateKit;
-import com.jpay.ext.kit.HttpKit;
-import com.jpay.unionpay.*;
-import com.jpay.vo.AjaxResult;
-import com.zscat.mallplus.util.JsonUtils;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONUtil;
+import com.zscat.mallplus.pay.vo.AjaxResult;
+import com.zscat.mallplus.unionpay.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.*;
-import java.util.Map.Entry;
 
-@RestController
-@RequestMapping("/unionpay")
+@Controller
+@RequestMapping("/api/unionPay")
 public class UnionPayController {
-	private static final Logger logger = LoggerFactory.getLogger(UnionPayController.class);
-
-	private AjaxResult ajax = new AjaxResult();
-
-
-	@RequestMapping("")
-	@ResponseBody
-	public String index() {
-		logger.info("欢迎使用IJPay银联支付	- by Javen");
-		return "欢迎使用IJPay银联支付	- by Javen";
-	}
-
-	/**
-	 * PC网关支付
-	 * B2C跟B2B查询区别就在于bizType的不同
-	 */
-	@RequestMapping(value = "/frontConsume",method={RequestMethod.POST,RequestMethod.GET})
-	@ResponseBody
-	public void frontConsume(HttpServletResponse response) {
-		try {
-			Map<String, String> createMap = UnionPayApiConfig.builder()
+    private static final Logger logger = LoggerFactory.getLogger(UnionPayController.class);
+
+    private AjaxResult ajax = new AjaxResult();
+
+    /**
+     * 将回调参数转为Map
+     *
+     * @param notifyStr
+     * @return {Map<String, String>}
+     */
+    public static Map<String, String> getAllRequestParamToMap(final String notifyStr) {
+        Map<String, String> res = new HashMap<String, String>();
+        try {
+            logger.info("收到通知报文：" + notifyStr);
+            String[] kvs = notifyStr.split("&");
+            for (String kv : kvs) {
+                String[] tmp = kv.split("=");
+                if (tmp.length >= 2) {
+                    String key = tmp[0];
+                    String value = URLDecoder.decode(tmp[1], "UTF-8");
+                    res.put(key, value);
+                }
+            }
+        } catch (UnsupportedEncodingException e) {
+            logger.info("getAllRequestParamStream.UnsupportedEncodingException error: " + e.getClass() + ":"
+                    + e.getMessage());
+        }
+        return res;
+    }
+
+    /**
+     * 组装请求，返回报文字符串用于显示
+     *
+     * @param data
+     * @return {String}
+     */
+    public static String getHtmlResult(Map<String, String> data) {
+
+        TreeMap<String, String> tree = new TreeMap<String, String>();
+        Iterator<Map.Entry<String, String>> it = data.entrySet().iterator();
+        while (it.hasNext()) {
+            Map.Entry<String, String> en = it.next();
+            tree.put(en.getKey(), en.getValue());
+        }
+        it = tree.entrySet().iterator();
+        StringBuffer sf = new StringBuffer();
+        while (it.hasNext()) {
+            Map.Entry<String, String> en = it.next();
+            String key = en.getKey();
+            String value = en.getValue();
+            if ("respCode".equals(key)) {
+                sf.append("<b>" + key + "=" + value + "</br></b>");
+            } else
+                sf.append(key + "=" + value + "</br>");
+        }
+        return sf.toString();
+    }
+
+    public static String readData(HttpServletRequest request) {
+        BufferedReader br = null;
+        try {
+            StringBuilder result = new StringBuilder();
+            br = request.getReader();
+            for (String line; (line = br.readLine()) != null; ) {
+                if (result.length() > 0) {
+                    result.append("\n");
+                }
+                result.append(line);
+            }
+
+            return result.toString();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } finally {
+            if (br != null)
+                try {
+                    br.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+        }
+    }
+
+    @RequestMapping("")
+    @ResponseBody
+    public String index() {
+        logger.info("欢迎使用IJPay银联支付	- by Javen");
+        return "欢迎使用IJPay银联支付	- by Javen";
+    }
+
+    /**
+     * PC网关支付
+     * B2C跟B2B查询区别就在于bizType的不同
+     */
+    @RequestMapping(value = "/frontConsume", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public void frontConsume(HttpServletResponse response) {
+        try {
+            Map<String, String> createMap = UnionPayApiConfig.builder()
 //					.setChannelType("07") 默认值就是07
-					.setMerId("777290058151764")
-					.setTxnAmt("6666")
-					.setReqReserved("reqReserved")
+                    .setMerId("777290058151764")
+                    .setTxnAmt("6666")
+                    .setReqReserved("reqReserved")
 //					.setFrontUrl(SDKConfig.getConfig().getFrontUrl()) 有默认值
 //					.setBackUrl(SDKConfig.getConfig().getBackUrl()) 有默认值
-					.createMap();
-			UnionPayApi.frontRequest(response, createMap);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	/**
-	 * B2B的网关支付
-	 * B2C跟B2B查询区别就在于bizType的不同
-	 */
-	@RequestMapping(value = "/frontConsume2",method={RequestMethod.POST,RequestMethod.GET})
-	@ResponseBody
-	public void frontConsume2(HttpServletResponse response) {
-		try {
-			Map<String, String> createMap = UnionPayApiConfig.builder()
-					.setBizType("000202")
-					.setChannelType("07")
-					.setMerId("777290058151764")
-					.setTxnAmt("2222")
-					.setReqReserved("reqReserved")
-					.createMap();
-			UnionPayApi.frontRequest(response, createMap);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * WAP支付 请在手机端访问此action
-	 */
-	@RequestMapping(value = "/wapConsume",method={RequestMethod.POST,RequestMethod.GET})
-	@ResponseBody
-	public void wapConsume(HttpServletResponse response) {
-		try {
-			Map<String, String> createMap = UnionPayApiConfig.builder()
-					.setChannelType("08")
-					.setMerId("777290058151764")
-					.setTxnAmt("6868")
-					.setReqReserved("reqReserved")
-					.setFrontUrl(SDKConfig.getConfig().getFrontUrl())
-					.setBackUrl(SDKConfig.getConfig().getBackUrl())
-					.createMap();
-			UnionPayApi.frontRequest(response, createMap);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * APP支付获取tn
-	 */
-	@RequestMapping(value = "/appConsume",method={RequestMethod.POST,RequestMethod.GET})
-	@ResponseBody
-	public AjaxResult appConsume() {
-		try {
-			Map<String, String> reqData = UnionPayApiConfig.builder()
-					.setChannelType("08")
-					.setMerId("777290058151764")
-					.setTxnAmt("8888")
-					.setReqReserved("reqReserved")
-					.setBackUrl(SDKConfig.getConfig().getBackUrl())
-					.createMap();
-			Map<String, String> rspData = UnionPayApi.AppConsumeByMap(reqData);
-			// 应答码规范参考open.unionpay.com帮助中心 下载 产品接口规范 《平台接入接口规范-第5部分-附录》
-			if (!rspData.isEmpty()) {
-				if (AcpService.validate(rspData, "UTF-8")) {
-					logger.info("验证签名成功");
-					String respCode = rspData.get("respCode");
-					if (("00").equals(respCode)) {
-						// 成功,获取tn号
-						String tn = rspData.get("tn");
-						ajax.success(tn);
-					} else {
-						// 其他应答码为失败请排查原因或做失败处理
-						ajax.addError(respCode);
-					}
-				} else {
-					logger.error("验证签名失败");
-					// 检查验证签名失败的原因
-					ajax.addError("验证签名失败");
-				}
-			} else {
-				// 未返回正确的http状态
-				logger.error("未获取到返回报文或返回http状态码非200");
-				ajax.addError("未获取到返回报文或返回http状态码非200");
-			}
-			String reqMessage = getHtmlResult(reqData);
-			String rspMessage = getHtmlResult(rspData);
-			logger.info("app>reqMessage>>>" + reqMessage + " rspMessage>>>" + rspMessage);
-			return ajax;
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	/**
-	 * 订单状态查询
-	 * B2C跟B2B查询区别就在于bizType的不同
-	 */
-	@RequestMapping(value = "/query",method={RequestMethod.POST,RequestMethod.GET})
-	@ResponseBody
-	public void query(HttpServletResponse response){
-		try {
-			Map<String, String> reqData = UnionPayApiConfig.builder()
-					.setTxnType("00")
-					.setTxnSubType("00")
-					.setBizType("000301")
-					.setMerId("777290058151764")
+                    .createMap();
+            UnionPayApi.frontRequest(response, createMap);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * B2B的网关支付 B2C跟B2B查询区别就在于bizType的不同
+     */
+    @RequestMapping(value = "/frontConsume2", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public void frontConsume2(HttpServletResponse response) {
+        try {
+            Map<String, String> createMap = UnionPayApiConfig.builder()
+                    .setBizType("000202")
+                    .setChannelType("07")
+                    .setMerId("777290058151764")
+                    .setTxnAmt("2222")
+                    .setReqReserved("reqReserved")
+                    .createMap();
+            UnionPayApi.frontRequest(response, createMap);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * WAP支付 请在手机端访问此action
+     */
+    @RequestMapping(value = "/wapConsume", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public void wapConsume(HttpServletResponse response) {
+        try {
+            Map<String, String> createMap = UnionPayApiConfig.builder()
+                    .setChannelType("08")
+                    .setMerId("777290058151764")
+                    .setTxnAmt("6868")
+                    .setReqReserved("reqReserved")
+                    .setFrontUrl(SDKConfig.getConfig().getFrontUrl())
+                    .setBackUrl(SDKConfig.getConfig().getBackUrl())
+                    .createMap();
+            UnionPayApi.frontRequest(response, createMap);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * APP支付获取tn
+     */
+    @RequestMapping(value = "/appConsume", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public AjaxResult appConsume() {
+        try {
+            Map<String, String> reqData = UnionPayApiConfig.builder()
+                    .setChannelType("08")
+                    .setMerId("777290058151764")
+                    .setTxnAmt("8888")
+                    .setReqReserved("reqReserved")
+                    .setBackUrl(SDKConfig.getConfig().getBackUrl())
+                    .createMap();
+            Map<String, String> rspData = UnionPayApi.AppConsumeByMap(reqData);
+            // 应答码规范参考open.unionpay.com帮助中心 下载 产品接口规范 《平台接入接口规范-第5部分-附录》
+            if (!rspData.isEmpty()) {
+                if (AcpService.validate(rspData, "UTF-8")) {
+                    logger.info("验证签名成功");
+                    String respCode = rspData.get("respCode");
+                    if (("00").equals(respCode)) {
+                        // 成功,获取tn号
+                        String tn = rspData.get("tn");
+                        ajax.success(tn);
+                    } else {
+                        // 其他应答码为失败请排查原因或做失败处理
+                        ajax.addError(respCode);
+                    }
+                } else {
+                    logger.error("验证签名失败");
+                    // 检查验证签名失败的原因
+                    ajax.addError("验证签名失败");
+                }
+            } else {
+                // 未返回正确的http状态
+                logger.error("未获取到返回报文或返回http状态码非200");
+                ajax.addError("未获取到返回报文或返回http状态码非200");
+            }
+            String reqMessage = getHtmlResult(reqData);
+            String rspMessage = getHtmlResult(rspData);
+            logger.info("app>reqMessage>>>" + reqMessage + " rspMessage>>>" + rspMessage);
+            return ajax;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 订单状态查询B2C跟B2B查询区别就在于bizType的不同
+     */
+    @RequestMapping(value = "/query", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public void query(HttpServletResponse response) {
+        try {
+            Map<String, String> reqData = UnionPayApiConfig.builder()
+                    .setTxnType("00")
+                    .setTxnSubType("00")
+                    .setBizType("000301")
+                    .setMerId("777290058151764")
 //					.setOrderId("1507214190872")
 //					.setTxnTime("20171005223630")
-					.setOrderId("1508488509626")
-					.setTxnTime("20171020163509")
-					.createMap();
-			Map<String, String> rspData = UnionPayApi.singleQueryByMap(reqData);
-			if(!rspData.isEmpty()){
-				if(AcpService.validate(rspData, "UTF-8")){
-					logger.info("验证签名成功");
-					if("00".equals(rspData.get("respCode"))){//如果查询交易成功
-						//处理被查询交易的应答码逻辑
-						String origRespCode = rspData.get("origRespCode");
-						if("00".equals(origRespCode)){
-							//交易成功，更新商户订单状态
-						}else if("03".equals(origRespCode) ||
-								 "04".equals(origRespCode) ||
-								 "05".equals(origRespCode)){
-							//需再次发起交易状态查询交易
-						}else{
-							//其他应答码为失败请排查原因
-						}
-					}else{//查询交易本身失败，或者未查到原交易，检查查询交易报文要素
-					}
-				}else{
-					logger.error("验证签名失败");
-					// 检查验证签名失败的原因
-				}
-			}else{
-				//未返回正确的http状态
-				logger.error("未获取到返回报文或返回http状态码非200");
-			}
-			String reqMessage = getHtmlResult(reqData);
-			String rspMessage = getHtmlResult(rspData);
-			response.getWriter().println("</br>请求报文:<br/>"+reqMessage+"<br/>" + "应答报文:</br>"+rspMessage+"");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-
-	/**
-	 * 订单状态查询 B2B
-	 * B2C跟B2B查询区别就在于bizType的不同
-	 */
-	@RequestMapping(value = "/queryB2B",method={RequestMethod.POST,RequestMethod.GET})
-	@ResponseBody
-	public void queryB2B(HttpServletResponse response){
-		try {
-			Map<String, String> reqData = UnionPayApiConfig.builder()
-					.setBizType("000202")
-					.setTxnType("00")
-					.setTxnSubType("00")
-					.setMerId("777290058151764")
-					.setOrderId("1507277885640")
-					.setTxnTime("20171006161805")
-					.createMap();
-			Map<String, String> rspData = UnionPayApi.singleQueryByMap(reqData);
-			if(!rspData.isEmpty()){
-				if(AcpService.validate(rspData, "UTF-8")){
-					logger.info("验证签名成功");
-					if("00".equals(rspData.get("respCode"))){//如果查询交易成功
-						//处理被查询交易的应答码逻辑
-						String origRespCode = rspData.get("origRespCode");
-						if("00".equals(origRespCode)){
-							//交易成功，更新商户订单状态
-						}else if("03".equals(origRespCode) ||
-								 "04".equals(origRespCode) ||
-								 "05".equals(origRespCode)){
-							//需再次发起交易状态查询交易
-						}else{
-							//其他应答码为失败请排查原因
-						}
-					}else{//查询交易本身失败，或者未查到原交易，检查查询交易报文要素
-					}
-				}else{
-					logger.error("验证签名失败");
-					// 检查验证签名失败的原因
-				}
-			}else{
-				//未返回正确的http状态
-				logger.error("未获取到返回报文或返回http状态码非200");
-			}
-			String reqMessage = getHtmlResult(reqData);
-			String rspMessage = getHtmlResult(rspData);
-			response.getWriter().println("</br>请求报文:<br/>"+reqMessage+"<br/>" + "应答报文:</br>"+rspMessage+"");
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-
-	@RequestMapping(value = "/refund",method={RequestMethod.POST,RequestMethod.GET})
-	@ResponseBody
-	public void refund(HttpServletResponse response){
-		try {
-			Map<String, String> reqData = UnionPayApiConfig.builder()
-					.setTxnType("04") //交易类型 04-退货	31-消费撤销
-					.setTxnSubType("00") //交易子类型  默认00
-					.setBizType("000201") //业务类型 B2C网关支付，手机wap支付
-					.setChannelType("07") //渠道类型，07-PC，08-手机
-					.setMerId("777290058151764")
-					.setOrderId(String.valueOf(System.currentTimeMillis()))//商户订单号，8-40位数字字母，不能含“-”或“_”，可以自行定制规则，重新产生，不同于原消费
-					.setTxnTime(DateKit.toStr(new Date(), DateKit.UnionTimeStampPattern))//订单发送时间，格式为YYYYMMDDhhmmss，必须取当前时间，否则会报txnTime无效
-					.setTxnAmt("6666")
-					.setBackUrl(SDKConfig.getConfig().getBackUrl())
-					.setOrigQryId("201710061443208788498") //****原消费交易返回的的queryId，可以从消费交易后台通知接口中或者交易状态查询接口中获取
-					.createMap();
-			Map<String, String> rspData = UnionPayApi.backRequestByMap(reqData);
-			if(!rspData.isEmpty()){
-				if(AcpService.validate(rspData, "UTF-8")){
-					logger.info("验证签名成功");
-					String respCode = rspData.get("respCode");
-					if("00".equals(respCode)){
-						//交易已受理，等待接收后台通知更新订单状态,也可以主动发起 查询交易确定交易状态。
-					}else if("03".equals(respCode)||
-							 "04".equals(respCode)||
-							 "05".equals(respCode)){
-						//后续需发起交易状态查询交易确定交易状态
-					}else{
-						//其他应答码为失败请排查原因
-					}
-				}else{
-					logger.error("验证签名失败");
-					// 检查验证签名失败的原因
-				}
-			}else{
-				//未返回正确的http状态
-				logger.error("未获取到返回报文或返回http状态码非200");
-			}
-
-			String reqMessage = getHtmlResult(reqData);
-			String rspMessage = getHtmlResult(rspData);
-			response.getWriter().println("</br>请求报文:<br/>"+reqMessage+"<br/>" + "应答报文:</br>"+rspMessage+"");
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	/**
-	 * 测试通过
-	 * https://open.unionpay.com/ajweb/help/faq/list?id=95&level=0&from=0
-	 * java.lang.RuntimeException: Unexpected code Response{protocol=http/1.1, code=500, message=Internal Server Error, url=https://filedownload.test.95516.com/}
-	 */
-	@RequestMapping(value = "/fileTransfer",method={RequestMethod.POST,RequestMethod.GET})
-	@ResponseBody
-	public void fileTransfer(HttpServletResponse response){
-		try {
+                    .setOrderId("1508488509626")
+                    .setTxnTime("20171020163509")
+                    .createMap();
+            Map<String, String> rspData = UnionPayApi.singleQueryByMap(reqData);
+            if (!rspData.isEmpty()) {
+                if (AcpService.validate(rspData, "UTF-8")) {
+                    logger.info("验证签名成功");
+                    if ("00".equals(rspData.get("respCode"))) {//如果查询交易成功
+                        //处理被查询交易的应答码逻辑
+                        String origRespCode = rspData.get("origRespCode");
+                        if ("00".equals(origRespCode)) {
+                            //交易成功，更新商户订单状态
+                        } else if ("03".equals(origRespCode) ||
+                                "04".equals(origRespCode) ||
+                                "05".equals(origRespCode)) {
+                            //需再次发起交易状态查询交易
+                        } else {
+                            //其他应答码为失败请排查原因
+                        }
+                    } else {//查询交易本身失败，或者未查到原交易，检查查询交易报文要素
+                    }
+                } else {
+                    logger.error("验证签名失败");
+                    // 检查验证签名失败的原因
+                }
+            } else {
+                //未返回正确的http状态
+                logger.error("未获取到返回报文或返回http状态码非200");
+            }
+            String reqMessage = getHtmlResult(reqData);
+            String rspMessage = getHtmlResult(rspData);
+            response.getWriter().println("</br>请求报文:<br/>" + reqMessage + "<br/>" + "应答报文:</br>" + rspMessage + "");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 订单状态查询 B2B
+     * B2C跟B2B查询区别就在于bizType的不同
+     */
+    @RequestMapping(value = "/queryB2B", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public void queryB2B(HttpServletResponse response) {
+        try {
+            Map<String, String> reqData = UnionPayApiConfig.builder()
+                    .setBizType("000202")
+                    .setTxnType("00")
+                    .setTxnSubType("00")
+                    .setMerId("777290058151764")
+                    .setOrderId("1507277885640")
+                    .setTxnTime(DateUtil.format(new Date(), "yyyyMMddHHmmss"))
+                    .createMap();
+            Map<String, String> rspData = UnionPayApi.singleQueryByMap(reqData);
+            if (!rspData.isEmpty()) {
+                if (AcpService.validate(rspData, "UTF-8")) {
+                    logger.info("验证签名成功");
+                    if ("00".equals(rspData.get("respCode"))) {//如果查询交易成功
+                        //处理被查询交易的应答码逻辑
+                        String origRespCode = rspData.get("origRespCode");
+                        if ("00".equals(origRespCode)) {
+                            //交易成功，更新商户订单状态
+                        } else if ("03".equals(origRespCode) ||
+                                "04".equals(origRespCode) ||
+                                "05".equals(origRespCode)) {
+                            //需再次发起交易状态查询交易
+                        } else {
+                            //其他应答码为失败请排查原因
+                        }
+                    } else {//查询交易本身失败，或者未查到原交易，检查查询交易报文要素
+                    }
+                } else {
+                    logger.error("验证签名失败");
+                    // 检查验证签名失败的原因
+                }
+            } else {
+                //未返回正确的http状态
+                logger.error("未获取到返回报文或返回http状态码非200");
+            }
+            String reqMessage = getHtmlResult(reqData);
+            String rspMessage = getHtmlResult(rspData);
+            response.getWriter().println("</br>请求报文:<br/>" + reqMessage + "<br/>" + "应答报文:</br>" + rspMessage + "");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @RequestMapping(value = "/refund", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public void refund(HttpServletResponse response) {
+        try {
+            Map<String, String> reqData = UnionPayApiConfig.builder()
+                    .setTxnType("04") //交易类型 04-退货	31-消费撤销
+                    .setTxnSubType("00") //交易子类型  默认00
+                    .setBizType("000201") //业务类型 B2C网关支付，手机wap支付
+                    .setChannelType("07") //渠道类型，07-PC，08-手机
+                    .setMerId("777290058151764")
+                    .setOrderId(String.valueOf(System.currentTimeMillis()))//商户订单号，8-40位数字字母，不能含“-”或“_”，可以自行定制规则，重新产生，不同于原消费
+                    .setTxnTime(DateUtil.format(new Date(), "yyyyMMddHHmmss"))//订单发送时间，格式为YYYYMMDDhhmmss，必须取当前时间，否则会报txnTime无效
+                    .setTxnAmt("6666")
+                    .setBackUrl(SDKConfig.getConfig().getBackUrl())
+                    .setOrigQryId("201710061443208788498") //****原消费交易返回的的queryId，可以从消费交易后台通知接口中或者交易状态查询接口中获取
+                    .createMap();
+            Map<String, String> rspData = UnionPayApi.backRequestByMap(reqData);
+            if (!rspData.isEmpty()) {
+                if (AcpService.validate(rspData, "UTF-8")) {
+                    logger.info("验证签名成功");
+                    String respCode = rspData.get("respCode");
+                    if ("00".equals(respCode)) {
+                        //交易已受理，等待接收后台通知更新订单状态,也可以主动发起 查询交易确定交易状态。
+                    } else if ("03".equals(respCode) ||
+                            "04".equals(respCode) ||
+                            "05".equals(respCode)) {
+                        //后续需发起交易状态查询交易确定交易状态
+                    } else {
+                        //其他应答码为失败请排查原因
+                    }
+                } else {
+                    logger.error("验证签名失败");
+                    // 检查验证签名失败的原因
+                }
+            } else {
+                //未返回正确的http状态
+                logger.error("未获取到返回报文或返回http状态码非200");
+            }
+
+            String reqMessage = getHtmlResult(reqData);
+            String rspMessage = getHtmlResult(rspData);
+            response.getWriter().println("</br>请求报文:<br/>" + reqMessage + "<br/>" + "应答报文:</br>" + rspMessage + "");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 测试通过
+     * https://open.unionpay.com/ajweb/help/faq/list?id=95&level=0&from=0
+     * java.lang.RuntimeException: Unexpected code Response{protocol=http/1.1, code=500, message=Internal Server Error, url=https://filedownload.test.95516.com/}
+     */
+    @RequestMapping(value = "/fileTransfer", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public void fileTransfer(HttpServletResponse response) {
+        try {
 //			String settleDate = DateKit.toStr(new Date(), DateKit.UnionDateStampPattern);
-			Map<String, String> reqData = UnionPayApiConfig.builder()
-					.setAccessType("0")
-					.setTxnType("76")  //交易类型 76-对账文件下载
-					.setTxnSubType("01") //交易子类型 01-对账文件下载
-					.setBizType("000000") //业务类型，固定
-					.setMerId("700000000000001")
-					.setSettleDate("0119") //清算日期，如果使用正式商户号测试则要修改成自己想要获取对账文件的日期， 测试环境如果使用777290058151764商户号则固定填写0119
-					.setFileType("00")
-					.createMap();
-			//移除默认参数
-			reqData.remove("orderId");
-			reqData.remove("payTimeout");
-			reqData.remove("backUrl");
-			reqData.remove("channelType");
-			reqData.remove("currencyCode");
-			reqData.remove("frontUrl");
-			reqData.remove("txnAmt");
-			//重新签名
-			reqData = UnionPayApiConfig.builder().setSignMap(reqData);
-			Map<String, String> rspData = UnionPayApi.fileTransferByMap(reqData);
-			String fileContentDispaly = "";
-			if(!rspData.isEmpty()){
-				if(AcpService.validate(rspData, DemoBase.encoding)){
-					logger.info("验证签名成功");
-					String respCode = rspData.get("respCode");
-					if("00".equals(respCode)){
-//						String outPutDirectory ="/Users/Javen/Documents/dev/JPay";
-						String outPutDirectory ="d:\\";
-						// 交易成功，解析返回报文中的fileContent并落地
-						String zipFilePath = AcpService.deCodeFileContent(rspData,outPutDirectory,DemoBase.encoding);
-						//对落地的zip文件解压缩并解析
-						List<String> fileList = DemoBase.unzip(zipFilePath, outPutDirectory);
-						//解析ZM，ZME文件
-						fileContentDispaly ="<br>获取到商户对账文件，并落地到"+outPutDirectory+",并解压缩 <br>";
-						for(String file : fileList){
-							if(file.indexOf("ZM_")!=-1){
-								@SuppressWarnings("rawtypes")
-								List<Map> ZmDataList = DemoBase.parseZMFile(file);
-								fileContentDispaly = fileContentDispaly+DemoBase.getFileContentTable(ZmDataList,file);
-							}else if(file.indexOf("ZME_")!=-1){
-								DemoBase.parseZMEFile(file);
-							}
-						}
-						//其他处理
-					}else{
-						//其他应答码为失败请排查原因
-					}
-				}else{
-					logger.error("验证签名失败");
-					// 检查验证签名失败的原因
-				}
-			}else{
-				//未返回正确的http状态
-				logger.error("未获取到返回报文或返回http状态码非200");
-			}
-
-			String reqMessage = getHtmlResult(reqData);
-			String rspMessage = getHtmlResult(rspData);
-			response.getWriter().println("<html><head></br>请求报文:<br/>"+reqMessage+"<br/>" + "应答报文:</br>"+rspMessage+fileContentDispaly+"</head></html>");
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-	/**
-	 * 信用卡网关还款
-	 */
-	@RequestMapping(value = "/repaymentGateway",method={RequestMethod.POST,RequestMethod.GET})
-	@ResponseBody
-	public void repaymentGateway(HttpServletResponse response){
-		try {
-			Map<String, String> map = new HashMap<String, String>();
-			map.put("usr_num", "6221558812340013");//信用卡卡号
-			map.put("usr_num2", "6221558812340013");//重复信用卡卡号
-			map.put("usr_nm", "全渠道");//信用卡持卡人姓名【无特殊要求尽量不要送】这里填写错误会出现报文格式错误 (5100030)
-
-
-			Map<String, String> reqData = UnionPayApiConfig.builder()
-					.setTxnType("13") //交易类型 04-退货	31-消费撤销 13 账单支付
-					.setTxnSubType("03") //交易子类型  03 信用卡还款
-					.setBizType("000601")
-					.setChannelType("07") //渠道类型，07-PC，08-手机
-					.setBussCode("J1_9800_0000_1")
-					.setMerId("777290058151764")
-					.setOrderId(String.valueOf(System.currentTimeMillis()))//商户订单号，8-40位数字字母，不能含“-”或“_”，可以自行定制规则，重新产生，不同于原消费
-					.setTxnTime(DateKit.toStr(new Date(), DateKit.UnionTimeStampPattern))//订单发送时间，格式为YYYYMMDDhhmmss，必须取当前时间，否则会报txnTime无效
-					.setTxnAmt("1234")
-					.setBillQueryInfo(AcpService.base64Encode(JsonUtils.objectToJson(map), DemoBase.encoding))
-					.setBackUrl(SDKConfig.getConfig().getBackUrl())
-					.setFrontUrl(SDKConfig.getConfig().getFrontUrl())
+            Map<String, String> reqData = UnionPayApiConfig.builder()
+                    .setAccessType("0")
+                    .setTxnType("76")  //交易类型 76-对账文件下载
+                    .setTxnSubType("01") //交易子类型 01-对账文件下载
+                    .setBizType("000000") //业务类型，固定
+                    .setMerId("700000000000001")
+                    .setSettleDate("0119") //清算日期，如果使用正式商户号测试则要修改成自己想要获取对账文件的日期， 测试环境如果使用777290058151764商户号则固定填写0119
+                    .setFileType("00")
+                    .createMap();
+            //移除默认参数
+            reqData.remove("orderId");
+            reqData.remove("payTimeout");
+            reqData.remove("backUrl");
+            reqData.remove("channelType");
+            reqData.remove("currencyCode");
+            reqData.remove("frontUrl");
+            reqData.remove("txnAmt");
+            //重新签名
+            reqData = UnionPayApiConfig.builder().setSignMap(reqData);
+            Map<String, String> rspData = UnionPayApi.fileTransferByMap(reqData);
+            String fileContentDispaly = "";
+            if (!rspData.isEmpty()) {
+                if (AcpService.validate(rspData, DemoBase.encoding)) {
+                    logger.info("验证签名成功");
+                    String respCode = rspData.get("respCode");
+                    if ("00".equals(respCode)) {
+                        String outPutDirectory = "/Users/Javen/Documents/dev/IJPay";
+//						String outPutDirectory ="d:\\";
+                        // 交易成功，解析返回报文中的fileContent并落地
+                        String zipFilePath = AcpService.deCodeFileContent(rspData, outPutDirectory, DemoBase.encoding);
+                        //对落地的zip文件解压缩并解析
+                        List<String> fileList = DemoBase.unzip(zipFilePath, outPutDirectory);
+                        //解析ZM，ZME文件
+                        fileContentDispaly = "<br>获取到商户对账文件，并落地到" + outPutDirectory + ",并解压缩 <br>";
+                        for (String file : fileList) {
+                            if (file.indexOf("ZM_") != -1) {
+                                List<Map<Integer, String>> ZmDataList = DemoBase.parseZMFile(file);
+                                fileContentDispaly = fileContentDispaly + DemoBase.getFileContentTable(ZmDataList, file);
+                            } else if (file.indexOf("ZME_") != -1) {
+                                DemoBase.parseZMEFile(file);
+                            }
+                        }
+                        //其他处理
+                    } else {
+                        //其他应答码为失败请排查原因
+                    }
+                } else {
+                    logger.error("验证签名失败");
+                    // 检查验证签名失败的原因
+                }
+            } else {
+                //未返回正确的http状态
+                logger.error("未获取到返回报文或返回http状态码非200");
+            }
+
+            String reqMessage = getHtmlResult(reqData);
+            String rspMessage = getHtmlResult(rspData);
+            response.getWriter().println("<html><head></br>请求报文:<br/>" + reqMessage + "<br/>" + "应答报文:</br>" + rspMessage + fileContentDispaly + "</head></html>");
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    /**
+     * 信用卡网关还款
+     */
+    @RequestMapping(value = "/repaymentGateway", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public void repaymentGateway(HttpServletResponse response) {
+        try {
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("usr_num", "6221558812340013");//信用卡卡号
+            map.put("usr_num2", "6221558812340013");//重复信用卡卡号
+            map.put("usr_nm", "全渠道");//信用卡持卡人姓名【无特殊要求尽量不要送】这里填写错误会出现报文格式错误 (5100030)
+
+
+            Map<String, String> reqData = UnionPayApiConfig.builder()
+                    .setTxnType("13") //交易类型 04-退货	31-消费撤销 13 账单支付
+                    .setTxnSubType("03") //交易子类型  03 信用卡还款
+                    .setBizType("000601")
+                    .setChannelType("07") //渠道类型，07-PC，08-手机
+                    .setBussCode("J1_9800_0000_1")
+                    .setMerId("777290058151764")
+                    .setOrderId(String.valueOf(System.currentTimeMillis()))//商户订单号，8-40位数字字母，不能含“-”或“_”，可以自行定制规则，重新产生，不同于原消费
+                    .setTxnTime(DateUtil.format(new Date(), "yyyyMMddHHmmss"))//订单发送时间，格式为YYYYMMDDhhmmss，必须取当前时间，否则会报txnTime无效
+                    .setTxnAmt("1234")
+                    .setBillQueryInfo(AcpService.base64Encode(JSONUtil.toJsonPrettyStr(map), DemoBase.encoding))
+                    .setBackUrl(SDKConfig.getConfig().getBackUrl())
+                    .setFrontUrl(SDKConfig.getConfig().getFrontUrl())
 //					.setReqReserved("IJPay repaymentGateway")
-					.createMap();
-			UnionPayApi.jfFrontConsume(response, reqData);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 二维码支付
-	 * 二维码仿真
-	 * https://open.unionpay.com/ajweb/help/qrcodeFormPage
-	 */
-	@RequestMapping(value = "/qrCodePay",method={RequestMethod.POST,RequestMethod.GET})
-	@ResponseBody
-	public void qrCodePay(HttpServletResponse response){
-		try {
-			Map<String, String> reqData = UnionPayApiConfig.builder()
-					.setTxnType("01")
-					.setTxnSubType("06")
-					.setBizType("000000")
-					.setChannelType("08") //渠道类型，07-PC，08-手机
-					.setMerId("777290058151764")
-					.setAccessType("0")
-					.setAccType("01")
-					.setQrNo("6225058203886110875")
-					.setTermId("00000011")
-					.setOrderId(String.valueOf(System.currentTimeMillis()))//商户订单号，8-40位数字字母，不能含“-”或“_”，可以自行定制规则，重新产生，不同于原消费
-					.setTxnTime(DateKit.toStr(new Date(), DateKit.UnionTimeStampPattern))//订单发送时间，格式为YYYYMMDDhhmmss，必须取当前时间，否则会报txnTime无效
-					.setTxnAmt("2580")
-					.setBackUrl(SDKConfig.getConfig().getBackUrl())
-					.setReqReserved("IJPay qrCodePay")
-					.createMap();
-			Map<String, String> rspData = UnionPayApi.backRequestByMap(reqData);
-			if(!rspData.isEmpty()){
-				if(AcpService.validate(rspData, DemoBase.encoding)){
-					logger.info("二维码支付验证签名成功");
-					String respCode = rspData.get("respCode") ;
-					if(("00").equals(respCode)){
-						//成功,获取tn号
-						String tn = rspData.get("tn");
-						System.out.println("tn>>>>>>>"+tn);
-					}else{
-						//其他应答码为失败请排查原因或做失败处理
-					}
-				}else{
-					logger.error("二维码验证签名失败");
-					//检查验证签名失败的原因
-				}
-			}else{
-				//未返回正确的http状态
-				logger.error("未获取到返回报文或返回http状态码非200");
-			}
-
-			String reqMessage = getHtmlResult(reqData);
-			String rspMessage = getHtmlResult(rspData);
-			response.getWriter().println("</br>请求报文:<br/>"+reqMessage+"<br/>" + "应答报文:</br>"+rspMessage+"");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	/**
-	 * 代收后台建立委托
-	 */
-	@RequestMapping(value = "/jlwtBack",method={RequestMethod.POST,RequestMethod.GET})
-	@ResponseBody
-	public void jlwtBack(HttpServletResponse response){
-		try {
-			//卡号
-			String accNoEnc = AcpService.encryptData("6221558812340000", "UTF-8"); 		//这里测试的时候使用的是测试卡号，正式环境请使用真实卡号
-
-			//姓名，证件类型+证件号码至少二选一必送，手机号可选，贷记卡的cvn2,expired可选。
-			Map<String,String> customerInfoMap = new HashMap<String,String>();
-			customerInfoMap.put("certifTp", "01");//证件类型
-			customerInfoMap.put("certifId", "341126197709218366");//证件号码
-			customerInfoMap.put("customerNm", "互联网");//姓名
-
-			customerInfoMap.put("phoneNo", "13552535506");//手机号
-			//当卡号为贷记卡的时候cvn2,expired可选上送
-			customerInfoMap.put("cvn2", "123");//卡背面的cvn2三位数字
-			customerInfoMap.put("expired", "1711");
-
-			String customerInfoStr = AcpService.
-					getCustomerInfoWithEncrypt(customerInfoMap,null,DemoBase.encoding);
+                    .createMap();
+            UnionPayApi.jfFrontConsume(response, reqData);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 二维码支付
+     * 二维码仿真
+     * https://open.unionpay.com/ajweb/help/qrcodeFormPage
+     */
+    @RequestMapping(value = "/qrCodePay", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public void qrCodePay(HttpServletResponse response) {
+        try {
+            Map<String, String> reqData = UnionPayApiConfig.builder()
+                    .setTxnType("01")
+                    .setTxnSubType("06")
+                    .setBizType("000000")
+                    .setChannelType("08") //渠道类型，07-PC，08-手机
+                    .setMerId("777290058151764")
+                    .setAccessType("0")
+                    .setAccType("01")
+                    .setQrNo("6225058203886110875")
+                    .setTermId("00000011")
+                    .setOrderId(String.valueOf(System.currentTimeMillis()))//商户订单号，8-40位数字字母，不能含“-”或“_”，可以自行定制规则，重新产生，不同于原消费
+                    .setTxnTime(DateUtil.format(new Date(), "yyyyMMddHHmmss"))//订单发送时间，格式为YYYYMMDDhhmmss，必须取当前时间，否则会报txnTime无效
+                    .setTxnAmt("2580")
+                    .setBackUrl(SDKConfig.getConfig().getBackUrl())
+                    .setReqReserved("IJPay qrCodePay")
+                    .createMap();
+            Map<String, String> rspData = UnionPayApi.backRequestByMap(reqData);
+            if (!rspData.isEmpty()) {
+                if (AcpService.validate(rspData, DemoBase.encoding)) {
+                    logger.info("二维码支付验证签名成功");
+                    String respCode = rspData.get("respCode");
+                    if (("00").equals(respCode)) {
+                        //成功,获取tn号
+                        String tn = rspData.get("tn");
+                        System.out.println("tn>>>>>>>" + tn);
+                    } else {
+                        //其他应答码为失败请排查原因或做失败处理
+                    }
+                } else {
+                    logger.error("二维码验证签名失败");
+                    //检查验证签名失败的原因
+                }
+            } else {
+                //未返回正确的http状态
+                logger.error("未获取到返回报文或返回http状态码非200");
+            }
+
+            String reqMessage = getHtmlResult(reqData);
+            String rspMessage = getHtmlResult(rspData);
+            response.getWriter().println("</br>请求报文:<br/>" + reqMessage + "<br/>" + "应答报文:</br>" + rspMessage + "");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    /**
+     * 代收后台建立委托
+     */
+    @RequestMapping(value = "/jlwtBack", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public void jlwtBack(HttpServletResponse response) {
+        try {
+            //卡号
+            String accNoEnc = AcpService.encryptData("6221558812340000", "UTF-8");        //这里测试的时候使用的是测试卡号，正式环境请使用真实卡号
+
+            //姓名，证件类型+证件号码至少二选一必送，手机号可选，贷记卡的cvn2,expired可选。
+            Map<String, String> customerInfoMap = new HashMap<String, String>();
+            customerInfoMap.put("certifTp", "01");//证件类型
+            customerInfoMap.put("certifId", "341126197709218366");//证件号码
+            customerInfoMap.put("customerNm", "互联网");//姓名
+
+            customerInfoMap.put("phoneNo", "13552535506");//手机号
+            //当卡号为贷记卡的时候cvn2,expired可选上送
+            customerInfoMap.put("cvn2", "123");//卡背面的cvn2三位数字
+            customerInfoMap.put("expired", "1711");
+
+            String customerInfoStr = AcpService.
+                    getCustomerInfoWithEncrypt(customerInfoMap, null, DemoBase.encoding);
 //			String customerInfoStr = AcpService.
 //					getCustomerInfo(customerInfoMap,null,DemoBase.encoding);
 
 
-			Map<String, String> reqData = UnionPayApiConfig.builder()
-					.setTxnType("72")
-					.setTxnSubType("11")
-					.setBizType("000501")
-					.setChannelType("07") //渠道类型，07-PC，08-手机
-					.setMerId("777290058151764")
-					.setAccessType("0")
-					.setAccType("01")
-					.setOrderId(String.valueOf(System.currentTimeMillis()))//商户订单号，8-40位数字字母，不能含“-”或“_”，可以自行定制规则，重新产生，不同于原消费
-					.setTxnTime(DateKit.toStr(new Date(), DateKit.UnionTimeStampPattern))//订单发送时间，格式为YYYYMMDDhhmmss，必须取当前时间，否则会报txnTime无效
-					.setAccNo(accNoEnc)
-					.setEncryptCertId(AcpService.getEncryptCertId())//加密证书的certId，配置在acp_sdk.properties文件 acpsdk.encryptCert.path属性下
-					.setCustomerInfo(customerInfoStr)
-					.createMap();
-			Map<String, String> rspData = UnionPayApi.backRequestByMap(reqData);
-			if(!rspData.isEmpty()){
-				if(AcpService.validate(rspData, DemoBase.encoding)){
-					logger.info("验证签名成功");
-					String respCode = rspData.get("respCode") ;
-					if(("00").equals(respCode)){
-						//成功,获取tn号
-						String tn = rspData.get("tn");
-						System.out.println("tn>>>>>>>"+tn);
-					}else{
-						//其他应答码为失败请排查原因或做失败处理
-					}
-				}else{
-					logger.error("验证签名失败");
-					//检查验证签名失败的原因
-				}
-			}else{
-				//未返回正确的http状态
-				logger.error("未获取到返回报文或返回http状态码非200");
-			}
-
-			String reqMessage = getHtmlResult(reqData);
-			String rspMessage = getHtmlResult(rspData);
-			response.getWriter().println("</br>请求报文:<br/>"+reqMessage+"<br/>" + "应答报文:</br>"+rspMessage+"");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-
-
-	/**
-	 * 代收前台建立委托
-	 */
-	@RequestMapping(value = "/jlwtFront",method={RequestMethod.POST,RequestMethod.GET})
-	@ResponseBody
-	public void jlwtFront(HttpServletResponse response){
-		try {
-			//卡号
-			String accNoEnc = AcpService.encryptData("6221558812340000", "UTF-8"); 		//这里测试的时候使用的是测试卡号，正式环境请使用真实卡号
-
-			//姓名，证件类型+证件号码至少二选一必送，手机号可选，贷记卡的cvn2,expired可选。
-			Map<String,String> customerInfoMap = new HashMap<String,String>();
-			customerInfoMap.put("certifTp", "01");//证件类型
-			customerInfoMap.put("certifId", "341126197709218366");//证件号码
-			customerInfoMap.put("customerNm", "互联网");//姓名
-
-			customerInfoMap.put("phoneNo", "13552535506");//手机号
-			//当卡号为贷记卡的时候cvn2,expired可选上送
-			customerInfoMap.put("cvn2", "123");//卡背面的cvn2三位数字
-			customerInfoMap.put("expired", "1711");
-
-			String customerInfoStr = AcpService.
-					getCustomerInfoWithEncrypt(customerInfoMap,null,DemoBase.encoding);
+            Map<String, String> reqData = UnionPayApiConfig.builder()
+                    .setTxnType("72")
+                    .setTxnSubType("11")
+                    .setBizType("000501")
+                    .setChannelType("07") //渠道类型，07-PC，08-手机
+                    .setMerId("777290058151764")
+                    .setAccessType("0")
+                    .setAccType("01")
+                    .setOrderId(String.valueOf(System.currentTimeMillis()))//商户订单号，8-40位数字字母，不能含“-”或“_”，可以自行定制规则，重新产生，不同于原消费
+                    .setTxnTime(DateUtil.format(new Date(), "yyyyMMddHHmmss"))//订单发送时间，格式为YYYYMMDDhhmmss，必须取当前时间，否则会报txnTime无效
+                    .setAccNo(accNoEnc)
+                    .setEncryptCertId(AcpService.getEncryptCertId())//加密证书的certId，配置在acp_sdk.properties文件 acpsdk.encryptCert.path属性下
+                    .setCustomerInfo(customerInfoStr)
+                    .createMap();
+            Map<String, String> rspData = UnionPayApi.backRequestByMap(reqData);
+            if (!rspData.isEmpty()) {
+                if (AcpService.validate(rspData, DemoBase.encoding)) {
+                    logger.info("验证签名成功");
+                    String respCode = rspData.get("respCode");
+                    if (("00").equals(respCode)) {
+                        //成功,获取tn号
+                        String tn = rspData.get("tn");
+                        System.out.println("tn>>>>>>>" + tn);
+                    } else {
+                        //其他应答码为失败请排查原因或做失败处理
+                    }
+                } else {
+                    logger.error("验证签名失败");
+                    //检查验证签名失败的原因
+                }
+            } else {
+                //未返回正确的http状态
+                logger.error("未获取到返回报文或返回http状态码非200");
+            }
+
+            String reqMessage = getHtmlResult(reqData);
+            String rspMessage = getHtmlResult(rspData);
+            response.getWriter().println("</br>请求报文:<br/>" + reqMessage + "<br/>" + "应答报文:</br>" + rspMessage + "");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    /**
+     * 代收前台建立委托
+     */
+    @RequestMapping(value = "/jlwtFront", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public void jlwtFront(HttpServletResponse response) {
+        try {
+            //卡号
+            String accNoEnc = AcpService.encryptData("6221558812340000", "UTF-8");        //这里测试的时候使用的是测试卡号，正式环境请使用真实卡号
+
+            //姓名，证件类型+证件号码至少二选一必送，手机号可选，贷记卡的cvn2,expired可选。
+            Map<String, String> customerInfoMap = new HashMap<String, String>();
+            customerInfoMap.put("certifTp", "01");//证件类型
+            customerInfoMap.put("certifId", "341126197709218366");//证件号码
+            customerInfoMap.put("customerNm", "互联网");//姓名
+
+            customerInfoMap.put("phoneNo", "13552535506");//手机号
+            //当卡号为贷记卡的时候cvn2,expired可选上送
+            customerInfoMap.put("cvn2", "123");//卡背面的cvn2三位数字
+            customerInfoMap.put("expired", "1711");
+
+            String customerInfoStr = AcpService.
+                    getCustomerInfoWithEncrypt(customerInfoMap, null, DemoBase.encoding);
 //			String customerInfoStr = AcpService.
 //					getCustomerInfo(customerInfoMap,null,DemoBase.encoding);
 
 
-			Map<String, String> reqData = UnionPayApiConfig.builder()
-					.setTxnType("72")
-					.setTxnSubType("11")
-					.setBizType("000501")
-					.setChannelType("07") //渠道类型，07-PC，08-手机
-					.setMerId("777290058151764")
-					.setAccessType("0")
-					.setAccType("01")
-					.setOrderId(String.valueOf(System.currentTimeMillis()))//商户订单号，8-40位数字字母，不能含“-”或“_”，可以自行定制规则，重新产生，不同于原消费
-					.setTxnTime(DateKit.toStr(new Date(), DateKit.UnionTimeStampPattern))//订单发送时间，格式为YYYYMMDDhhmmss，必须取当前时间，否则会报txnTime无效
-					.setAccNo(accNoEnc)
-					.setBackUrl(SDKConfig.getConfig().getBackUrl())
-					.setFrontUrl(SDKConfig.getConfig().getFrontUrl())
-					.setEncryptCertId(AcpService.getEncryptCertId())//加密证书的certId，配置在acp_sdk.properties文件 acpsdk.encryptCert.path属性下
-					.setCustomerInfo(customerInfoStr)
-					.createMap();
-			UnionPayApi.frontRequest(response, reqData);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	/**
-	 * 解除委托关系
-	 */
-	@RequestMapping(value = "/removeWt",method={RequestMethod.POST,RequestMethod.GET})
-	@ResponseBody
-	public void removeWt(HttpServletResponse response){
-		try {
-			//这里测试的时候使用的是测试卡号，正式环境请使用真实卡号
-			String accNoEnc = AcpService.encryptData("6221558812340000", "UTF-8");
-
-			Map<String, String> reqData = UnionPayApiConfig.builder()
-					.setTxnType("74")
-					.setTxnSubType("04")
-					.setBizType("000501")
-					.setChannelType("07") //渠道类型，07-PC，08-手机
-					.setMerId("777290058151764")
-					.setOrderId(String.valueOf(System.currentTimeMillis()))//商户订单号，8-40位数字字母，不能含“-”或“_”，可以自行定制规则，重新产生，不同于原消费
-					.setTxnTime(DateKit.toStr(new Date(), DateKit.UnionTimeStampPattern))//订单发送时间，格式为YYYYMMDDhhmmss，必须取当前时间，否则会报txnTime无效
-					.setAccNo(accNoEnc)
-					.setEncryptCertId(AcpService.getEncryptCertId())//加密证书的certId，配置在acp_sdk.properties文件 acpsdk.encryptCert.path属性下
-					.createMap();
-			Map<String, String> rspData = UnionPayApi.backRequestByMap(reqData);
-			if(!rspData.isEmpty()){
-				if(AcpService.validate(rspData, DemoBase.encoding)){
-					logger.info("验证签名成功");
-					String respCode = rspData.get("respCode") ;
-					if(("00").equals(respCode)){
-						//成功
-					}else{
-						//其他应答码为失败请排查原因或做失败处理
-					}
-				}else{
-					logger.error("验证签名失败");
-					//检查验证签名失败的原因
-				}
-			}else{
-				//未返回正确的http状态
-				logger.error("未获取到返回报文或返回http状态码非200");
-			}
-
-			String reqMessage = getHtmlResult(reqData);
-			String rspMessage = getHtmlResult(rspData);
-			response.getWriter().println("</br>请求报文:<br/>"+reqMessage+"<br/>" + "应答报文:</br>"+rspMessage+"");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 代收1102
-	 */
-	@RequestMapping(value = "/daiShou1102",method={RequestMethod.POST,RequestMethod.GET})
-	@ResponseBody
-	public void daiShou1102(HttpServletResponse response){
-		try {
-			//卡号
-			String accNoEnc = AcpService.encryptData("6221558812340000", DemoBase.encoding);
-
-
-			Map<String, String> reqData = UnionPayApiConfig.builder()
-					.setTxnType("11")
-					.setTxnSubType("02")
-					.setBizType("000501")
-					.setChannelType("07") //渠道类型，07-PC，08-手机
-					.setMerId("777290058151764")
-					.setAccessType("0")
-					.setAccType("01")
-					.setTxnAmt("8888")
-					.setOrderId(String.valueOf(System.currentTimeMillis()))//商户订单号，8-40位数字字母，不能含“-”或“_”，可以自行定制规则，重新产生，不同于原消费
-					.setTxnTime(DateKit.toStr(new Date(), DateKit.UnionTimeStampPattern))//订单发送时间，格式为YYYYMMDDhhmmss，必须取当前时间，否则会报txnTime无效
-					.setAccNo(accNoEnc)
-					.setEncryptCertId(AcpService.getEncryptCertId())//加密证书的certId，配置在acp_sdk.properties文件 acpsdk.encryptCert.path属性下
-					.createMap();
-			Map<String, String> rspData = UnionPayApi.backRequestByMap(reqData);
-
-			if(!rspData.isEmpty()){
-				if(AcpService.validate(rspData, DemoBase.encoding)){
-					logger.info("验证签名成功");
-					String respCode = rspData.get("respCode") ;
-					if(("00").equals(respCode)){
-						//交易已受理(不代表交易已成功），等待接收后台通知更新订单状态,也可以主动发起 查询交易确定交易状态。
-						//如果是配置了敏感信息加密，如果需要获取卡号的铭文，可以按以下方法解密卡号
-						//String accNo1 = resmap.get("accNo");
-						//String accNo2 = AcpService.decryptData(accNo1, "UTF-8");  //解密卡号使用的证书是商户签名私钥证书acpsdk.signCert.path
-						//logger.info("解密后的卡号："+accNo2);
-
-					}else if(("03").equals(respCode)||
-							 ("04").equals(respCode)||
-							 ("05").equals(respCode)){
-						//后续需发起交易状态查询交易确定交易状态
-					}else{
-						//其他应答码为失败请排查原因
-					}
-				}else{
-					logger.error("验证签名失败");
-					//检查验证签名失败的原因
-				}
-			}else{
-				//未返回正确的http状态
-				logger.error("未获取到返回报文或返回http状态码非200");
-			}
-
-			String reqMessage = getHtmlResult(reqData);
-			String rspMessage = getHtmlResult(rspData);
-			response.getWriter().println("</br>请求报文:<br/>"+reqMessage+"<br/>" + "应答报文:</br>"+rspMessage+"");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	/**
-	 * 无跳转开通状态查询
-	 */
-	@RequestMapping(value = "/openQuery",method = {RequestMethod.POST,RequestMethod.GET})
-	@ResponseBody
-	public void openQuery(HttpServletResponse response){
-		try {
-			//卡号
-			String accNoEnc = AcpService.encryptData("6216261000000000018", DemoBase.encoding);
-
-			Map<String, String> reqData = UnionPayApiConfig.builder()
-					.setTxnType("78")
-					.setTxnSubType("00")
-					.setBizType("000301")
-					.setChannelType("07") //渠道类型，07-PC，08-手机
-					.setMerId("777290058151764")
-					.setAccessType("0")
-					.setOrderId(String.valueOf(System.currentTimeMillis()))//商户订单号，8-40位数字字母，不能含“-”或“_”，可以自行定制规则，重新产生，不同于原消费
-					.setTxnTime(DateKit.toStr(new Date(), DateKit.UnionTimeStampPattern))//订单发送时间，格式为YYYYMMDDhhmmss，必须取当前时间，否则会报txnTime无效
-					.setAccNo(accNoEnc)
-					.setEncryptCertId(AcpService.getEncryptCertId())//加密证书的certId，配置在acp_sdk.properties文件 acpsdk.encryptCert.path属性下
-					.createMap();
-			Map<String, String> rspData = UnionPayApi.backRequestByMap(reqData);
-			StringBuffer parseStr = new StringBuffer("");
-			if(!rspData.isEmpty()){
-				if(AcpService.validate(rspData, DemoBase.encoding)){
-					logger.info("验证签名成功");
-					String respCode = rspData.get("respCode") ;
-					if(("00").equals(respCode)){
-						//成功
-						parseStr.append("<br>解析敏感信息加密信息如下（如果有）:<br>");
-						String customerInfo = rspData.get("customerInfo");
-						if(null!=customerInfo){
-							Map<String,String>  cm = AcpService.parseCustomerInfo(customerInfo, "UTF-8");
-							parseStr.append("customerInfo明文: " + cm+"<br>");
-						}
-						String an = rspData.get("accNo");
-						if(null!=an){
-							an = AcpService.decryptData(an, "UTF-8");
-							parseStr.append("accNo明文: " + an);
-						}
-					}else{
-						//其他应答码为失败请排查原因或做失败处理
-					}
-				}else{
-					logger.error("验证签名失败");
-					// 检查验证签名失败的原因
-				}
-			}else{
-				//未返回正确的http状态
-				logger.error("未获取到返回报文或返回http状态码非200");
-			}
-			String reqMessage = getHtmlResult(reqData);
-			String rspMessage = getHtmlResult(rspData);
-			response.getWriter().write("</br>请求报文:<br/>"+reqMessage+"<br/>" + "应答报文:</br>"+rspMessage+parseStr);
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	/**
-	 * 无跳转支付银联侧开通
-	 */
-	@RequestMapping(value = "/openCardFront",method = {RequestMethod.POST,RequestMethod.GET})
-	@ResponseBody
-	public void openCardFront(HttpServletResponse response){
-		try {
-			//卡号
-			String accNoEnc = AcpService.encryptData("6216261000000000018", "UTF-8"); 		//这里测试的时候使用的是测试卡号，正式环境请使用真实卡号
-
-			//姓名，证件类型+证件号码至少二选一必送，手机号可选，贷记卡的cvn2,expired可选。
-			Map<String,String> customerInfoMap = new HashMap<String,String>();
-			customerInfoMap.put("certifTp", "01");//证件类型
-			customerInfoMap.put("certifId", "341126197709218366");//证件号码
-			customerInfoMap.put("customerNm", "全渠道");//姓名
-			customerInfoMap.put("phoneNo", "13552535506");//手机号
-
-			String customerInfoStr = AcpService.
-					getCustomerInfoWithEncrypt(customerInfoMap,null,DemoBase.encoding);
+            Map<String, String> reqData = UnionPayApiConfig.builder()
+                    .setTxnType("72")
+                    .setTxnSubType("11")
+                    .setBizType("000501")
+                    .setChannelType("07") //渠道类型，07-PC，08-手机
+                    .setMerId("777290058151764")
+                    .setAccessType("0")
+                    .setAccType("01")
+                    .setOrderId(String.valueOf(System.currentTimeMillis()))//商户订单号，8-40位数字字母，不能含“-”或“_”，可以自行定制规则，重新产生，不同于原消费
+                    .setTxnTime(DateUtil.format(new Date(), "yyyyMMddHHmmss"))//订单发送时间，格式为YYYYMMDDhhmmss，必须取当前时间，否则会报txnTime无效
+                    .setAccNo(accNoEnc)
+                    .setBackUrl(SDKConfig.getConfig().getBackUrl())
+                    .setFrontUrl(SDKConfig.getConfig().getFrontUrl())
+                    .setEncryptCertId(AcpService.getEncryptCertId())//加密证书的certId，配置在acp_sdk.properties文件 acpsdk.encryptCert.path属性下
+                    .setCustomerInfo(customerInfoStr)
+                    .createMap();
+            UnionPayApi.frontRequest(response, reqData);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 解除委托关系
+     */
+    @RequestMapping(value = "/removeWt", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public void removeWt(HttpServletResponse response) {
+        try {
+            //这里测试的时候使用的是测试卡号，正式环境请使用真实卡号
+            String accNoEnc = AcpService.encryptData("6221558812340000", "UTF-8");
+
+            Map<String, String> reqData = UnionPayApiConfig.builder()
+                    .setTxnType("74")
+                    .setTxnSubType("04")
+                    .setBizType("000501")
+                    .setChannelType("07") //渠道类型，07-PC，08-手机
+                    .setMerId("777290058151764")
+                    .setOrderId(String.valueOf(System.currentTimeMillis()))//商户订单号，8-40位数字字母，不能含“-”或“_”，可以自行定制规则，重新产生，不同于原消费
+                    .setTxnTime(DateUtil.format(new Date(), "yyyyMMddHHmmss"))//订单发送时间，格式为YYYYMMDDhhmmss，必须取当前时间，否则会报txnTime无效
+                    .setAccNo(accNoEnc)
+                    .setEncryptCertId(AcpService.getEncryptCertId())//加密证书的certId，配置在acp_sdk.properties文件 acpsdk.encryptCert.path属性下
+                    .createMap();
+            Map<String, String> rspData = UnionPayApi.backRequestByMap(reqData);
+            if (!rspData.isEmpty()) {
+                if (AcpService.validate(rspData, DemoBase.encoding)) {
+                    logger.info("验证签名成功");
+                    String respCode = rspData.get("respCode");
+                    if (("00").equals(respCode)) {
+                        //成功
+                    } else {
+                        //其他应答码为失败请排查原因或做失败处理
+                    }
+                } else {
+                    logger.error("验证签名失败");
+                    //检查验证签名失败的原因
+                }
+            } else {
+                //未返回正确的http状态
+                logger.error("未获取到返回报文或返回http状态码非200");
+            }
+
+            String reqMessage = getHtmlResult(reqData);
+            String rspMessage = getHtmlResult(rspData);
+            response.getWriter().println("</br>请求报文:<br/>" + reqMessage + "<br/>" + "应答报文:</br>" + rspMessage + "");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 代收1102
+     */
+    @RequestMapping(value = "/daiShou1102", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public void daiShou1102(HttpServletResponse response) {
+        try {
+            //卡号
+            String accNoEnc = AcpService.encryptData("6221558812340000", DemoBase.encoding);
+
+
+            Map<String, String> reqData = UnionPayApiConfig.builder()
+                    .setTxnType("11")
+                    .setTxnSubType("02")
+                    .setBizType("000501")
+                    .setChannelType("07") //渠道类型，07-PC，08-手机
+                    .setMerId("777290058151764")
+                    .setAccessType("0")
+                    .setAccType("01")
+                    .setTxnAmt("8888")
+                    .setOrderId(String.valueOf(System.currentTimeMillis()))//商户订单号，8-40位数字字母，不能含“-”或“_”，可以自行定制规则，重新产生，不同于原消费
+                    .setTxnTime(DateUtil.format(new Date(), "yyyyMMddHHmmss"))//订单发送时间，格式为YYYYMMDDhhmmss，必须取当前时间，否则会报txnTime无效
+                    .setAccNo(accNoEnc)
+                    .setEncryptCertId(AcpService.getEncryptCertId())//加密证书的certId，配置在acp_sdk.properties文件 acpsdk.encryptCert.path属性下
+                    .createMap();
+            Map<String, String> rspData = UnionPayApi.backRequestByMap(reqData);
+
+            if (!rspData.isEmpty()) {
+                if (AcpService.validate(rspData, DemoBase.encoding)) {
+                    logger.info("验证签名成功");
+                    String respCode = rspData.get("respCode");
+                    if (("00").equals(respCode)) {
+                        //交易已受理(不代表交易已成功），等待接收后台通知更新订单状态,也可以主动发起 查询交易确定交易状态。
+                        //如果是配置了敏感信息加密，如果需要获取卡号的铭文，可以按以下方法解密卡号
+                        //String accNo1 = resmap.get("accNo");
+                        //String accNo2 = AcpService.decryptData(accNo1, "UTF-8");  //解密卡号使用的证书是商户签名私钥证书acpsdk.signCert.path
+                        //logger.info("解密后的卡号："+accNo2);
+
+                    } else if (("03").equals(respCode) ||
+                            ("04").equals(respCode) ||
+                            ("05").equals(respCode)) {
+                        //后续需发起交易状态查询交易确定交易状态
+                    } else {
+                        //其他应答码为失败请排查原因
+                    }
+                } else {
+                    logger.error("验证签名失败");
+                    //检查验证签名失败的原因
+                }
+            } else {
+                //未返回正确的http状态
+                logger.error("未获取到返回报文或返回http状态码非200");
+            }
+
+            String reqMessage = getHtmlResult(reqData);
+            String rspMessage = getHtmlResult(rspData);
+            response.getWriter().println("</br>请求报文:<br/>" + reqMessage + "<br/>" + "应答报文:</br>" + rspMessage + "");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    /**
+     * 无跳转开通状态查询
+     */
+    @RequestMapping(value = "/openQuery", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public void openQuery(HttpServletResponse response) {
+        try {
+            //卡号
+            String accNoEnc = AcpService.encryptData("6216261000000000018", DemoBase.encoding);
+
+            Map<String, String> reqData = UnionPayApiConfig.builder()
+                    .setTxnType("00")
+                    .setTxnSubType("00")
+                    .setBizType("000301")
+                    .setChannelType("07") //渠道类型，07-PC，08-手机
+                    .setMerId("777290058151764")
+                    .setAccessType("0")
+                    .setOrderId(String.valueOf(System.currentTimeMillis()))//商户订单号，8-40位数字字母，不能含“-”或“_”，可以自行定制规则，重新产生，不同于原消费
+                    .setTxnTime(DateUtil.format(new Date(), "yyyyMMddHHmmss"))//订单发送时间，格式为YYYYMMDDhhmmss，必须取当前时间，否则会报txnTime无效
+                    .setAccNo(accNoEnc)
+                    .setEncryptCertId(AcpService.getEncryptCertId())//加密证书的certId，配置在acp_sdk.properties文件 acpsdk.encryptCert.path属性下
+                    .createMap();
+            Map<String, String> rspData = UnionPayApi.backRequestByMap(reqData);
+            StringBuffer parseStr = new StringBuffer("");
+            if (!rspData.isEmpty()) {
+                if (AcpService.validate(rspData, DemoBase.encoding)) {
+                    logger.info("验证签名成功");
+                    String respCode = rspData.get("respCode");
+                    if (("00").equals(respCode)) {
+                        //成功
+                        parseStr.append("<br>解析敏感信息加密信息如下（如果有）:<br>");
+                        String customerInfo = rspData.get("customerInfo");
+                        if (null != customerInfo) {
+                            Map<String, String> cm = AcpService.parseCustomerInfo(customerInfo, "UTF-8");
+                            parseStr.append("customerInfo明文: " + cm + "<br>");
+                        }
+                        String an = rspData.get("accNo");
+                        if (null != an) {
+                            an = AcpService.decryptData(an, "UTF-8");
+                            parseStr.append("accNo明文: " + an);
+                        }
+                    } else {
+                        //其他应答码为失败请排查原因或做失败处理
+                    }
+                } else {
+                    logger.error("验证签名失败");
+                    // 检查验证签名失败的原因
+                }
+            } else {
+                //未返回正确的http状态
+                logger.error("未获取到返回报文或返回http状态码非200");
+            }
+            String reqMessage = getHtmlResult(reqData);
+            String rspMessage = getHtmlResult(rspData);
+            logger.info(getHtmlResult(rspData));
+            response.getWriter().write("</br>请求报文:<br/>" + reqMessage + "<br/>" + "应答报文:</br>" + rspMessage + parseStr);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 无跳转支付银联侧开通
+     */
+    @RequestMapping(value = "/openCardFront", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public void openCardFront(HttpServletResponse response) {
+        try {
+            //卡号
+            String accNoEnc = AcpService.encryptData("6216261000000000018", "UTF-8");        //这里测试的时候使用的是测试卡号，正式环境请使用真实卡号
+
+            //姓名，证件类型+证件号码至少二选一必送，手机号可选，贷记卡的cvn2,expired可选。
+            Map<String, String> customerInfoMap = new HashMap<String, String>();
+            customerInfoMap.put("certifTp", "01");//证件类型
+            customerInfoMap.put("certifId", "341126197709218366");//证件号码
+            customerInfoMap.put("customerNm", "全渠道");//姓名
+            customerInfoMap.put("phoneNo", "13552535506");//手机号
+
+            String customerInfoStr = AcpService.
+                    getCustomerInfoWithEncrypt(customerInfoMap, null, DemoBase.encoding);
 //			String customerInfoStr = AcpService.
 //					getCustomerInfo(customerInfoMap,null,DemoBase.encoding);
 
 
-			Map<String, String> reqData = UnionPayApiConfig.builder()
-					.setTxnType("79")
-					.setTxnSubType("01")
-					.setBizType("000301")
-					.setChannelType("07") //渠道类型，07-PC，08-手机
-					.setMerId("777290058151764")
-					.setAccessType("0")
-					.setAccType("01")
-					.setOrderId(String.valueOf(System.currentTimeMillis()))//商户订单号，8-40位数字字母，不能含“-”或“_”，可以自行定制规则，重新产生，不同于原消费
-					.setTxnTime(DateKit.toStr(new Date(), DateKit.UnionTimeStampPattern))//订单发送时间，格式为YYYYMMDDhhmmss，必须取当前时间，否则会报txnTime无效
-					.setAccNo(accNoEnc)
-					.setBackUrl(SDKConfig.getConfig().getBackUrl())
-					.setFrontUrl(SDKConfig.getConfig().getFrontUrl())
-					.setEncryptCertId(AcpService.getEncryptCertId())//加密证书的certId，配置在acp_sdk.properties文件 acpsdk.encryptCert.path属性下
-					.setCustomerInfo(customerInfoStr)
-					.createMap();
-			UnionPayApi.frontRequest(response, reqData);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 无跳转支付银联测开通并消费
-	 */
-	@RequestMapping(value = "/openAndConsume",method = {RequestMethod.POST,RequestMethod.GET})
-	@ResponseBody
-	public void openAndConsume(HttpServletResponse response){
-		try {
-			//卡号
-			String accNoEnc = AcpService.encryptData("6216261000000000018", DemoBase.encoding);
-
-
-			Map<String, String> reqData = UnionPayApiConfig.builder()
-					.setTxnType("01")
-					.setTxnSubType("01")
-					.setBizType("000301")
-					.setChannelType("07") //渠道类型，07-PC，08-手机
-					.setMerId("777290058151764")
-					.setAccessType("0")
-					.setAccType("01")
-					.setTxnAmt("6363")
-					.setOrderId(String.valueOf(System.currentTimeMillis()))//商户订单号，8-40位数字字母，不能含“-”或“_”，可以自行定制规则，重新产生，不同于原消费
-					.setTxnTime(DateKit.toStr(new Date(), DateKit.UnionTimeStampPattern))//订单发送时间，格式为YYYYMMDDhhmmss，必须取当前时间，否则会报txnTime无效
-					.setAccNo(accNoEnc)
-					.setEncryptCertId(AcpService.getEncryptCertId())//加密证书的certId，配置在acp_sdk.properties文件 acpsdk.encryptCert.path属性下
-					.setBackUrl(SDKConfig.getConfig().getBackUrl())
-					.setFrontUrl(SDKConfig.getConfig().getFrontUrl())
-					.createMap();
-			UnionPayApi.frontRequest(response, reqData);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-
-	/**
-	 * 后台回调
-	 */
-	@RequestMapping(value = "/backRcvResponse",method={RequestMethod.POST,RequestMethod.GET})
-	@ResponseBody
-	public String backRcvResponse(HttpServletRequest request) {
-		logger.info("BackRcvResponse接收后台通知开始");
-
-		String encoding = "UTF-8";
-
-		String notifyStr = HttpKit.readData(request);
-		// 获取银联通知服务器发送的后台通知参数
-		Map<String, String> reqParam = getAllRequestParamToMap(notifyStr);
-		LogUtil.printRequestLog(reqParam);
-
-		// 重要！验证签名前不要修改reqParam中的键值对的内容，否则会验签不过
-		if (!AcpService.validate(reqParam, encoding)) {
-			logger.info("后台验证签名结果[失败].");
-			// 验签失败，需解决验签问题
-
-		} else {
-			logger.info("后台验证签名结果[成功].");
-			// 【注：为了安全验签成功才应该写商户的成功处理逻辑】交易成功，更新商户订单状态
-
-			String orderId = reqParam.get("orderId"); // 获取后台通知的数据，其他字段也可用类似方式获取
-			String respCode = reqParam.get("respCode");
-			// 判断respCode=00、A6后，对涉及资金类的交易，请再发起查询接口查询，确定交易成功后更新数据库。
-			logger.info("orderId>>>" + orderId + " respCode>>" + respCode);
-		}
-		logger.info("BackRcvResponse接收后台通知结束");
-		// 返回给银联服务器http 200 状态码
-		return "ok";
-	}
-
-	/**
-	 * 前台回调
-	 */
-	@RequestMapping(value = "/frontRcvResponse",method={RequestMethod.POST,RequestMethod.GET})
-	public String frontRcvResponse(HttpServletRequest request,HttpServletResponse response) {
-		try {
-			logger.info("FrontRcvResponse前台接收报文返回开始");
-
-			String encoding = "UTF-8";
-			logger.info("返回报文中encoding=[" + encoding + "]");
-			String readData = HttpKit.readData(request);
-			Map<String, String> respParam = getAllRequestParamToMap(readData);
-
-			// 打印请求报文
-			LogUtil.printRequestLog(respParam);
-
-			Map<String, String> valideData = null;
-			StringBuffer page = new StringBuffer();
-			if (null != respParam && !respParam.isEmpty()) {
-				Iterator<Entry<String, String>> it = respParam.entrySet().iterator();
-				valideData = new HashMap<String, String>(respParam.size());
-				while (it.hasNext()) {
-					Entry<String, String> e = it.next();
-					String key = (String) e.getKey();
-					String value = (String) e.getValue();
-					value = new String(value.getBytes(encoding), encoding);
-					page.append("<tr><td width=\"30%\" align=\"right\">" + key + "(" + key + ")</td><td>" + value
-							+ "</td></tr>");
-					valideData.put(key, value);
-				}
-			}
-			if (!AcpService.validate(valideData, encoding)) {
-				page.append("<tr><td width=\"30%\" align=\"right\">前台验证签名结果</td><td>失败</td></tr>");
-				logger.info("前台验证签名结果[失败].");
-			} else {
-				page.append("<tr><td width=\"30%\" align=\"right\">前台验证签名结果</td><td>成功</td></tr>");
-				logger.info("前台验证签名结果[成功].");
-				String orderId = valideData.get("orderId"); // 其他字段也可用类似方式获取
-
-				String respCode = valideData.get("respCode");
-				// 判断respCode=00、A6后，对涉及资金类的交易，请再发起查询接口查询，确定交易成功后更新数据库。
-				logger.info("orderId>>>" + orderId + " respCode>>" + respCode);
-			}
-
-			request.setAttribute("result", page.toString());
-			logger.info("FrontRcvResponse前台接收报文返回结束");
-
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
-		}
-
-		return "utf8_result.html";
-	}
-
-	/**
-	 * 将回调参数转为Map
-	 *
-	 * @param notifyStr
-	 * @return {Map<String, String>}
-	 */
-	public static Map<String, String> getAllRequestParamToMap(final String notifyStr) {
-		Map<String, String> res = new HashMap<String, String>();
-		try {
-			logger.info("收到通知报文：" + notifyStr);
-			String[] kvs = notifyStr.split("&");
-			for (String kv : kvs) {
-				String[] tmp = kv.split("=");
-				if (tmp.length >= 2) {
-					String key = tmp[0];
-					String value = URLDecoder.decode(tmp[1], "UTF-8");
-					res.put(key, value);
-				}
-			}
-		} catch (UnsupportedEncodingException e) {
-			logger.info("getAllRequestParamStream.UnsupportedEncodingException error: " + e.getClass() + ":"
-					+ e.getMessage());
-		}
-		return res;
-	}
-
-	/**
-	 * 组装请求，返回报文字符串用于显示
-	 *
-	 * @param data
-	 * @return {String}
-	 */
-	public static String getHtmlResult(Map<String, String> data) {
-
-		TreeMap<String, String> tree = new TreeMap<String, String>();
-		Iterator<Entry<String, String>> it = data.entrySet().iterator();
-		while (it.hasNext()) {
-			Entry<String, String> en = it.next();
-			tree.put(en.getKey(), en.getValue());
-		}
-		it = tree.entrySet().iterator();
-		StringBuffer sf = new StringBuffer();
-		while (it.hasNext()) {
-			Entry<String, String> en = it.next();
-			String key = en.getKey();
-			String value = en.getValue();
-			if ("respCode".equals(key)) {
-				sf.append("<b>" + key + "=" + value + "</br></b>");
-			} else
-				sf.append(key + "=" + value + "</br>");
-		}
-		return sf.toString();
-	}
+            Map<String, String> reqData = UnionPayApiConfig.builder()
+                    .setTxnType("79")
+                    .setTxnSubType("01")
+                    .setBizType("000301")
+                    .setChannelType("07") //渠道类型，07-PC，08-手机
+                    .setMerId("777290058151764")
+                    .setAccessType("0")
+                    .setAccType("01")
+                    .setOrderId(String.valueOf(System.currentTimeMillis()))//商户订单号，8-40位数字字母，不能含“-”或“_”，可以自行定制规则，重新产生，不同于原消费
+                    .setTxnTime(DateUtil.format(new Date(), "yyyyMMddHHmmss"))//订单发送时间，格式为YYYYMMDDhhmmss，必须取当前时间，否则会报txnTime无效
+                    .setAccNo(accNoEnc)
+                    .setBackUrl(SDKConfig.getConfig().getBackUrl())
+                    .setFrontUrl(SDKConfig.getConfig().getFrontUrl())
+                    .setEncryptCertId(AcpService.getEncryptCertId())//加密证书的certId，配置在acp_sdk.properties文件 acpsdk.encryptCert.path属性下
+                    .setCustomerInfo(customerInfoStr)
+                    .createMap();
+            UnionPayApi.frontRequest(response, reqData);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 无跳转支付银联测开通并消费
+     */
+    @RequestMapping(value = "/openAndConsume", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public void openAndConsume(HttpServletResponse response) {
+        try {
+            //卡号
+            String accNoEnc = AcpService.encryptData("6216261000000000018", DemoBase.encoding);
+
+
+            Map<String, String> reqData = UnionPayApiConfig.builder()
+                    .setTxnType("01")
+                    .setTxnSubType("01")
+                    .setBizType("000301")
+                    .setChannelType("07") //渠道类型，07-PC，08-手机
+                    .setMerId("777290058151764")
+                    .setAccessType("0")
+                    .setAccType("01")
+                    .setTxnAmt("6363")
+                    .setOrderId(String.valueOf(System.currentTimeMillis()))//商户订单号，8-40位数字字母，不能含“-”或“_”，可以自行定制规则，重新产生，不同于原消费
+                    .setTxnTime(DateUtil.format(new Date(), "yyyyMMddHHmmss"))//订单发送时间，格式为YYYYMMDDhhmmss，必须取当前时间，否则会报txnTime无效
+                    .setAccNo(accNoEnc)
+                    .setEncryptCertId(AcpService.getEncryptCertId())//加密证书的certId，配置在acp_sdk.properties文件 acpsdk.encryptCert.path属性下
+                    .setBackUrl(SDKConfig.getConfig().getBackUrl())
+                    .setFrontUrl(SDKConfig.getConfig().getFrontUrl())
+                    .createMap();
+            UnionPayApi.frontRequest(response, reqData);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 后台回调
+     */
+    @RequestMapping(value = "/backRcvResponse", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public String backRcvResponse(HttpServletRequest request) {
+        logger.info("BackRcvResponse接收后台通知开始");
+
+        String encoding = "UTF-8";
+
+        String notifyStr = readData(request);
+        // 获取银联通知服务器发送的后台通知参数
+        Map<String, String> reqParam = getAllRequestParamToMap(notifyStr);
+        LogUtil.printRequestLog(reqParam);
+
+        // 重要！验证签名前不要修改reqParam中的键值对的内容，否则会验签不过
+        if (!AcpService.validate(reqParam, encoding)) {
+            logger.info("后台验证签名结果[失败].");
+            // 验签失败，需解决验签问题
+
+        } else {
+            logger.info("后台验证签名结果[成功].");
+            // 【注：为了安全验签成功才应该写商户的成功处理逻辑】交易成功，更新商户订单状态
+
+            String orderId = reqParam.get("orderId"); // 获取后台通知的数据，其他字段也可用类似方式获取
+            String respCode = reqParam.get("respCode");
+            // 判断respCode=00、A6后，对涉及资金类的交易，请再发起查询接口查询，确定交易成功后更新数据库。
+            logger.info("orderId>>>" + orderId + " respCode>>" + respCode);
+        }
+        logger.info("BackRcvResponse接收后台通知结束");
+        // 返回给银联服务器http 200 状态码
+        return "ok";
+    }
+
+    /**
+     * 前台回调
+     */
+    @RequestMapping(value = "/frontRcvResponse", method = {RequestMethod.POST, RequestMethod.GET})
+    public String frontRcvResponse(HttpServletRequest request, HttpServletResponse response) {
+        try {
+            logger.info("FrontRcvResponse前台接收报文返回开始");
+
+            String encoding = "UTF-8";
+            logger.info("返回报文中encoding=[" + encoding + "]");
+            String readData = readData(request);
+            Map<String, String> respParam = getAllRequestParamToMap(readData);
+
+            // 打印请求报文
+            LogUtil.printRequestLog(respParam);
+
+            Map<String, String> valideData = null;
+            StringBuffer page = new StringBuffer();
+            if (null != respParam && !respParam.isEmpty()) {
+                Iterator<Map.Entry<String, String>> it = respParam.entrySet().iterator();
+                valideData = new HashMap<String, String>(respParam.size());
+                while (it.hasNext()) {
+                    Map.Entry<String, String> e = it.next();
+                    String key = (String) e.getKey();
+                    String value = (String) e.getValue();
+                    value = new String(value.getBytes(encoding), encoding);
+                    page.append("<tr><td width=\"30%\" align=\"right\">" + key + "(" + key + ")</td><td>" + value
+                            + "</td></tr>");
+                    valideData.put(key, value);
+                }
+            }
+            if (!AcpService.validate(valideData, encoding)) {
+                page.append("<tr><td width=\"30%\" align=\"right\">前台验证签名结果</td><td>失败</td></tr>");
+                logger.info("前台验证签名结果[失败].");
+            } else {
+                page.append("<tr><td width=\"30%\" align=\"right\">前台验证签名结果</td><td>成功</td></tr>");
+                logger.info("前台验证签名结果[成功].");
+                String orderId = valideData.get("orderId"); // 其他字段也可用类似方式获取
+
+                String respCode = valideData.get("respCode");
+                // 判断respCode=00、A6后，对涉及资金类的交易，请再发起查询接口查询，确定交易成功后更新数据库。
+                logger.info("orderId>>>" + orderId + " respCode>>" + respCode);
+            }
+
+            request.setAttribute("result", page.toString());
+            logger.info("FrontRcvResponse前台接收报文返回结束");
+
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        return "utf8_result.html";
+    }
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/wxpay/AbstractWxPayApiController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/wxpay/AbstractWxPayApiController.java
new file mode 100644
index 0000000000000000000000000000000000000000..e32909470f73d2446e429e85cb6ccc4ce62f913d
--- /dev/null
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/wxpay/AbstractWxPayApiController.java
@@ -0,0 +1,16 @@
+package com.zscat.mallplus.pay.controller.wxpay;
+
+
+import com.zscat.mallplus.wxpay.WxPayApiConfig;
+
+/**
+ * @author Javen
+ */
+public abstract class AbstractWxPayApiController {
+    /**
+     * 获取微信支付配置
+     *
+     * @return {@link WxPayApiConfig} 微信支付配置
+     */
+    public abstract WxPayApiConfig getApiConfig();
+}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/wxpay/WxPayApiController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/wxpay/WxPayApiController.java
deleted file mode 100644
index d6e0bcf48b1b516549151b6823b935c1326bf679..0000000000000000000000000000000000000000
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/wxpay/WxPayApiController.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.zscat.mallplus.pay.controller.wxpay;
-
-import com.jpay.weixin.api.WxPayApiConfig;
-
-public abstract class WxPayApiController{
-	public abstract WxPayApiConfig getApiConfig();
-}
\ No newline at end of file
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/wxpay/WxPayController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/wxpay/WxPayController.java
index d8322e11ed1d55351991d1ec7577fe132103f2e2..0469fb8e885fc8f6ad772ecb7d8afa3946d846fd 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/wxpay/WxPayController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/wxpay/WxPayController.java
@@ -1,33 +1,37 @@
 package com.zscat.mallplus.pay.controller.wxpay;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import com.jpay.ext.kit.*;
-import com.jpay.secure.RSAUtils;
-import com.jpay.vo.AjaxResult;
-import com.jpay.weixin.api.WxPayApi;
-import com.jpay.weixin.api.WxPayApi.TradeType;
-import com.jpay.weixin.api.WxPayApiConfig;
-import com.jpay.weixin.api.WxPayApiConfig.PayModel;
-import com.jpay.weixin.api.WxPayApiConfigKit;
-import com.zscat.mallplus.enums.AllEnum;
+import com.jfinal.kit.StrKit;
+import com.zscat.mallplus.core.enums.SignType;
+import com.zscat.mallplus.core.enums.TradeType;
+import com.zscat.mallplus.core.kit.*;
 import com.zscat.mallplus.enums.OrderStatus;
+import com.zscat.mallplus.exception.ApiMallPlusException;
 import com.zscat.mallplus.oms.entity.OmsOrder;
+import com.zscat.mallplus.oms.entity.OmsPayments;
+import com.zscat.mallplus.oms.service.IOmsOrderItemService;
 import com.zscat.mallplus.oms.service.IOmsOrderService;
 import com.zscat.mallplus.oms.service.IOmsPaymentsService;
-import com.zscat.mallplus.oms.vo.PayParam;
-import com.zscat.mallplus.oms.vo.PaymentParam;
-import com.zscat.mallplus.pay.entity.H5ScencInfo;
+import com.zscat.mallplus.pay.entity.H5SceneInfo;
 import com.zscat.mallplus.pay.entity.WxPayBean;
-import com.zscat.mallplus.sms.mapper.SmsGroupMapper;
+import com.zscat.mallplus.pay.vo.AjaxResult;
+import com.zscat.mallplus.ums.entity.SysAppletSet;
 import com.zscat.mallplus.ums.entity.UmsMember;
+import com.zscat.mallplus.ums.mapper.SysAppletSetMapper;
 import com.zscat.mallplus.ums.service.IUmsMemberService;
+import com.zscat.mallplus.util.JsonUtils;
 import com.zscat.mallplus.utils.CommonResult;
+import com.zscat.mallplus.wxpay.WxPayApi;
+import com.zscat.mallplus.wxpay.WxPayApiConfig;
+import com.zscat.mallplus.wxpay.model.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -41,204 +45,196 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>微信支付 Demo</p>
+ *
+ * @author Javen
+ */
 @RestController
-@RequestMapping("/api/wxpay")
-public class WxPayController extends WxPayApiController {
+@RequestMapping("api/wxPay")
+public class WxPayController extends AbstractWxPayApiController {
+    private static final String USER_PAYING = "USERPAYING";
     private Logger log = LoggerFactory.getLogger(this.getClass());
-    private AjaxResult result = new AjaxResult();
-
-    @Autowired
-    WxPayBean wxPayBean;
-
-    String notify_url;
-
     @Resource
     private IOmsOrderService orderService;
     @Resource
-    private IUmsMemberService memberService;
-    @Resource
-    private SmsGroupMapper groupMapper;
+    private IUmsMemberService umsMemberService;
     @Resource
+    private IOmsOrderItemService orderItemService;
+    @Autowired
     private IOmsPaymentsService paymentsService;
+    @Resource
+    private SysAppletSetMapper appletSetMapper;
+    private String notifyUrl = "http://java.chengguo.link:8081/api";
+    private String refundNotifyUrl;
+
     @Override
     public WxPayApiConfig getApiConfig() {
-        notify_url = wxPayBean.getDomain().concat("/wxpay/pay_notify");
-        return WxPayApiConfig.New()
-                .setAppId(wxPayBean.getAppId())
-                .setMchId(wxPayBean.getMchId())
-                .setPaternerKey(wxPayBean.getPartnerKey())
-                .setPayModel(PayModel.BUSINESSMODEL);
-    }
+        WxPayApiConfig apiConfig = null;
 
-    @RequestMapping("")
-    @ResponseBody
-    public String index() {
-        log.info("欢迎使用IJPay,商户模式下微信支付 - by Javen");
-        log.info(wxPayBean.toString());
-        return ("欢迎使用IJPay 商户模式下微信支付  - by Javen");
-    }
+        try {
+            OmsPayments payments = paymentsService.getById(1);
+            if (payments != null) {
+                WxPayBean wxPayBean = JsonUtils.jsonToPojo(payments.getParams(), WxPayBean.class);
+                apiConfig = WxPayApiConfig.builder()
+                        .appId(wxPayBean.getAppId())
+                        .mchId(wxPayBean.getMchId())
+                        .partnerKey(wxPayBean.getPartnerKey())
+                        .certPath(wxPayBean.getCertPath())
+                        .domain(wxPayBean.getDomain())
+                        .build();
+            }
+            notifyUrl = apiConfig.getDomain().concat("/wxPay/payNotify");
+            refundNotifyUrl = apiConfig.getDomain().concat("/wxPay/refundNotify");
+        } catch (Exception e) {
+            WxPayBean wxPayBean = new WxPayBean();
+            wxPayBean.setAppId("wx8321531c6046c924");
+            wxPayBean.setMchId("1533901051");
+            wxPayBean.setDomain("http://www.yjlive.cn/api/api");
+            wxPayBean.setPartnerKey("shen9136shen9136shen9136shen9136");
+            apiConfig = WxPayApiConfig.builder()
+                    .appId(wxPayBean.getAppId())
+                    .mchId(wxPayBean.getMchId())
+                    .partnerKey(wxPayBean.getPartnerKey())
+                    .certPath(wxPayBean.getCertPath())
+                    .domain(wxPayBean.getDomain())
+                    .build();
 
-    @RequestMapping("/test")
-    @ResponseBody
-    public String test() {
-        return wxPayBean.toString();
-    }
+            notifyUrl = apiConfig.getDomain().concat("/wxPay/payNotify");
+            refundNotifyUrl = apiConfig.getDomain().concat("/wxPay/refundNotify");
+        }
 
-    @RequestMapping("/getKey")
-    @ResponseBody
-    public String getKey() {
-        return WxPayApi.getsignkey(wxPayBean.getAppId(), wxPayBean.getPartnerKey());
+        return apiConfig;
     }
 
-    @RequestMapping("/ctp")
-    @ResponseBody
-    public String ctp(HttpServletRequest request) {
-        return request.getSession().getServletContext().getRealPath("/");
-    }
+    public WxPayApiConfig getApiConfig1() {
+        WxPayApiConfig apiConfig = null;
 
-    /**
-     * 微信H5 支付 注意：必须再web页面中发起支付且域名已添加到开发配置中
-     */
-    @PostMapping(value = "/user.pay")
-    public Object userPay(HttpServletRequest request, HttpServletResponse response,PayParam payParam) {
-        OmsOrder order = orderService.getById(payParam.getOrderId());
-        order.setPayCode(payParam.getPayment_code());
-        UmsMember currentMember = memberService.getNewCurrentMember();
-        PaymentParam paymentParam = payParam.getParams();
-        if ("balancepay".equals(payParam.getPayment_code())){
-            UmsMember member = memberService.getById(currentMember.getId());
-            if(order.getPayAmount().compareTo(member.getBlance())>0){
-                return new CommonResult().failed("余额不足！");
-            }else {
-                OmsOrder orders = orderService.blancePay(order);
-                return new CommonResult().success(orders);
+        try {
+            SysAppletSet appletSet = appletSetMapper.selectOne(new QueryWrapper<>());
+            if (null == appletSet) {
+                throw new ApiMallPlusException("没有设置支付配置");
             }
-        }
-        String ip = IpKit.getRealIp(request);
-        if (StrKit.isBlank(ip)) {
-            ip = "127.0.0.1";
-        }
-
-        H5ScencInfo sceneInfo = new H5ScencInfo();
-
-        H5ScencInfo.H5 h5_info = new H5ScencInfo.H5();
-        h5_info.setType("Wap");
-        // 此域名必须在商户平台--"产品中心"--"开发配置"中添加
-
-        h5_info.setWap_url("http://www.yjlive.cn");
-        h5_info.setWap_name("腾讯充值");
-        sceneInfo.setH5_info(h5_info);
-
-        Map<String, String> params = WxPayApiConfigKit
-                .getWxPayApiConfig()
-                .setAttach("IJPay H5支付测试  -By Javen")
-                .setBody("IJPay H5支付测试  -By Javen")
-                .setSpbillCreateIp(ip).setTotalFee(order.getPayAmount().multiply(new BigDecimal(100)).toString())
-                .setTradeType(TradeType.MWEB)
-                .setNotifyUrl(notify_url)
-                .setOutTradeNo(String.valueOf(System.currentTimeMillis()))
-                .setSceneInfo(h5_info.toString())
-                .build();
+            if (appletSet != null) {
+                apiConfig = WxPayApiConfig.builder()
+                        .appId(appletSet.getAppid())
+                        .mchId(appletSet.getMchid())
+                        .partnerKey(appletSet.getPaySignKey())
+                        .certPath(appletSet.getCertname())
+                        .domain(appletSet.getNotifyurl())
+                        .build();
+            }
+            notifyUrl = apiConfig.getDomain().concat("/wxPay/payNotify");
+            refundNotifyUrl = apiConfig.getDomain().concat("/wxPay/refundNotify");
+        } catch (Exception e) {
 
-        String xmlResult = WxPayApi.pushOrder(false, params);
-        log.info(xmlResult);
-        Map<String, String> result = PaymentKit.xmlToMap(xmlResult);
-
-        String return_code = result.get("return_code");
-        String return_msg = result.get("return_msg");
-        if (!PaymentKit.codeIsOK(return_code)) {
-            log.error("return_code>" + return_code + " return_msg>" + return_msg);
-            throw new RuntimeException(return_msg);
-        }
-        String result_code = result.get("result_code");
-        if (!PaymentKit.codeIsOK(result_code)) {
-            log.error("result_code>" + result_code + " return_msg>" + return_msg);
-            throw new RuntimeException(return_msg);
         }
-        // 以下字段在return_code 和result_code都为SUCCESS的时候有返回
-
-        String prepay_id = result.get("prepay_id");
-        String mweb_url = result.get("mweb_url");
 
-        log.info("prepay_id:" + prepay_id + " mweb_url:" + mweb_url);
-        try {
-            // 业务处理
-            order.setPrepayId(prepay_id);
-            // 付款中
-            order.setStatus(OrderStatus.PayNotNotice.getValue());
-            orderService.updateById(order);
-            response.sendRedirect(mweb_url);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return new CommonResult().success();
+        return apiConfig;
     }
+    @GetMapping("/getKey")
+    @ResponseBody
+    public void getKey() {
 
+        // return new CommonResult().success(WxPayApi.getSignKey(wxPayBean.getMchId(), wxPayBean.getPartnerKey(), SignType.MD5));
+    }
 
     /**
-     * 微信H5 支付 注意：必须再web页面中发起支付且域名已添加到开发配置中
+     * 微信H5 支付
+     * 注意：必须再web页面中发起支付且域名已添加到开发配置中
      */
     @RequestMapping(value = "/wapPay", method = {RequestMethod.POST, RequestMethod.GET})
-    public void wapPay(HttpServletRequest request, HttpServletResponse response,
-                       @RequestParam(value = "orderId", required = false, defaultValue = "0") Long orderId) {
-        OmsOrder orderInfo = orderService.getById(orderId);
-        String ip = IpKit.getRealIp(request);
-        if (StrKit.isBlank(ip)) {
-            ip = "127.0.0.1";
-        }
-
-        H5ScencInfo sceneInfo = new H5ScencInfo();
+    public Object wapPay(HttpServletRequest request, @RequestParam(value = "orderId", required = false, defaultValue = "0") Long orderId) throws IOException {
+        try {
+            String ip = IpKit.getRealIp(request);
+            if (StrKit.isBlank(ip)) {
+                ip = "127.0.0.1";
+            }
 
-        H5ScencInfo.H5 h5_info = new H5ScencInfo.H5();
-        h5_info.setType("Wap");
-        // 此域名必须在商户平台--"产品中心"--"开发配置"中添加
+            OmsOrder orderInfo = orderService.getById(orderId);
+            if (null == orderInfo) {
+                return new CommonResult().failed("订单已取消" );
+            }
+            if (orderInfo.getStatus() == OrderStatus.CLOSED.getValue()) {
+                return new CommonResult().failed( "订单已已关闭，请不要重复操作" );
+            }
+            if (orderInfo.getStatus() != OrderStatus.INIT.getValue()) {
+                return new CommonResult().failed( "订单已支付，请不要重复操作" );
+            }
 
-        h5_info.setWap_url("http://www.yjlive.cn");
-        h5_info.setWap_name("腾讯充值");
-        sceneInfo.setH5_info(h5_info);
+            H5SceneInfo sceneInfo = new H5SceneInfo();
+            WxPayApiConfig wxPayApiConfig = this.getApiConfig1();
+
+            H5SceneInfo.H5 h5_info = new H5SceneInfo.H5();
+            h5_info.setType("Wap");
+            //此域名必须在商户平台--"产品中心"--"开发配置"中添加
+            h5_info.setWap_url(wxPayApiConfig.getDomain());
+            h5_info.setWap_name("IJPay VIP 充值");
+            sceneInfo.setH5Info(h5_info);
+
+
+            Map<String, String> params = UnifiedOrderModel
+                    .builder()
+                    .appid(wxPayApiConfig.getAppId())
+                    .mch_id(wxPayApiConfig.getMchId())
+                    .nonce_str(WxPayKit.generateStr())
+                    .body("mallplus  微信H5 支付")
+                    .attach(orderInfo.getStoreName())
+                    .out_trade_no(orderInfo.getOrderSn())
+                    .total_fee(orderInfo.getPayAmount().multiply(new BigDecimal(100)).intValue()+"")
+                    .spbill_create_ip(ip)
+                    .notify_url(notifyUrl)
+                    .trade_type(TradeType.MWEB.getTradeType())
+                    .scene_info(JSON.toJSONString(sceneInfo))
+                    .build()
+                    .createSign(wxPayApiConfig.getPartnerKey(), SignType.HMACSHA256);
+            log.info("params:"+params.toString());
+            String xmlResult = WxPayApi.pushOrder(false, params);
+            log.info("xmlResult:"+xmlResult);
 
-        Map<String, String> params = WxPayApiConfigKit
-                .getWxPayApiConfig()
-                .setAttach("IJPay H5支付测试  -By Javen")
-                .setBody("IJPay H5支付测试  -By Javen")
-                .setSpbillCreateIp(ip).setTotalFee(orderInfo.getPayAmount().multiply(new BigDecimal(100)).toString())
-                .setTradeType(TradeType.MWEB)
-                .setNotifyUrl(notify_url)
-                .setOutTradeNo(String.valueOf(System.currentTimeMillis()))
-                .setSceneInfo(h5_info.toString())
-                .build();
+            Map<String, String> result = WxPayKit.xmlToMap(xmlResult);
 
-        String xmlResult = WxPayApi.pushOrder(false, params);
-        log.info(xmlResult);
-        Map<String, String> result = PaymentKit.xmlToMap(xmlResult);
-
-        String return_code = result.get("return_code");
-        String return_msg = result.get("return_msg");
-        if (!PaymentKit.codeIsOK(return_code)) {
-            log.error("return_code>" + return_code + " return_msg>" + return_msg);
-            throw new RuntimeException(return_msg);
-        }
-        String result_code = result.get("result_code");
-        if (!PaymentKit.codeIsOK(result_code)) {
-            log.error("result_code>" + result_code + " return_msg>" + return_msg);
-            throw new RuntimeException(return_msg);
-        }
-        // 以下字段在return_code 和result_code都为SUCCESS的时候有返回
+            String return_code = result.get("return_code");
+            String return_msg = result.get("return_msg");
+            if (!WxPayKit.codeIsOk(return_code)) {
+                throw new RuntimeException(return_msg);
+            }
+            String result_code = result.get("result_code");
+            if (!WxPayKit.codeIsOk(result_code)) {
+                throw new RuntimeException(return_msg);
+            }
+            // 以下字段在return_code 和result_code都为SUCCESS的时候有返回
 
-        String prepay_id = result.get("prepay_id");
-        String mweb_url = result.get("mweb_url");
+            String prepayId = result.get("prepay_id");
+            String webUrl = result.get("mweb_url");
 
-        log.info("prepay_id:" + prepay_id + " mweb_url:" + mweb_url);
-        try {
-            // 业务处理
-            orderInfo.setPrepayId(prepay_id);
-            // 付款中
-            orderInfo.setStatus(OrderStatus.PayNotNotice.getValue());
-            orderService.updateById(orderInfo);
-            response.sendRedirect(mweb_url);
-        } catch (IOException e) {
+            log.info("prepay_id:" + prepayId + " mweb_url:" + webUrl);
+            //   response.sendRedirect(webUrl);
+            return new CommonResult().success(webUrl);
+        }catch (Exception e){
             e.printStackTrace();
+            return new CommonResult().failed(e.getMessage());
         }
+
+    }
+
+    /**
+     * openId，采用 网页授权获取 access_token API：SnsAccessTokenApi获取
+     */
+    @RequestMapping(value = "/authCodeToOpenid", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public Object authCodeToOpenid(@RequestParam(value = "wxH5Appid", required = true, defaultValue = "0")String wxH5Appid,
+                                   @RequestParam(value = "wxH5Secret", required = true, defaultValue = "0")String wxH5Secret,
+                                   @RequestParam(value = "code", required = true, defaultValue = "0")String code) {
+        return new CommonResult().success(umsMemberService.webLogin( wxH5Appid, wxH5Secret,  code));
     }
 
     /**
@@ -246,205 +242,201 @@ public class WxPayController extends WxPayApiController {
      */
     @RequestMapping(value = "/webPay", method = {RequestMethod.POST, RequestMethod.GET})
     @ResponseBody
-    public Object webPay(HttpServletRequest request, HttpServletResponse response,
-                             @RequestParam(value = "orderId", required = false, defaultValue = "0") Long orderId) {
-        OmsOrder orderInfo = orderService.getById(orderId);
-        // openId，采用 网页授权获取 access_token API：SnsAccessTokenApi获取
-        String openId = (String) request.getSession().getAttribute("openId");
-
-        if (StrKit.isBlank(openId)) {
-            return new CommonResult().failed("openId is null");
-        }
-
+    public Object webPay(HttpServletRequest request, @RequestParam(value = "orderId", required = true, defaultValue = "0") Long orderId) {
+        try {
+            String totalFee = "0.01";
+            // openId，采用 网页授权获取 access_token API：SnsAccessTokenApi获取
+            UmsMember member = umsMemberService.getNewCurrentMember();
+            String openId = member.getWeixinOpenid();
+            if (StrUtil.isEmpty(openId)) {
+                return new CommonResult().failed("openId is null");
+            }
+            if (StrUtil.isEmpty(totalFee)) {
+                return new CommonResult().failed("请输入数字金额");
+            }
+            String ip = IpKit.getRealIp(request);
+            if (StrUtil.isEmpty(ip)) {
+                ip = "127.0.0.1";
+            }
 
-        String ip = IpKit.getRealIp(request);
-        if (StrKit.isBlank(ip)) {
-            ip = "127.0.0.1";
-        }
+            OmsOrder orderInfo = orderService.getById(orderId);
+            if (null == orderInfo) {
+                return new CommonResult().failed("订单已取消" );
+            }
+            if (orderInfo.getStatus() == OrderStatus.CLOSED.getValue()) {
+                return new CommonResult().failed( "订单已已关闭，请不要重复操作" );
+            }
+            if (orderInfo.getStatus() != OrderStatus.INIT.getValue()) {
+                return new CommonResult().failed( "订单已支付，请不要重复操作" );
+            }
+            System.out.println(orderInfo.getPayAmount().multiply(new BigDecimal(100)).toPlainString());
+
+            WxPayApiConfig wxPayApiConfig = this.getApiConfig();
+            Map<String, String> params = UnifiedOrderModel
+                    .builder()
+                    .appid(wxPayApiConfig.getAppId())
+                    .mch_id(wxPayApiConfig.getMchId())
+                    .nonce_str(WxPayKit.generateStr())
+                    .body("mallplus 公众号支付") // IJPay 让支付触手可及-公众号支付
+                    .attach(orderInfo.getStoreName())
+                    .out_trade_no(orderInfo.getOrderSn())
+                    .total_fee(orderInfo.getPayAmount().multiply(new BigDecimal(100)).intValue()+"")
+                    .spbill_create_ip(ip)
+                    .notify_url(notifyUrl)
+                    .trade_type(TradeType.JSAPI.getTradeType())
+                    .openid(openId)
+                    .build()
+                    .createSign(wxPayApiConfig.getPartnerKey(), SignType.HMACSHA256);
 
-        Map<String, String> params = WxPayApiConfigKit
-                .getWxPayApiConfig()
-                .setAttach("IJPay 公众号支付测试  -By Javen")
-                .setBody("IJPay 公众号支付测试  -By Javen")
-                .setOpenId(openId)
-                .setSpbillCreateIp(ip)
-                .setTotalFee(orderInfo.getPayAmount().multiply(new BigDecimal(100)).toString())
-                .setTradeType(TradeType.JSAPI).setNotifyUrl(notify_url)
-                .setOutTradeNo(String.valueOf(System.currentTimeMillis()))
-                .build();
+            String xmlResult = WxPayApi.pushOrder(false, params);
+            log.info("xmlResult:"+xmlResult);
 
-        String xmlResult = WxPayApi.pushOrder(false, params);
-        log.info(xmlResult);
-        Map<String, String> resultMap = PaymentKit.xmlToMap(xmlResult);
+            Map<String, String> resultMap = WxPayKit.xmlToMap(xmlResult);
+            String returnCode = resultMap.get("return_code");
+            String returnMsg = resultMap.get("return_msg");
+            if (!WxPayKit.codeIsOk(returnCode)) {
+                return new CommonResult().failed(returnMsg);
+            }
+            String resultCode = resultMap.get("result_code");
+            if (!WxPayKit.codeIsOk(resultCode)) {
+                return new CommonResult().failed(returnMsg);
+            }
 
-        String return_code = resultMap.get("return_code");
-        String return_msg = resultMap.get("return_msg");
-        if (!PaymentKit.codeIsOK(return_code)) {
-            return new CommonResult().failed(return_msg);
-        }
-        String result_code = resultMap.get("result_code");
-        if (!PaymentKit.codeIsOK(result_code)) {
-            return new CommonResult().failed(return_msg);
-        }
-        // 以下字段在return_code 和result_code都为SUCCESS的时候有返回
+            // 以下字段在 return_code 和 result_code 都为 SUCCESS 的时候有返回
 
-        String prepay_id = resultMap.get("prepay_id");
+            String prepayId = resultMap.get("prepay_id");
 
-        Map<String, String> packageParams = PaymentKit.prepayIdCreateSign(prepay_id);
+            Map<String, String> packageParams = WxPayKit.prepayIdCreateSign(prepayId, wxPayApiConfig.getAppId(),
+                    wxPayApiConfig.getPartnerKey(), SignType.HMACSHA256);
 
-        String jsonStr = JSON.toJSONString(packageParams);
+            String jsonStr = JSON.toJSONString(packageParams);
+            return new CommonResult().success(jsonStr);
+        }catch (Exception e){
+            e.printStackTrace();
+            return new CommonResult().failed(e.getMessage());
+        }
 
-        return new CommonResult().success(jsonStr);
     }
 
     /**
-     * 生成支付二维码（模式一）并在页面上显示
+     * 扫码模式一
      */
     @RequestMapping(value = "/scanCode1", method = {RequestMethod.POST, RequestMethod.GET})
     @ResponseBody
-    public AjaxResult scanCode1(HttpServletRequest request, HttpServletResponse response,
-                                @RequestParam("productId") String product_id) {
+    public Object scanCode1(HttpServletRequest request, HttpServletResponse response,
+                            @RequestParam("productId") String productId) {
         try {
-            if (StrKit.isBlank(product_id)) {
-                result.addError("productId is null");
-                return result;
+            if (StrKit.isBlank(productId)) {
+                return new CommonResult().failed("productId is null");
             }
-            WxPayApiConfig config = WxPayApiConfigKit.getWxPayApiConfig();
-            // 获取扫码支付（模式一）url
-
-            String qrCodeUrl = WxPayApi.getCodeUrl(config.getAppId(), config.getMchId(), product_id,
-                    config.getPaternerKey(), true);
+            WxPayApiConfig config = this.getApiConfig();
+            //获取扫码支付（模式一）url
+            String qrCodeUrl = WxPayKit.bizPayUrl(config.getPartnerKey(), config.getAppId(), config.getMchId(), productId);
             log.info(qrCodeUrl);
-            // 生成二维码保存的路径
-
+            //生成二维码保存的路径
             String name = "payQRCode1.png";
-            System.out.println(request.getSession().getServletContext().getRealPath("/") + File.separator + name);
-            Boolean encode = ZxingKit.encode(qrCodeUrl, BarcodeFormat.QR_CODE, 3, ErrorCorrectionLevel.H, "png", 200,
-                    200, request.getSession().getServletContext().getRealPath("/") + File.separator + name);
+            log.info(ResourceUtils.getURL("classpath:").getPath());
+            Boolean encode = QrCodeKit.encode(qrCodeUrl, BarcodeFormat.QR_CODE, 3, ErrorCorrectionLevel.H,
+                    "png", 200, 200,
+                    ResourceUtils.getURL("classpath:").getPath().concat("static").concat(File.separator).concat(name));
             if (encode) {
-                // 在页面上显示
-                result.success(name);
-                return result;
+                //在页面上显示
+                return new AjaxResult().success(name);
             }
         } catch (Exception e) {
             e.printStackTrace();
-            result.addError("系统异常：" + e.getMessage());
-            return result;
+            return new CommonResult().failed("系统异常：" + e.getMessage());
         }
-
         return null;
     }
 
     /**
-     * 扫码支付模式一回调 已测试
+     * 扫码支付模式一回调
      */
-    @RequestMapping(value = "/wxpay", method = {RequestMethod.POST, RequestMethod.GET})
+    @RequestMapping(value = "/scanCodeNotify", method = {RequestMethod.POST, RequestMethod.GET})
     @ResponseBody
-    public String wxpay(HttpServletRequest request, HttpServletResponse response) {
+    public String scanCodeNotify(HttpServletRequest request, HttpServletResponse response) {
         try {
             String result = HttpKit.readData(request);
-            System.out.println("callBack_xml>>>" + result);
+            log.info("scanCodeNotify>>>" + result);
             /**
-             *
              * 获取返回的信息内容中各个参数的值
-             *
              */
-            Map<String, String> map = PaymentKit.xmlToMap(result);
+            Map<String, String> map = WxPayKit.xmlToMap(result);
             for (String key : map.keySet()) {
-                System.out.println("key= " + key + " and value= " + map.get(key));
+                log.info("key= " + key + " and value= " + map.get(key));
             }
 
-            String appid = map.get("appid");
-            String openid = map.get("openid");
-            String mch_id = map.get("mch_id");
-            String is_subscribe = map.get("is_subscribe");
-            String nonce_str = map.get("nonce_str");
-            String product_id = map.get("product_id");
+            String appId = map.get("appid");
+            String openId = map.get("openid");
+            String mchId = map.get("mch_id");
+            String isSubscribe = map.get("is_subscribe");
+            String nonceStr = map.get("nonce_str");
+            String productId = map.get("product_id");
             String sign = map.get("sign");
-            Map<String, String> packageParams = new HashMap<String, String>();
-            packageParams.put("appid", appid);
-            packageParams.put("openid", openid);
-            packageParams.put("mch_id", mch_id);
-            packageParams.put("is_subscribe", is_subscribe);
-            packageParams.put("nonce_str", nonce_str);
-            packageParams.put("product_id", product_id);
-
-            String packageSign = PaymentKit.createSign(packageParams,
-                    WxPayApiConfigKit.getWxPayApiConfig().getPaternerKey());
-            // 统一下单文档地址：https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1
+
+            Map<String, String> packageParams = new HashMap<String, String>(6);
+            packageParams.put("appid", appId);
+            packageParams.put("openid", openId);
+            packageParams.put("mch_id", mchId);
+            packageParams.put("is_subscribe", isSubscribe);
+            packageParams.put("nonce_str", nonceStr);
+            packageParams.put("product_id", productId);
+
+            WxPayApiConfig wxPayApiConfig = this.getApiConfig();
+
+            String packageSign = WxPayKit.createSign(packageParams, wxPayApiConfig.getPartnerKey(), SignType.MD5);
 
             String ip = IpKit.getRealIp(request);
             if (StrKit.isBlank(ip)) {
                 ip = "127.0.0.1";
             }
-
-            Map<String, String> params = WxPayApiConfigKit
-                    .getWxPayApiConfig()
-                    .setAttach("IJPay 扫码模式一测试  -By Javen")
-                    .setBody("IJPay 扫码模式一测试  -By Javen")
-                    .setOpenId(openid)
-                    .setSpbillCreateIp(ip)
-                    .setTotalFee("1")
-                    .setTradeType(TradeType.NATIVE)
-                    .setNotifyUrl(notify_url)
-                    .setOutTradeNo(String.valueOf(System.currentTimeMillis()))
-                    .build();
-
+            Map<String, String> params = UnifiedOrderModel
+                    .builder()
+                    .appid(wxPayApiConfig.getAppId())
+                    .mch_id(wxPayApiConfig.getMchId())
+                    .nonce_str(WxPayKit.generateStr())
+                    .body("IJPay 让支付触手可及-扫码支付模式一")
+                    .attach("Node.js 版:https://gitee.com/javen205/TNW")
+                    .out_trade_no(WxPayKit.generateStr())
+                    .total_fee("1")
+                    .spbill_create_ip(ip)
+                    .notify_url(notifyUrl)
+                    .trade_type(TradeType.NATIVE.getTradeType())
+                    .openid(openId)
+                    .build()
+                    .createSign(wxPayApiConfig.getPartnerKey(), SignType.HMACSHA256);
             String xmlResult = WxPayApi.pushOrder(false, params);
-            log.info("prepay_xml>>>" + xmlResult);
-
+            log.info("统一下单:" + xmlResult);
             /**
-             *
              * 发送信息给微信服务器
-             *
              */
-            Map<String, String> payResult = PaymentKit.xmlToMap(xmlResult);
-
-            String return_code = payResult.get("return_code");
-            String result_code = payResult.get("result_code");
-
-            if (StrKit.notBlank(return_code) && StrKit.notBlank(result_code) && return_code.equalsIgnoreCase("SUCCESS")
-                    && result_code.equalsIgnoreCase("SUCCESS")) {
-                // 以下字段在return_code 和result_code都为SUCCESS的时候有返回
-
-                String prepay_id = payResult.get("prepay_id");
-
-                Map<String, String> prepayParams = new HashMap<String, String>();
+            Map<String, String> payResult = WxPayKit.xmlToMap(xmlResult);
+            String returnCode = payResult.get("return_code");
+            String resultCode = payResult.get("result_code");
+            if (WxPayKit.codeIsOk(returnCode) && WxPayKit.codeIsOk(resultCode)) {
+                // 以下字段在 return_code 和 result_code 都为 SUCCESS 的时候有返回
+                String prepayId = payResult.get("prepay_id");
+
+                Map<String, String> prepayParams = new HashMap<String, String>(10);
                 prepayParams.put("return_code", "SUCCESS");
-                prepayParams.put("appId", appid);
-                prepayParams.put("mch_id", mch_id);
+                prepayParams.put("appid", appId);
+                prepayParams.put("mch_id", mchId);
                 prepayParams.put("nonceStr", System.currentTimeMillis() + "");
-                prepayParams.put("prepay_id", prepay_id);
+                prepayParams.put("prepay_id", prepayId);
                 String prepaySign = null;
                 if (sign.equals(packageSign)) {
-                    // 业务处理
-                    OmsOrder param = new OmsOrder();
-                    param.setOrderSn(prepay_id);
-                    List<OmsOrder> list = orderService.list(new QueryWrapper<>(param));
-                    OmsOrder orderInfo = list.get(0);
-                    orderInfo.setStatus(OrderStatus.TO_DELIVER.getValue());
-                    orderInfo.setPaymentTime(new Date());
-                    orderService.updateById(orderInfo);
-                    if (orderInfo.getPid()==null){
-                        OmsOrder neworder = new OmsOrder();
-                        neworder.setStatus(OrderStatus.TO_DELIVER.getValue());
-                        neworder.setPayType(AllEnum.OrderPayType.weixinAppletPay.code());
-                        neworder.setPaymentTime(new Date());
-                        orderService.update(neworder,new QueryWrapper<OmsOrder>().eq("pid",orderInfo.getId()));
-                    }
                     prepayParams.put("result_code", "SUCCESS");
                 } else {
                     prepayParams.put("result_code", "FAIL");
-                    prepayParams.put("err_code_des", "订单失效"); // result_code为FAIL时，添加该键值对，value值是微信告诉客户的信息
-
+                    //result_code为FAIL时，添加该键值对，value值是微信告诉客户的信息
+                    prepayParams.put("err_code_des", "订单失效");
                 }
-                prepaySign = PaymentKit.createSign(prepayParams,
-                        WxPayApiConfigKit.getWxPayApiConfig().getPaternerKey());
+                prepaySign = WxPayKit.createSign(prepayParams, wxPayApiConfig.getPartnerKey(), SignType.HMACSHA256);
                 prepayParams.put("sign", prepaySign);
-                String xml = PaymentKit.toXml(prepayParams);
+                String xml = WxPayKit.toXml(prepayParams);
                 log.error(xml);
                 return xml;
-
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -453,150 +445,127 @@ public class WxPayController extends WxPayApiController {
     }
 
     /**
-     * 扫码支付模式二 已测试
+     * 扫码支付模式二
      */
     @RequestMapping(value = "/scanCode2", method = {RequestMethod.POST, RequestMethod.GET})
     @ResponseBody
-    public AjaxResult scanCode2(HttpServletRequest request, HttpServletResponse response,
-                                @RequestParam("total_fee") String total_fee) {
-
-        // String openId="o5NJx1dVRilQI6uUVSaBDuLnM3iM";
-
-        String openId = (String) request.getSession().getAttribute("openId");
+    public Object scanCode2(HttpServletRequest request, HttpServletResponse response,
+                            @RequestParam("total_fee") String totalFee) {
 
-        if (StrKit.isBlank(openId)) {
-            result.addError("openId is null");
-            return result;
-        }
-        if (StrKit.isBlank(total_fee)) {
-            result.addError("支付金额不能为空");
-            return result;
+        if (StrKit.isBlank(totalFee)) {
+            return new CommonResult().failed("支付金额不能为空");
         }
 
         String ip = IpKit.getRealIp(request);
         if (StrKit.isBlank(ip)) {
             ip = "127.0.0.1";
         }
-
-        Map<String, String> params = WxPayApiConfigKit
-                .getWxPayApiConfig()
-                .setAttach("IJPay 测试  -By Javen")
-                .setBody("IJPay 扫码支付2测试  -By Javen")
-                .setOpenId(openId)
-                .setSpbillCreateIp(ip)
-                .setTotalFee(total_fee)
-                .setTradeType(TradeType.NATIVE)
-                .setNotifyUrl(notify_url)
-                .setOutTradeNo(String.valueOf(System.currentTimeMillis()))
-                .build();
+        WxPayApiConfig wxPayApiConfig = this.getApiConfig();
+
+        Map<String, String> params = UnifiedOrderModel
+                .builder()
+                .appid(wxPayApiConfig.getAppId())
+                .mch_id(wxPayApiConfig.getMchId())
+                .nonce_str(WxPayKit.generateStr())
+                .body("IJPay 让支付触手可及-扫码支付模式二")
+                .attach("Node.js 版:https://gitee.com/javen205/TNW")
+                .out_trade_no(WxPayKit.generateStr())
+                .total_fee("1")
+                .spbill_create_ip(ip)
+                .notify_url(notifyUrl)
+                .trade_type(TradeType.NATIVE.getTradeType())
+                .build()
+                .createSign(wxPayApiConfig.getPartnerKey(), SignType.HMACSHA256);
 
         String xmlResult = WxPayApi.pushOrder(false, params);
+        log.info("统一下单:" + xmlResult);
 
-        log.info(xmlResult);
-        Map<String, String> resultMap = PaymentKit.xmlToMap(xmlResult);
+        Map<String, String> result = WxPayKit.xmlToMap(xmlResult);
 
-        String return_code = resultMap.get("return_code");
-        String return_msg = resultMap.get("return_msg");
-        if (!PaymentKit.codeIsOK(return_code)) {
-            System.out.println(xmlResult);
-            result.addError("error:" + return_msg);
-            return result;
+        String returnCode = result.get("return_code");
+        String returnMsg = result.get("return_msg");
+        System.out.println(returnMsg);
+        if (!WxPayKit.codeIsOk(returnCode)) {
+            return new CommonResult().failed("error:" + returnMsg);
         }
-        String result_code = resultMap.get("result_code");
-        if (!PaymentKit.codeIsOK(result_code)) {
-            System.out.println(xmlResult);
-            result.addError("error:" + return_msg);
-            return result;
+        String resultCode = result.get("result_code");
+        if (!WxPayKit.codeIsOk(resultCode)) {
+            return new CommonResult().failed("error:" + returnMsg);
         }
-        // 生成预付订单success
+        //生成预付订单success
 
-        String qrCodeUrl = resultMap.get("code_url");
+        String qrCodeUrl = result.get("code_url");
         String name = "payQRCode2.png";
 
-        Boolean encode = ZxingKit.encode(qrCodeUrl, BarcodeFormat.QR_CODE, 3, ErrorCorrectionLevel.H, "png", 200, 200,
+        Boolean encode = QrCodeKit.encode(qrCodeUrl, BarcodeFormat.QR_CODE, 3, ErrorCorrectionLevel.H, "png", 200, 200,
                 request.getSession().getServletContext().getRealPath("/") + File.separator + name);
         if (encode) {
-            // renderQrCode(qrCodeUrl, 200, 200);
-
-            // 在页面上显示
-
-            result.success(name);
-            return result;
+            //在页面上显示
+            return new AjaxResult().success(name);
         }
         return null;
     }
 
     /**
-     * 刷卡支付 已测试
+     * 刷卡支付
      */
     @RequestMapping(value = "/micropay", method = {RequestMethod.POST, RequestMethod.GET})
     @ResponseBody
-    public AjaxResult micropay(HttpServletRequest request, HttpServletResponse response,
-                               @RequestParam(value = "orderId", required = false, defaultValue = "0") Long orderId,
-                               @RequestParam(value = "auth_code", required = false, defaultValue = "0") String auth_code) {
-
-        OmsOrder orderInfo = orderService.getById(orderId);
-
-        if (StrKit.isBlank(auth_code)) {
-            result.addError("auth_code参数错误");
-            return result;
+    public Object microPay(HttpServletRequest request, HttpServletResponse response) {
+        String authCode = request.getParameter("auth_code");
+        String totalFee = request.getParameter("total_fee");
+        if (StrKit.isBlank(totalFee)) {
+            return new CommonResult().failed("支付金额不能为空");
+        }
+        if (StrKit.isBlank(authCode)) {
+            return new CommonResult().failed("auth_code参数错误");
         }
-
         String ip = IpKit.getRealIp(request);
         if (StrKit.isBlank(ip)) {
             ip = "127.0.0.1";
         }
-
-        Map<String, String> params = WxPayApiConfigKit
-                .getWxPayApiConfig()
-                .setAttach("IJPay 测试  -By Javen")
-                .setBody("IJPay 刷卡支付测试 -By Javen")
-                .setSpbillCreateIp(ip)
-                .setTotalFee(orderInfo.getPayAmount().multiply(new BigDecimal(100)).toString())
-                .setAuthCode(auth_code)
-                .setTradeType(TradeType.MICROPAY)
-                .setNotifyUrl(notify_url)
-                .setOutTradeNo(String.valueOf(System.currentTimeMillis()))
-                .build();
-
-        String xmlResult = WxPayApi.micropay(false, params);
-
-        // 同步返回结果
-
+        WxPayApiConfig wxPayApiConfig = this.getApiConfig();
+
+        Map<String, String> params = MicroPayModel.builder()
+                .appid(wxPayApiConfig.getAppId())
+                .mch_id(wxPayApiConfig.getMchId())
+                .nonce_str(WxPayKit.generateStr())
+                .body("IJPay 让支付触手可及-刷卡支付")
+                .attach("Node.js 版:https://gitee.com/javen205/TNW")
+                .out_trade_no(WxPayKit.generateStr())
+                .total_fee("1")
+                .spbill_create_ip(ip)
+                .auth_code(authCode)
+                .build()
+                .createSign(wxPayApiConfig.getPartnerKey(), SignType.HMACSHA256);
+
+        String xmlResult = WxPayApi.microPay(false, params);
+        //同步返回结果
         log.info("xmlResult:" + xmlResult);
-
-        Map<String, String> resultMap = PaymentKit.xmlToMap(xmlResult);
-        String return_code = resultMap.get("return_code");
-        String return_msg = resultMap.get("return_msg");
-        if (!PaymentKit.codeIsOK(return_code)) {
-            // 通讯失败
-
-            String err_code = resultMap.get("err_code");
-            if (StrKit.notBlank(err_code)) {
-                // 用户支付中，需要输入密码
-
-                if (err_code.equals("USERPAYING")) {
-                    // 等待5秒后调用【查询订单API】https://pay.weixin.qq.com/wiki/doc/api/micropay.php?chapter=9_2
-
+        Map<String, String> result = WxPayKit.xmlToMap(xmlResult);
+        String returnCode = result.get("return_code");
+        String returnMsg = result.get("return_msg");
+        if (!WxPayKit.codeIsOk(returnCode)) {
+            //通讯失败
+            String errCode = result.get("err_code");
+            if (StrKit.notBlank(errCode)) {
+                //用户支付中，需要输入密码
+                if (USER_PAYING.equals(errCode)) {
+                    //等待5秒后调用【查询订单API】
                 }
             }
             log.info("提交刷卡支付失败>>" + xmlResult);
-            result.addError(return_msg);
-            return result;
+            return new CommonResult().failed(returnMsg);
         }
 
-        String result_code = resultMap.get("result_code");
-        if (!PaymentKit.codeIsOK(result_code)) {
-            // 支付失败
+        String resultCode = result.get("result_code");
+        if (!WxPayKit.codeIsOk(resultCode)) {
             log.info("支付失败>>" + xmlResult);
-            String err_code_des = resultMap.get("err_code_des");
-
-            result.addError(err_code_des);
-            return result;
+            String errCodeDes = result.get("err_code_des");
+            return new CommonResult().failed(errCodeDes);
         }
-        // 支付成功
-        result.success(xmlResult);
-        return result;
+        //支付成功
+        return new AjaxResult().success(xmlResult);
     }
 
     /**
@@ -604,169 +573,187 @@ public class WxPayController extends WxPayApiController {
      */
     @RequestMapping(value = "/appPay", method = {RequestMethod.POST, RequestMethod.GET})
     @ResponseBody
-    public AjaxResult appPay(HttpServletRequest request, @RequestParam(value = "orderId", required = false, defaultValue = "0") Long orderId) {
-        OmsOrder orderInfo = orderService.getById(orderId);
-        // 不用设置授权目录域名
-        // 统一下单地址 https://pay.weixin.qq.com/wiki/doc/api/app/app.php?chapter=9_1#
+    public Object appPay(HttpServletRequest request,@RequestParam(value = "orderId", required = false, defaultValue = "0") Long orderId) {
 
-        String ip = IpKit.getRealIp(request);
-        if (StrKit.isBlank(ip)) {
-            ip = "127.0.0.1";
-        }
+        try {
+            String ip = IpKit.getRealIp(request);
+            if (StrKit.isBlank(ip)) {
+                ip = "127.0.0.1";
+            }
+            OmsOrder orderInfo = orderService.getById(orderId);
+            if (null == orderInfo) {
+                return new CommonResult().failed("订单已取消" );
+            }
+            if (orderInfo.getStatus() == OrderStatus.CLOSED.getValue()) {
+                return new CommonResult().failed( "订单已已关闭，请不要重复操作" );
+            }
+            if (orderInfo.getStatus() != OrderStatus.INIT.getValue()) {
+                return new CommonResult().failed( "订单已支付，请不要重复操作" );
+            }
+            WxPayApiConfig wxPayApiConfig = this.getApiConfig();
+
+            Map<String, String> params = UnifiedOrderModel
+                    .builder()
+                    .appid(wxPayApiConfig.getAppId())
+                    .mch_id(wxPayApiConfig.getMchId())
+                    .nonce_str(WxPayKit.generateStr())
+                    .body("微信APP支付")
+                    .attach(orderInfo.getStoreName())
+                    .out_trade_no(orderInfo.getOrderSn())
+                    .total_fee(orderInfo.getPayAmount().multiply(new BigDecimal(100)).intValue()+"")
+                    .spbill_create_ip(ip)
+                    .notify_url(notifyUrl)
+                    .trade_type(TradeType.APP.getTradeType())
+                    .build()
+                    .createSign(wxPayApiConfig.getPartnerKey(), SignType.HMACSHA256);
 
-        Map<String, String> params = WxPayApiConfigKit
-                .getWxPayApiConfig()
-                .setAttach("IJPay 测试  -By Javen")
-                .setBody("IJPay App付测试  -By Javen")
-                .setSpbillCreateIp(ip)
-                .setTotalFee(orderInfo.getPayAmount().multiply(new BigDecimal(100)).toString())
-                .setTradeType(TradeType.APP)
-                .setNotifyUrl(notify_url)
-                .setOutTradeNo(String.valueOf(System.currentTimeMillis()))
-                .build();
+            String xmlResult = WxPayApi.pushOrder(false, params);
 
-        String xmlResult = WxPayApi.pushOrder(false, params);
+            log.info(xmlResult);
+            Map<String, String> result = WxPayKit.xmlToMap(xmlResult);
 
-        log.info(xmlResult);
-        Map<String, String> resultMap = PaymentKit.xmlToMap(xmlResult);
+            String returnCode = result.get("return_code");
+            String returnMsg = result.get("return_msg");
+            if (!WxPayKit.codeIsOk(returnCode)) {
+                return new CommonResult().failed(returnMsg);
+            }
+            String resultCode = result.get("result_code");
+            if (!WxPayKit.codeIsOk(resultCode)) {
+                return new CommonResult().failed(returnMsg);
+            }
+            // 以下字段在 return_code 和 result_code 都为 SUCCESS 的时候有返回
+            String prepayId = result.get("prepay_id");
 
-        String return_code = resultMap.get("return_code");
-        String return_msg = resultMap.get("return_msg");
-        if (!PaymentKit.codeIsOK(return_code)) {
-            log.info(xmlResult);
-            result.addError(return_msg);
-            return result;
-        }
-        String result_code = resultMap.get("result_code");
-        if (!PaymentKit.codeIsOK(result_code)) {
-            log.info(xmlResult);
-            result.addError(return_msg);
-            return result;
+            Map<String, String> packageParams = WxPayKit.appPrepayIdCreateSign(wxPayApiConfig.getAppId(), wxPayApiConfig.getMchId(), prepayId,
+                    wxPayApiConfig.getPartnerKey(), SignType.HMACSHA256);
+
+            //  WxAppPayDto dto = JsonUtils.map2pojo(packageParams, WxAppPayDto.class);
+            log.info("返回apk的参数:" + JsonUtils.objectToJson(packageParams));
+            return new CommonResult().success(JsonUtils.objectToJson(packageParams));
+        }catch (Exception e){
+            e.printStackTrace();
+            return new CommonResult().failed(e.getMessage());
         }
-        // 以下字段在return_code 和result_code都为SUCCESS的时候有返回
-
-        String prepay_id = resultMap.get("prepay_id");
-        // 封装调起微信支付的参数 https://pay.weixin.qq.com/wiki/doc/api/app/app.php?chapter=9_12
-
-        Map<String, String> packageParams = new HashMap<String, String>();
-        packageParams.put("appid", WxPayApiConfigKit.getWxPayApiConfig().getAppId());
-        packageParams.put("partnerid", WxPayApiConfigKit.getWxPayApiConfig().getMchId());
-        packageParams.put("prepayid", prepay_id);
-        packageParams.put("package", "Sign=WXPay");
-        packageParams.put("noncestr", System.currentTimeMillis() + "");
-        packageParams.put("timestamp", System.currentTimeMillis() / 1000 + "");
-        String packageSign = PaymentKit.createSign(packageParams,
-                WxPayApiConfigKit.getWxPayApiConfig().getPaternerKey());
-        packageParams.put("sign", packageSign);
-
-        String jsonStr = JSON.toJSONString(packageParams);
-        log.info("最新返回apk的参数:" + jsonStr);
-        result.success(jsonStr);
-        return result;
+
     }
 
     /**
      * 微信小程序支付
      */
-    @RequestMapping(value = "/aappPay", method = {RequestMethod.POST, RequestMethod.GET})
+    @RequestMapping(value = "/miniAppPay", method = {RequestMethod.POST, RequestMethod.GET})
     @ResponseBody
-    public AjaxResult aappPay(HttpServletRequest request) {
-        String openId = (String) request.getSession().getAttribute("openId");
-        String ip = IpKit.getRealIp(request);
-        if (StrKit.isBlank(ip)) {
-            ip = "127.0.0.1";
-        }
+    public Object miniAppPay(HttpServletRequest request,@RequestParam(value = "orderId", required = false, defaultValue = "0") Long orderId) {
+        try {
+            //需要通过授权来获取openId
+            UmsMember user = umsMemberService.getNewCurrentMember();
 
-        Map<String, String> params = WxPayApiConfigKit
-                .getWxPayApiConfig()
-                .setOpenId(openId)
-                .setAttach("IJPay 测试  -By Javen")
-                .setBody("IJPay 小程序支付测试  -By Javen")
-                .setSpbillCreateIp(ip)
-                .setTotalFee("1")
-               // .setTotalFee(orderInfo.getPayAmount().multiply(new BigDecimal(100)).toString())
-                .setTradeType(TradeType.JSAPI)
-                .setNotifyUrl(notify_url)
-                .setOutTradeNo(String.valueOf(System.currentTimeMillis()))
-                .build();
+            String ip = IpKit.getRealIp(request);
+            if (StrKit.isBlank(ip)) {
+                ip = "127.0.0.1";
+            }
 
-        String xmlResult = WxPayApi.pushOrder(false, params);
+            SysAppletSet appletSet = appletSetMapper.selectOne(new QueryWrapper<>());
+            if (null == appletSet) {
+                throw new ApiMallPlusException("没有设置支付配置");
+            }
+            OmsOrder orderInfo = orderService.getById(orderId);
+            if (null == orderInfo) {
+                return new CommonResult().failed("订单已取消" );
+            }
+            if (orderInfo.getStatus() == OrderStatus.CLOSED.getValue()) {
+                return new CommonResult().failed( "订单已已关闭，请不要重复操作" );
+            }
+            if (orderInfo.getStatus() != OrderStatus.INIT.getValue()) {
+                return new CommonResult().failed( "订单已支付，请不要重复操作" );
+            }
+            WxPayBean wxPayApiConfig = new WxPayBean();
+
+            wxPayApiConfig.setAppId(appletSet.getAppid());
+            wxPayApiConfig.setMchId(appletSet.getMchid());
+            wxPayApiConfig.setDomain(appletSet.getNotifyurl());
+            wxPayApiConfig.setPartnerKey(appletSet.getPaySignKey());
+
+            Map<String, String> params = UnifiedOrderModel
+                    .builder()
+                    .appid(wxPayApiConfig.getAppId())
+                    .mch_id(wxPayApiConfig.getMchId())
+                    .nonce_str(WxPayKit.generateStr())
+                    .body("mallplus-小程序支付")
+                    .attach("Node.js 版:https://gitee.com/javen205/TNW")
+                    .out_trade_no(orderInfo.getOrderSn())
+                    .total_fee(orderInfo.getPayAmount().multiply(new BigDecimal(100)).intValue()+"")
+                    .spbill_create_ip(ip)
+                    .notify_url(notifyUrl)
+                    .trade_type(TradeType.JSAPI.getTradeType())
+                    .openid(user.getWeixinOpenid())
+                    .build()
+                    .createSign(wxPayApiConfig.getPartnerKey(), SignType.HMACSHA256);
 
-        log.info(xmlResult);
-        Map<String, String> resultMap = PaymentKit.xmlToMap(xmlResult);
+            String xmlResult = WxPayApi.pushOrder(false, params);
 
-        String return_code = resultMap.get("return_code");
-        String return_msg = resultMap.get("return_msg");
-        if (!PaymentKit.codeIsOK(return_code)) {
-            result.addError(return_msg);
-            return result;
-        }
-        String result_code = resultMap.get("result_code");
-        if (!PaymentKit.codeIsOK(result_code)) {
-            result.addError(return_msg);
-            return result;
+            log.info(xmlResult);
+            Map<String, String> result = WxPayKit.xmlToMap(xmlResult);
+
+            String returnCode = result.get("return_code");
+            String returnMsg = result.get("return_msg");
+            if (!WxPayKit.codeIsOk(returnCode)) {
+                return new CommonResult().failed(returnMsg);
+            }
+            String resultCode = result.get("result_code");
+            if (!WxPayKit.codeIsOk(resultCode)) {
+                return new CommonResult().failed(returnMsg);
+            }
+            // 以下字段在 return_code 和 result_code 都为 SUCCESS 的时候有返回
+            String prepayId = result.get("prepay_id");
+            Map<String, String> packageParams = WxPayKit.miniAppPrepayIdCreateSign(wxPayApiConfig.getAppId(), prepayId,
+                    wxPayApiConfig.getPartnerKey(), SignType.HMACSHA256);
+            String jsonStr = JSON.toJSONString(packageParams);
+            log.info("小程序支付的参数:" + jsonStr);
+            return new CommonResult().success(packageParams);
+        }catch (Exception e){
+            e.printStackTrace();
+            return new CommonResult().failed(e.getMessage());
         }
-        // 以下字段在return_code 和result_code都为SUCCESS的时候有返回
-        String prepay_id = resultMap.get("prepay_id");
-        // 封装调起微信支付的参数https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=7_7&index=5
-        Map<String, String> packageParams = new HashMap<String, String>();
-        packageParams.put("appId", WxPayApiConfigKit.getWxPayApiConfig().getAppId());
-        packageParams.put("timeStamp", System.currentTimeMillis() / 1000 + "");
-        packageParams.put("nonceStr", System.currentTimeMillis() + "");
-        packageParams.put("package", "prepay_id=" + prepay_id);
-        packageParams.put("signType", "MD5");
-        String packageSign = PaymentKit.createSign(packageParams,
-                WxPayApiConfigKit.getWxPayApiConfig().getPaternerKey());
-        packageParams.put("paySign", packageSign);
-
-        String jsonStr = JSON.toJSONString(packageParams);
-        log.info("最新返回小程序支付的参数:" + jsonStr);
-        result.success(jsonStr);
-        return result;
+
     }
 
     /**
      * 企业付款到零钱
      */
-    @RequestMapping(value = "/transfers", method = {RequestMethod.POST, RequestMethod.GET})
+    @RequestMapping(value = "/transfer", method = {RequestMethod.POST, RequestMethod.GET})
     @ResponseBody
-    public String transfers(HttpServletRequest request, @RequestParam("openId") String openId) {
-        // openId = "oRMVFv8zhSH--EhJiu3z9G3kNX-o";
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("mch_appid", wxPayBean.getAppId());
-        params.put("mchid", wxPayBean.getMchId());
-        String nonceStr = String.valueOf(System.currentTimeMillis());
-        params.put("nonce_str", nonceStr);
-        String partnerTradeNo = String.valueOf(System.currentTimeMillis());
-        params.put("partner_trade_no", partnerTradeNo);
-        params.put("openid", openId);
-        params.put("check_name", "NO_CHECK");
-        params.put("amount", "100");
-        params.put("desc", "IJPay提现测试-By Javen");
+    public String transfer(HttpServletRequest request, @RequestParam("openId") String openId) {
+
         String ip = IpKit.getRealIp(request);
         if (StrKit.isBlank(ip)) {
             ip = "127.0.0.1";
         }
-        params.put("spbill_create_ip", ip);
 
-        params.put("sign", PaymentKit.createSign(params, wxPayBean.getPartnerKey()));
-        System.out.println("certPath>" + wxPayBean.getCertPath());
-        // 提现
-        String transfers = WxPayApi.transfers(params, wxPayBean.getCertPath(), wxPayBean.getMchId());
+        WxPayApiConfig wxPayApiConfig = this.getApiConfig();
+
+        Map<String, String> params = TransferModel.builder()
+                .mch_appid(wxPayApiConfig.getAppId())
+                .mchid(wxPayApiConfig.getMchId())
+                .nonce_str(WxPayKit.generateStr())
+                .partner_trade_no(WxPayKit.generateStr())
+                .openid(openId)
+                .check_name("NO_CHECK")
+                .amount("100")
+                .desc("IJPay 让支付触手可及-企业付款")
+                .spbill_create_ip(ip)
+                .build()
+                .createSign(wxPayApiConfig.getPartnerKey(), SignType.HMACSHA256, false);
 
+        // 提现
+        String transfers = WxPayApi.transfers(params, wxPayApiConfig.getCertPath(), wxPayApiConfig.getMchId());
         log.info("提现结果:" + transfers);
-        System.out.println("提现结果:" + transfers);
-
-        Map<String, String> map = PaymentKit.xmlToMap(transfers);
-        String return_code = map.get("return_code");
-        String result_code = null;
-        if (("SUCCESS").equals(return_code)) {
-            result_code = map.get("result_code");
-            if (("SUCCESS").equals(result_code)) {
-                // 提现成功
-            } else {
-                // 提现失败
-            }
+        Map<String, String> map = WxPayKit.xmlToMap(transfers);
+        String returnCode = map.get("return_code");
+        String resultCode = map.get("result_code");
+        if (WxPayKit.codeIsOk(returnCode) && WxPayKit.codeIsOk(resultCode)) {
+            // 提现成功
+        } else {
+            // 提现失败
         }
         return transfers;
     }
@@ -776,16 +763,19 @@ public class WxPayController extends WxPayApiController {
      */
     @RequestMapping(value = "/transferInfo", method = {RequestMethod.POST, RequestMethod.GET})
     @ResponseBody
-    public String transferInfo(@RequestParam("partner_trade_no") String partner_trade_no) {
+    public String transferInfo(@RequestParam("partner_trade_no") String partnerTradeNo) {
         try {
-            Map<String, String> params = new HashMap<String, String>();
-            params.put("nonce_str", System.currentTimeMillis() + "");
-            params.put("partner_trade_no", partner_trade_no);
-            params.put("mch_id", wxPayBean.getMchId());
-            params.put("appid", wxPayBean.getAppId());
-            params.put("sign", PaymentKit.createSign(params, wxPayBean.getPartnerKey()));
+            WxPayApiConfig wxPayApiConfig = this.getApiConfig();
+
+            Map<String, String> params = GetTransferInfoModel.builder()
+                    .nonce_str(WxPayKit.generateStr())
+                    .partner_trade_no(partnerTradeNo)
+                    .mch_id(wxPayApiConfig.getMchId())
+                    .appid(wxPayApiConfig.getAppId())
+                    .build()
+                    .createSign(wxPayApiConfig.getPartnerKey(), SignType.HMACSHA256, false);
 
-            return WxPayApi.getTransferInfo(params, wxPayBean.getCertPath(), wxPayBean.getMchId());
+            return WxPayApi.getTransferInfo(params, wxPayApiConfig.getCertPath(), wxPayApiConfig.getMchId());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -793,22 +783,21 @@ public class WxPayController extends WxPayApiController {
     }
 
     /**
-     * 获取RSA加密公钥 接口默认输出PKCS#1格式的公钥，商户需根据自己开发的语言选择公钥格式 Java RSA加密需要使用PKCS#8
-     * 不然会出现异常algid parse error, not a sequence​ PKCS#1 转 PKCS#8: openssl rsa
-     * -RSAPublicKey_in -in <filename> -pubout
+     * 获取RSA加密公钥
      */
     @RequestMapping(value = "/getPublicKey", method = {RequestMethod.POST, RequestMethod.GET})
     @ResponseBody
     public String getPublicKey() {
         try {
-            Map<String, String> params = new HashMap<String, String>();
-            params.put("mch_id", wxPayBean.getMchId());
+            WxPayApiConfig wxPayApiConfig = this.getApiConfig();
+
+            Map<String, String> params = new HashMap<String, String>(4);
+            params.put("mch_id", wxPayApiConfig.getMchId());
             params.put("nonce_str", String.valueOf(System.currentTimeMillis()));
             params.put("sign_type", "MD5");
-            String createSign = PaymentKit.createSign(params, wxPayBean.getPartnerKey());
+            String createSign = WxPayKit.createSign(params, wxPayApiConfig.getPartnerKey(), SignType.MD5);
             params.put("sign", createSign);
-            String publicKeyStr = WxPayApi.getPublicKey(params, wxPayBean.getCertPath(), wxPayBean.getMchId());
-            return publicKeyStr;
+            return WxPayApi.getPublicKey(params, wxPayApiConfig.getCertPath(), wxPayApiConfig.getMchId());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -822,22 +811,26 @@ public class WxPayController extends WxPayApiController {
     @ResponseBody
     public String payBank() {
         try {
-            // 通过WxPayApi.getPublicKey接口获取RSA加密公钥
-            // 假设获取到的RSA加密公钥为PUBLIC_KEY(PKCS#8格式)
+            WxPayApiConfig wxPayApiConfig = this.getApiConfig();
+
+            //通过WxPayApi.getPublicKey接口获取RSA加密公钥
+            //假设获取到的RSA加密公钥为PUBLIC_KEY(PKCS#8格式)
             final String PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6Bl76IwSvBTiibZ+CNRUA6BfahMshZ0WJpHD1GpmvcQjeN6Yrv6c9eIl6gB4nU3isN7bn+LmoVTpH1gHViaV2YyG/zXj4z4h7r+V+ezesMqqorEg38BCNUHNmhnw4/C0I4gBAQ4x0SJOGnfKGZKR9yzvbkJtvEn732JcEZCbdTZmaxkwlenXvM+mStcJaxBCB/h5xJ5VOF5nDbTPzLphIpzddr3zx/Jxjna9QB1v/YSKYXn+iuwruNUXGCvvxBWaBGKrjOdRTRy9adWOgNmtuYDQJ2YOfG8PtPe06ELKjmr2CfaAGrKKUroyaGvy3qxAV0PlT+UQ4ADSXWt/zl0o5wIDAQAB";
 
-            Map<String, String> params = new HashMap<String, String>();
-            params.put("mch_id", wxPayBean.getMchId());
+            Map<String, String> params = new HashMap<String, String>(10);
+            params.put("mch_id", wxPayApiConfig.getMchId());
             params.put("partner_trade_no", System.currentTimeMillis() + "");
             params.put("nonce_str", System.currentTimeMillis() + "");
-            params.put("enc_bank_no", RSAUtils.encryptByPublicKeyByWx("银行卡号", PUBLIC_KEY));// 收款方银行卡号
-            params.put("enc_true_name", RSAUtils.encryptByPublicKeyByWx("银行卡持有人姓名", PUBLIC_KEY));// 收款方用户名
-            params.put("bank_code", "1001");// 收款方开户行
+            //收款方银行卡号
+            params.put("enc_bank_no", RsaKit.encryptByPublicKeyByWx("银行卡号", PUBLIC_KEY));
+            //收款方用户名
+            params.put("enc_true_name", RsaKit.encryptByPublicKeyByWx("银行卡持有人姓名", PUBLIC_KEY));
+            //收款方开户行
+            params.put("bank_code", "1001");
             params.put("amount", "1");
-            params.put("desc", "IJPay 测试付款到银行卡-By Javen");
-            params.put("sign", PaymentKit.createSign(params, wxPayBean.getPartnerKey()));
-            String payBank = WxPayApi.payBank(params, wxPayBean.getCertPath(), wxPayBean.getMchId());
-            return payBank;
+            params.put("desc", "IJPay 让支付触手可及-付款到银行卡");
+            params.put("sign", WxPayKit.createSign(params, wxPayApiConfig.getPartnerKey(), SignType.HMACSHA256));
+            return WxPayApi.payBank(params, wxPayApiConfig.getCertPath(), wxPayApiConfig.getMchId());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -849,15 +842,16 @@ public class WxPayController extends WxPayApiController {
      */
     @RequestMapping(value = "/queryBank", method = {RequestMethod.POST, RequestMethod.GET})
     @ResponseBody
-    public String queryBank(@RequestParam("partner_trade_no") String partner_trade_no) {
+    public String queryBank(@RequestParam("partner_trade_no") String partnerTradeNo) {
         try {
-            Map<String, String> params = new HashMap<String, String>();
-            params.put("mch_id", wxPayBean.getMchId());
-            params.put("partner_trade_no", partner_trade_no);
+            WxPayApiConfig wxPayApiConfig = this.getApiConfig();
+
+            Map<String, String> params = new HashMap<String, String>(4);
+            params.put("mch_id", wxPayApiConfig.getMchId());
+            params.put("partner_trade_no", partnerTradeNo);
             params.put("nonce_str", System.currentTimeMillis() + "");
-            params.put("sign", PaymentKit.createSign(params, wxPayBean.getPartnerKey()));
-            String queryBank = WxPayApi.queryBank(params, wxPayBean.getCertPath(), wxPayBean.getMchId());
-            return queryBank;
+            params.put("sign", WxPayKit.createSign(params, wxPayApiConfig.getPartnerKey(), SignType.MD5));
+            return WxPayApi.queryBank(params, wxPayApiConfig.getCertPath(), wxPayApiConfig.getMchId());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -870,27 +864,27 @@ public class WxPayController extends WxPayApiController {
     @RequestMapping(value = "/refund", method = {RequestMethod.POST, RequestMethod.GET})
     @ResponseBody
     public String refund(@RequestParam("transactionId") String transactionId,
-                         @RequestParam("out_trade_no") String out_trade_no) {
+                         @RequestParam("out_trade_no") String outTradeNo) {
 
-        if (StrKit.isBlank(out_trade_no) && StrKit.isBlank(transactionId)) {
+        if (StrKit.isBlank(outTradeNo) && StrKit.isBlank(transactionId)) {
             return "transactionId、out_trade_no二选一";
         }
-
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("appid", wxPayBean.getAppId());
-        params.put("mch_id", wxPayBean.getMchId());
-        params.put("nonce_str", System.currentTimeMillis() + "");
-        if (StrKit.notBlank(transactionId)) {
-            params.put("transaction_id", transactionId);
-        } else {
-            params.put("out_trade_no", out_trade_no);
-        }
-        params.put("out_refund_no", System.currentTimeMillis() + "");
-        params.put("total_fee", "1");
-        params.put("refund_fee", "1");
-        params.put("sign", PaymentKit.createSign(params, wxPayBean.getPartnerKey()));
-        String refund = WxPayApi.orderRefund(false, params, wxPayBean.getCertPath(), wxPayBean.getMchId());
-        return refund;
+        WxPayApiConfig wxPayApiConfig = this.getApiConfig();
+
+        Map<String, String> params = RefundModel.builder()
+                .appid(wxPayApiConfig.getAppId())
+                .mch_id(wxPayApiConfig.getMchId())
+                .nonce_str(WxPayKit.generateStr())
+                .transaction_id(transactionId)
+                .out_trade_no(outTradeNo)
+                .out_refund_no(WxPayKit.generateStr())
+                .total_fee("1")
+                .refund_fee("1")
+                .notify_url(refundNotifyUrl)
+                .build()
+                .createSign(wxPayApiConfig.getPartnerKey(), SignType.MD5);
+
+        return WxPayApi.orderRefund(false, params, wxPayApiConfig.getCertPath(), wxPayApiConfig.getMchId());
     }
 
     /**
@@ -899,76 +893,87 @@ public class WxPayController extends WxPayApiController {
     @RequestMapping(value = "/refundQuery", method = {RequestMethod.POST, RequestMethod.GET})
     @ResponseBody
     public String refundQuery(@RequestParam("transactionId") String transactionId,
-                              @RequestParam("out_trade_no") String out_trade_no, @RequestParam("out_refund_no") String out_refund_no,
-                              @RequestParam("refund_id") String refund_id) {
-
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("appid", wxPayBean.getAppId());
-        params.put("mch_id", wxPayBean.getMchId());
-        params.put("nonce_str", System.currentTimeMillis() + "");
-        params.put("transaction_id", transactionId);
-        params.put("out_trade_no", out_trade_no);
-        params.put("out_refund_no", out_refund_no);
-        params.put("refund_id", refund_id);
-        params.put("out_refund_no", System.currentTimeMillis() + "");
-        params.put("sign", PaymentKit.createSign(params, wxPayBean.getPartnerKey()));
-        String refund = WxPayApi.orderRefundQuery(false, params);
-        return refund;
+                              @RequestParam("out_trade_no") String outTradeNo,
+                              @RequestParam("out_refund_no") String outRefundNo,
+                              @RequestParam("refund_id") String refundId) {
+
+        WxPayApiConfig wxPayApiConfig = this.getApiConfig();
+
+        Map<String, String> params = RefundQueryModel.builder()
+                .appid(wxPayApiConfig.getAppId())
+                .mch_id(wxPayApiConfig.getMchId())
+                .nonce_str(WxPayKit.generateStr())
+                .transaction_id(transactionId)
+                .out_trade_no(outTradeNo)
+                .out_refund_no(outRefundNo)
+                .refund_id(refundId)
+                .build()
+                .createSign(wxPayApiConfig.getPartnerKey(), SignType.MD5);
+
+        return WxPayApi.orderRefundQuery(false, params);
     }
 
-    @RequestMapping(value = "/pay_notify", method = {RequestMethod.POST, RequestMethod.GET})
+    /**
+     * 退款通知
+     */
+    @RequestMapping(value = "/refundNotify", method = {RequestMethod.POST, RequestMethod.GET})
     @ResponseBody
-    public String pay_notify(HttpServletRequest request) {
-        // 支付结果通用通知文档: https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_7
+    public String refundNotify(HttpServletRequest request) {
+        String xmlMsg = HttpKit.readData(request);
+        log.info("微信退款通知=" + xmlMsg);
+        Map<String, String> params = WxPayKit.xmlToMap(xmlMsg);
 
+        String returnCode = params.get("return_code");
+        // 注意重复通知的情况，同一订单号可能收到多次通知，请注意一定先判断订单状态
+        if (WxPayKit.codeIsOk(returnCode)) {
+            String reqInfo = params.get("req_info");
+            String decryptData = WxPayKit.decryptData(reqInfo, this.getApiConfig().getPartnerKey());
+            log.info("退款通知解密后的数据=" + decryptData);
+            // 更新订单信息
+            // 发送通知等
+            Map<String, String> xml = new HashMap<String, String>(2);
+            xml.put("return_code", "SUCCESS");
+            xml.put("return_msg", "OK");
+            return WxPayKit.toXml(xml);
+        }
+        return null;
+    }
+
+    /**
+     * 异步通知
+     */
+    @RequestMapping(value = "/payNotify", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public String payNotify(HttpServletRequest request) {
         String xmlMsg = HttpKit.readData(request);
-        System.out.println("支付通知=" + xmlMsg);
-        Map<String, String> params = PaymentKit.xmlToMap(xmlMsg);
-        // String appid = params.get("appid");
-        // //商户号
-        // String mch_id = params.get("mch_id");
-        String result_code = params.get("result_code");
-        // String openId = params.get("openid");
-        // //交易类型
-        // String trade_type = params.get("trade_type");
-        // //付款银行
-        // String bank_type = params.get("bank_type");
-        // // 总金额
-        // String total_fee = params.get("total_fee");
-        // //现金支付金额
-        // String cash_fee = params.get("cash_fee");
-        // // 微信支付订单号
-        // String transaction_id = params.get("transaction_id");
-        // // 商户订单号
-        // String out_trade_no = params.get("out_trade_no");
-        // // 支付完成时间，格式为yyyyMMddHHmmss
-        // String time_end = params.get("time_end");
-
-        ///////////////////////////// 以下是附加参数///////////////////////////////////
-
-        String attach = params.get("attach");
-        // String fee_type = params.get("fee_type");
-        // String is_subscribe = params.get("is_subscribe");
-        // String err_code = params.get("err_code");
-        // String err_code_des = params.get("err_code_des");
+
+        Map<String, String> params = WxPayKit.xmlToMap(xmlMsg);
+        log.info("微信支付通知=" + params);
+        String returnCode = params.get("return_code");
+        //订单编号
+        String out_trade_no = params.get("out_trade_no");
+        OmsOrder param = new OmsOrder();
+        param.setOrderSn(out_trade_no);
+        List<OmsOrder> list = orderService.list(new QueryWrapper<>(param));
+        OmsOrder orderInfo = list.get(0);
+        orderInfo.setStatus(OrderStatus.TO_DELIVER.getValue());
+        orderInfo.setPaymentTime(new Date());
         // 注意重复通知的情况，同一订单号可能收到多次通知，请注意一定先判断订单状态
-        // 避免已经成功、关闭、退款的订单被再次更新
-        // Order order = Order.dao.getOrderByTransactionId(transaction_id);
-        // if (order==null) {
-        if (PaymentKit.verifyNotify(params, WxPayApiConfigKit.getWxPayApiConfig().getPaternerKey())) {
-            if (("SUCCESS").equals(result_code)) {
+        // 注意此处签名方式需与统一下单的签名类型一致
+        if (WxPayKit.verifyNotify(params, this.getApiConfig().getPartnerKey(), SignType.HMACSHA256)) {
+            if (WxPayKit.codeIsOk(returnCode)) {
                 // 更新订单信息
-                log.warn("更新订单信息:" + attach);
+                orderService.updateById(orderInfo);
                 // 发送通知等
-                Map<String, String> xml = new HashMap<String, String>();
+                Map<String, String> xml = new HashMap<String, String>(2);
                 xml.put("return_code", "SUCCESS");
                 xml.put("return_msg", "OK");
-                return PaymentKit.toXml(xml);
+                return WxPayKit.toXml(xml);
+            }else {
+                log.error("订单" + out_trade_no + "支付失败");
+                orderService.releaseStock(orderInfo);
             }
         }
-        // }
-
         return null;
     }
-
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/custom/OkHttpKit.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/custom/OkHttpKit.java
new file mode 100644
index 0000000000000000000000000000000000000000..9cf86913984e271744f4c3f17c44b1407e79c0b6
--- /dev/null
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/custom/OkHttpKit.java
@@ -0,0 +1,52 @@
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>自定义 Http 客户端</p>
+ *
+ * @author Javen
+ */
+package com.zscat.mallplus.pay.custom;
+
+import com.zscat.mallplus.core.http.AbstractHttpDelegate;
+
+import java.io.InputStream;
+import java.util.Map;
+
+public class OkHttpKit extends AbstractHttpDelegate {
+    @Override
+    public String get(String url) {
+        // 替换具体实现
+        return super.get(url);
+    }
+
+    @Override
+    public String post(String url, String data) {
+        // 替换具体实现
+        return super.post(url, data);
+    }
+
+    @Override
+    public String post(String url, String data, String certPath, String certPass) {
+        // 替换具体实现
+        return super.post(url, data, certPath, certPass);
+    }
+
+    @Override
+    public String post(String url, Map<String, Object> paramMap) {
+        // 替换具体实现
+        return super.post(url, paramMap);
+    }
+
+    @Override
+    public String post(String url, String data, InputStream certFile, String certPass) {
+        // 替换具体实现
+        return super.post(url, data, certFile, certPass);
+    }
+
+}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/entity/AliPayBean.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/entity/AliPayBean.java
deleted file mode 100644
index d4a21fd94ae3af38c5a7fa8db53561de6b513164..0000000000000000000000000000000000000000
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/entity/AliPayBean.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.zscat.mallplus.pay.entity;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-@Component
-@ConfigurationProperties(prefix = "alipay")
-public class AliPayBean {
-    private String appId;
-    private String privateKey;
-    private String publicKey;
-    private String serverUrl;
-    private String domain;
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    public String getPrivateKey() {
-        return privateKey;
-    }
-
-    public void setPrivateKey(String privateKey) {
-        this.privateKey = privateKey;
-    }
-
-    public String getPublicKey() {
-        return publicKey;
-    }
-
-    public void setPublicKey(String publicKey) {
-        this.publicKey = publicKey;
-    }
-
-    public String getServerUrl() {
-        return serverUrl;
-    }
-
-    public void setServerUrl(String serverUrl) {
-        this.serverUrl = serverUrl;
-    }
-
-
-
-	public String getDomain() {
-		return domain;
-	}
-
-	public void setDomain(String domain) {
-		this.domain = domain;
-	}
-
-	@Override
-	public String toString() {
-		return "AliPayBean [appId=" + appId + ", privateKey=" + privateKey + ", publicKey=" + publicKey + ", serverUrl="
-				+ serverUrl + ", domain=" + domain + "]";
-	}
-
-
-}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/entity/H5ScencInfo.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/entity/H5ScencInfo.java
deleted file mode 100644
index c48ff014b8c570883fa06e7be9050ba75b9b9a1e..0000000000000000000000000000000000000000
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/entity/H5ScencInfo.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.zscat.mallplus.pay.entity;
-
-import com.alibaba.fastjson.JSON;
-
-public class H5ScencInfo {
-	private H5 h5_info;
-
-	public H5 getH5_info() {
-		return h5_info;
-	}
-
-	public void setH5_info(H5 h5_info) {
-		this.h5_info = h5_info;
-	}
-	
-	
-	@Override
-	public String toString() {
-		return JSON.toJSONString(h5_info);
-	}
-
-
-	public static class H5{
-		private String type;
-		private String app_name;
-		private String bundle_id;
-		private String package_name;
-		private String wap_url;
-		private String wap_name;
-		public String getType() {
-			return type;
-		}
-		public void setType(String type) {
-			this.type = type;
-		}
-		public String getApp_name() {
-			return app_name;
-		}
-		public void setApp_name(String app_name) {
-			this.app_name = app_name;
-		}
-		public String getBundle_id() {
-			return bundle_id;
-		}
-		public void setBundle_id(String bundle_id) {
-			this.bundle_id = bundle_id;
-		}
-		public String getPackage_name() {
-			return package_name;
-		}
-		public void setPackage_name(String package_name) {
-			this.package_name = package_name;
-		}
-		public String getWap_url() {
-			return wap_url;
-		}
-		public void setWap_url(String wap_url) {
-			this.wap_url = wap_url;
-		}
-		public String getWap_name() {
-			return wap_name;
-		}
-		public void setWap_name(String wap_name) {
-			this.wap_name = wap_name;
-		}
-	}
-}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/entity/H5SceneInfo.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/entity/H5SceneInfo.java
new file mode 100644
index 0000000000000000000000000000000000000000..2a016ab883bc39c3b665ae11880855a1106128fc
--- /dev/null
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/entity/H5SceneInfo.java
@@ -0,0 +1,82 @@
+package com.zscat.mallplus.pay.entity;
+
+import com.alibaba.fastjson.JSON;
+
+/**
+ * @author Javen
+ */
+public class H5SceneInfo {
+    private H5 h5_info;
+
+    public H5 getH5Info() {
+        return h5_info;
+    }
+
+    public void setH5Info(H5 h5_info) {
+        this.h5_info = h5_info;
+    }
+
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+
+
+    public static class H5 {
+        private String type;
+        private String app_name;
+        private String bundle_id;
+        private String package_name;
+        private String wap_url;
+        private String wap_name;
+
+        public String getType() {
+            return type;
+        }
+
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        public String getApp_name() {
+            return app_name;
+        }
+
+        public void setApp_name(String app_name) {
+            this.app_name = app_name;
+        }
+
+        public String getBundle_id() {
+            return bundle_id;
+        }
+
+        public void setBundle_id(String bundle_id) {
+            this.bundle_id = bundle_id;
+        }
+
+        public String getPackage_name() {
+            return package_name;
+        }
+
+        public void setPackage_name(String package_name) {
+            this.package_name = package_name;
+        }
+
+        public String getWap_url() {
+            return wap_url;
+        }
+
+        public void setWap_url(String wap_url) {
+            this.wap_url = wap_url;
+        }
+
+        public String getWap_name() {
+            return wap_name;
+        }
+
+        public void setWap_name(String wap_name) {
+            this.wap_name = wap_name;
+        }
+    }
+}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/entity/JdPayBean.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/entity/JdPayBean.java
new file mode 100644
index 0000000000000000000000000000000000000000..cd362776db030da584b44b293b46dbd5315c405b
--- /dev/null
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/entity/JdPayBean.java
@@ -0,0 +1,80 @@
+package com.zscat.mallplus.pay.entity;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>JD配置 Bean</p>
+ *
+ * @author Javen
+ */
+@Component
+@PropertySource("classpath:/production/jdpay.properties")
+@ConfigurationProperties(prefix = "jdpay")
+public class JdPayBean {
+    private String mchId;
+    private String rsaPrivateKey;
+    private String desKey;
+    private String rsaPublicKey;
+    private String certPath;
+
+    public String getMchId() {
+        return mchId;
+    }
+
+    public void setMchId(String mchId) {
+        this.mchId = mchId;
+    }
+
+    public String getRsaPrivateKey() {
+        return rsaPrivateKey;
+    }
+
+    public void setRsaPrivateKey(String rsaPrivateKey) {
+        this.rsaPrivateKey = rsaPrivateKey;
+    }
+
+    public String getDesKey() {
+        return desKey;
+    }
+
+    public void setDesKey(String desKey) {
+        this.desKey = desKey;
+    }
+
+    public String getRsaPublicKey() {
+        return rsaPublicKey;
+    }
+
+    public void setRsaPublicKey(String rsaPublicKey) {
+        this.rsaPublicKey = rsaPublicKey;
+    }
+
+    public String getCertPath() {
+        return certPath;
+    }
+
+    public void setCertPath(String certPath) {
+        this.certPath = certPath;
+    }
+
+    @Override
+    public String toString() {
+        return "JdPayBean{" +
+                "mchId='" + mchId + '\'' +
+                ", rsaPrivateKey='" + rsaPrivateKey + '\'' +
+                ", desKey='" + desKey + '\'' +
+                ", rsaPublicKey='" + rsaPublicKey + '\'' +
+                ", certPath='" + certPath + '\'' +
+                '}';
+    }
+}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/entity/WxAppPayDto.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/entity/WxAppPayDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..507369ac747057f536c06d7f30b26b668b4c84ed
--- /dev/null
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/entity/WxAppPayDto.java
@@ -0,0 +1,33 @@
+package com.zscat.mallplus.pay.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>微信配置 Bean</p>
+ *
+ * @author Javen
+ */
+
+@Setter
+@Getter
+public class WxAppPayDto {
+    //{""partnerid":"1533901051","prepayid":"wx05195730369109c4705757441163586100","noncestr":"1575547050392","timestamp":"1575547050"}
+
+    private String packages;
+    private String appid;
+    private String noncestr;
+
+    private String partnerid;
+    private String prepayid;
+    private String timestamp;
+    private String sign;
+}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/entity/WxPayBean.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/entity/WxPayBean.java
index d1bfcb111b37bf152a660fe3826dcbd728379811..8c1c46330fc4513cc294eab05157f9b09d4d0024 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/entity/WxPayBean.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/entity/WxPayBean.java
@@ -1,9 +1,24 @@
 package com.zscat.mallplus.pay.entity;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Component;
 
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>微信配置 Bean</p>
+ *
+ * @author Javen
+ */
 @Component
+@PropertySource("classpath:/application.properties")
 @ConfigurationProperties(prefix = "wxpay")
 public class WxPayBean {
     private String appId;
@@ -13,45 +28,57 @@ public class WxPayBean {
     private String certPath;
     private String domain;
 
-	public String getAppId() {
-		return appId;
-	}
-	public void setAppId(String appId) {
-		this.appId = appId;
-	}
-	public String getAppSecret() {
-		return appSecret;
-	}
-	public void setAppSecret(String appSecret) {
-		this.appSecret = appSecret;
-	}
-	public String getMchId() {
-		return mchId;
-	}
-	public void setMchId(String mchId) {
-		this.mchId = mchId;
-	}
-	public String getPartnerKey() {
-		return partnerKey;
-	}
-	public void setPartnerKey(String partnerKey) {
-		this.partnerKey = partnerKey;
-	}
-	public String getCertPath() {
-		return certPath;
-	}
-	public void setCertPath(String certPath) {
-		this.certPath = certPath;
-	}
-	public String getDomain() {
-		return domain;
-	}
-	public void setDomain(String domain) {
-		this.domain = domain;
-	}
-	@Override
-	public String toString() {
-		return "WxPayBean [appId=" + appId + ", appSecret=" + appSecret + ", mchId=" + mchId + ", partnerKey="
-				+ partnerKey + ", certPath=" + certPath + ", domain=" + domain + "]";
-	}
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public String getAppSecret() {
+        return appSecret;
+    }
+
+    public void setAppSecret(String appSecret) {
+        this.appSecret = appSecret;
+    }
+
+    public String getMchId() {
+        return mchId;
+    }
+
+    public void setMchId(String mchId) {
+        this.mchId = mchId;
+    }
+
+    public String getPartnerKey() {
+        return partnerKey;
+    }
+
+    public void setPartnerKey(String partnerKey) {
+        this.partnerKey = partnerKey;
+    }
+
+    public String getCertPath() {
+        return certPath;
+    }
+
+    public void setCertPath(String certPath) {
+        this.certPath = certPath;
+    }
+
+    public String getDomain() {
+        return domain;
+    }
+
+    public void setDomain(String domain) {
+        this.domain = domain;
+    }
+
+    @Override
+    public String toString() {
+        return "WxPayBean [appId=" + appId + ", appSecret=" + appSecret + ", mchId=" + mchId + ", partnerKey="
+                + partnerKey + ", certPath=" + certPath + ", domain=" + domain + "]";
+    }
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/interceptor/AliPayInterceptor.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/interceptor/AliPayInterceptor.java
index f267fc37c63d5a8878dc80daa7de784797328f47..97ae652e7658d54176db530540c6caad28060424 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/interceptor/AliPayInterceptor.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/interceptor/AliPayInterceptor.java
@@ -1,44 +1,39 @@
 package com.zscat.mallplus.pay.interceptor;
 
-
-import com.jpay.alipay.AliPayApiConfigKit;
-import com.zscat.mallplus.pay.controller.alipay.AliPayApiController;
+import com.zscat.mallplus.alipay.AliPayApiConfigKit;
+import com.zscat.mallplus.pay.controller.alipay.AbstractAliPayApiController;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>支付宝支付拦截器</p>
+ *
+ * @author Javen
+ */
 public class AliPayInterceptor implements HandlerInterceptor {
 
-	@Override
-	public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse,
-			Object handler) throws Exception {
-		if (HandlerMethod.class.equals(handler.getClass())) {
-			HandlerMethod method = (HandlerMethod) handler;
-			Object controller = method.getBean();
-			if (controller instanceof AliPayApiController == false) {
-				throw new RuntimeException("控制器需要继承 AliPayApiController");
-			}
-
-			try {
-				AliPayApiConfigKit.setThreadLocalAliPayApiConfig(((AliPayApiController)controller).getApiConfig());
-				return true;
-			}
-			finally {
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public void postHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o,
-			ModelAndView modelAndView) throws Exception {
-	}
-
-	@Override
-	public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse,
-			Object o, Exception e) throws Exception {
-	}
+    @Override
+    public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object handler) {
+        if (HandlerMethod.class.equals(handler.getClass())) {
+            HandlerMethod method = (HandlerMethod) handler;
+            Object controller = method.getBean();
+            if (!(controller instanceof AbstractAliPayApiController)) {
+                throw new RuntimeException("控制器需要继承 AliPayApiController");
+            }
+            AliPayApiConfigKit.setThreadLocalAliPayApiConfig(((AbstractAliPayApiController) controller).getApiConfig());
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/interceptor/CharacterEncodInterceptor.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/interceptor/CharacterEncodInterceptor.java
deleted file mode 100644
index e2231a513f3052271805ddcf75cf6d625e69f39f..0000000000000000000000000000000000000000
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/interceptor/CharacterEncodInterceptor.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.zscat.mallplus.pay.interceptor;
-
-
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class CharacterEncodInterceptor implements HandlerInterceptor {
-
-	@Override
-	public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse,
-			Object handler) throws Exception {
-		httpServletResponse.setContentType("text/html;charset=utf-8");
-		return true;
-	}
-
-	@Override
-	public void postHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o,
-			ModelAndView modelAndView) throws Exception {
-	}
-
-	@Override
-	public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse,
-			Object o, Exception e) throws Exception {
-	}
-}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/interceptor/WxPayInterceptor.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/interceptor/WxPayInterceptor.java
index fae35285a9033ce614583b14f546e4a8187be20b..e4bb30a28a8e707199b527510e1afa96fbde8576 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/interceptor/WxPayInterceptor.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/interceptor/WxPayInterceptor.java
@@ -1,45 +1,39 @@
 package com.zscat.mallplus.pay.interceptor;
 
-
-import com.jpay.weixin.api.WxPayApiConfigKit;
-import com.zscat.mallplus.pay.controller.wxpay.WxPayApiController;
-import com.zscat.mallplus.pay.controller.wxpay.WxPayController;
+import com.zscat.mallplus.pay.controller.wxpay.AbstractWxPayApiController;
+import com.zscat.mallplus.wxpay.WxPayApiConfigKit;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+/**
+ * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
+ *
+ * <p>不依赖任何第三方 mvc 框架，仅仅作为工具使用简单快速完成支付模块的开发，可轻松嵌入到任何系统里。 </p>
+ *
+ * <p>IJPay 交流群: 723992875</p>
+ *
+ * <p>Node.js 版: https://gitee.com/javen205/TNW</p>
+ *
+ * <p>微信支付拦截器</p>
+ *
+ * @author Javen
+ */
 public class WxPayInterceptor implements HandlerInterceptor {
 
-	@Override
-	public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse,
-			Object handler) throws Exception {
-		if (HandlerMethod.class.equals(handler.getClass())) {
-			HandlerMethod method = (HandlerMethod) handler;
-			Object controller = method.getBean();
-			if (controller instanceof WxPayApiController == false) {
-				throw new RuntimeException("控制器需要继承 WxPayApiController");
-			}
-
-			try {
-				WxPayApiConfigKit.setThreadLocalWxPayApiConfig(((WxPayController)controller).getApiConfig());
-				return true;
-			}
-			finally {
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public void postHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o,
-			ModelAndView modelAndView) throws Exception {
-	}
-
-	@Override
-	public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse,
-			Object o, Exception e) throws Exception {
-	}
+    @Override
+    public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object handler) {
+        if (HandlerMethod.class.equals(handler.getClass())) {
+            HandlerMethod method = (HandlerMethod) handler;
+            Object controller = method.getBean();
+            if (!(controller instanceof AbstractWxPayApiController)) {
+                throw new RuntimeException("控制器需要继承 AliPayApiController");
+            }
+            WxPayApiConfigKit.setThreadLocalWxPayApiConfig(((AbstractWxPayApiController) controller).getApiConfig());
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/kit/IpKit.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/kit/IpKit.java
new file mode 100644
index 0000000000000000000000000000000000000000..99bb408392bf3d541c60dbdc1a179aa1f3ce692e
--- /dev/null
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/kit/IpKit.java
@@ -0,0 +1,32 @@
+package com.zscat.mallplus.pay.kit;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author Javen
+ */
+public class IpKit {
+    private final static String UNKNOWN = "unknown";
+
+    public static String getRealIp(HttpServletRequest request) {
+        String ip = request.getHeader("x-forwarded-for");
+        if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
+            ip = request.getHeader("Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
+            ip = request.getHeader("WL-Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
+            ip = request.getRemoteAddr();
+        }
+        return ip;
+    }
+
+    public static String getRealIpV2(HttpServletRequest request) {
+        String accessIp = request.getHeader("x-forwarded-for");
+        if (null == accessIp) {
+            return request.getRemoteAddr();
+        }
+        return accessIp;
+    }
+}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/utils/StringUtils.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/utils/StringUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..8bdc47db2f260a34d39bceab87b4e7066c843977
--- /dev/null
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/utils/StringUtils.java
@@ -0,0 +1,148 @@
+package com.zscat.mallplus.pay.utils;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Random;
+import java.util.UUID;
+
+/**
+ * 字符串工具类，继承lang3字符串工具类
+ *
+ * @author L.com
+ */
+public final class StringUtils extends org.apache.commons.lang3.StringUtils {
+
+    /**
+     * 随机字符串
+     */
+    private static final String INT_TEMP = "0123456789";
+    private static final String STR_TEMP = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+    private static final String ALL_TEMP = INT_TEMP + STR_TEMP;
+    private static final Random RANDOM = new Random();
+
+    public static String encode(String str) {
+        String encode = null;
+        try {
+            encode = URLEncoder.encode(str, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return encode;
+    }
+
+    /**
+     * 获取UUID，去掉`-`的
+     *
+     * @return {String}
+     */
+    public static String generateStr() {
+        return UUID.randomUUID().toString().replace("-", "");
+    }
+
+    /**
+     * 要求外部订单号必须唯一。
+     *
+     * @return {String}
+     */
+    public static String getOutTradeNo() {
+        SimpleDateFormat format = new SimpleDateFormat("MMddHHmmss", Locale.getDefault());
+        Date date = new Date();
+        String key = format.format(date);
+        key = key + System.currentTimeMillis();
+        key = key.substring(0, 15);
+        return key;
+    }
+
+    /**
+     * 字符串格式化
+     * <p>
+     * use: format("my name is {0}, and i like {1}!", "L.cm", "java")
+     * <p>
+     * int long use {0,number,#}
+     *
+     * @param s
+     * @param args
+     * @return {String}转换后的字符串
+     */
+    public static String format(String s, Object... args) {
+        return MessageFormat.format(s, args);
+    }
+
+    /**
+     * 替换某个字符
+     *
+     * @param str
+     * @param regex
+     * @param args
+     * @return {String}
+     */
+    public static String replace(String str, String regex, String... args) {
+        int length = args.length;
+        for (int i = 0; i < length; i++) {
+            str = str.replaceFirst(regex, args[i]);
+        }
+        return str;
+    }
+
+    /**
+     * 清理字符串，清理出某些不可见字符
+     *
+     * @param txt
+     * @return {String}
+     */
+    public static String cleanChars(String txt) {
+        return txt.replaceAll("[ 　	`·•�
\\f\\t\\v]", "");
+    }
+
+    /**
+     * 随机数生成
+     *
+     * @param count
+     * @return {String}
+     */
+    public static String random(int count, RandomType randomType) {
+        if (count == 0) {
+            return "";
+        }
+        if (count < 0) {
+            throw new IllegalArgumentException("Requested random string length " + count + " is less than 0.");
+        }
+        char[] buffer = new char[count];
+        for (int i = 0; i < count; i++) {
+            if (randomType.equals(RandomType.INT)) {
+                buffer[i] = INT_TEMP.charAt(RANDOM.nextInt(INT_TEMP.length()));
+            } else if (randomType.equals(RandomType.STRING)) {
+                buffer[i] = STR_TEMP.charAt(RANDOM.nextInt(STR_TEMP.length()));
+            } else {
+                buffer[i] = ALL_TEMP.charAt(RANDOM.nextInt(ALL_TEMP.length()));
+            }
+        }
+        return new String(buffer);
+    }
+
+    public static void main(String[] args) {
+        System.out.println(random(32, RandomType.ALL));
+    }
+
+    /**
+     * 生成的随机数类型
+     */
+    public enum RandomType {
+        /**
+         * 整数
+         */
+        INT,
+        /**
+         * 字符串
+         */
+        STRING,
+        /**
+         * 所有类型
+         */
+        ALL
+    }
+}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/vo/AjaxResult.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/vo/AjaxResult.java
new file mode 100644
index 0000000000000000000000000000000000000000..c74fa75cf65050ee95cc9243ecb55167a988a6af
--- /dev/null
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/vo/AjaxResult.java
@@ -0,0 +1,85 @@
+package com.zscat.mallplus.pay.vo;
+
+import java.io.Serializable;
+
+/**
+ * @author Javen
+ */
+public class AjaxResult implements Serializable {
+
+    private static final long serialVersionUID = 6439646269084700779L;
+
+    private int code = 0;
+
+    /**
+     * 返回的中文消息
+     */
+    private String message;
+
+    /**
+     * 成功时携带的数据
+     */
+    private Object data;
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public Object getData() {
+        return data;
+    }
+
+    public void setData(Object data) {
+        this.data = data;
+    }
+
+    /**
+     * 校验错误
+     *
+     * @return
+     */
+    public boolean hasError() {
+        return this.code != 0;
+    }
+
+    /**
+     * 添加错误，用于alertError
+     *
+     * @param message
+     * @return
+     */
+    public AjaxResult addError(String message) {
+        this.message = message;
+        this.code = 1;
+        return this;
+    }
+
+    /**
+     * 用于Confirm的错误信息
+     *
+     * @param message 描述消息
+     * @return {AjaxResult}
+     */
+    public AjaxResult addConfirmError(String message) {
+        this.message = message;
+        this.code = 2;
+        return this;
+    }
+
+    /**
+     * 封装成功时的数据
+     *
+     * @param data Object
+     * @return {AjaxResult}
+     */
+    public AjaxResult success(Object data) {
+        this.data = data;
+        this.code = 0;
+        return this;
+    }
+
+}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pms/service/IPmsFavoriteService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pms/service/IPmsFavoriteService.java
index 7d9baf079479fea87dd127ba8f1fbe9b98a67624..b261a41c5ec9cdb742b199ba480c56b2b46d4904 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pms/service/IPmsFavoriteService.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pms/service/IPmsFavoriteService.java
@@ -7,7 +7,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pms/service/IPmsProductService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pms/service/IPmsProductService.java
index 44c9386b322178bbb5ed2e0c0d995f1aa3eabf2d..412dd049fbe854a0094625e16654712a39568ce2 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pms/service/IPmsProductService.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pms/service/IPmsProductService.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zscat.mallplus.pms.entity.PmsBrand;
 import com.zscat.mallplus.pms.entity.PmsProduct;
 import com.zscat.mallplus.pms.vo.GoodsDetailResult;
-import com.zscat.mallplus.pms.vo.PmsProductAndGroup;
 
 import java.util.List;
 import java.util.Map;
@@ -19,15 +18,11 @@ import java.util.Map;
  */
 public interface IPmsProductService extends IService<PmsProduct> {
 
-    /**
-     * 查询拼团商品详情
-     * @param id
-     * @return
-     */
-    PmsProductAndGroup getProductAndGroup(Long id);
+
 
     /**
      * 查询商品详情
+     *
      * @param id
      * @return
      */
@@ -35,43 +30,49 @@ public interface IPmsProductService extends IService<PmsProduct> {
 
     /**
      * 初始化商品到redis
+     *
      * @return
      */
     Object initGoodsRedis();
 
     /**
      * 获取商品详情 优先取redis
+     *
      * @param id
      * @return
      */
-    GoodsDetailResult getGoodsRedisById(Long id) ;
+    GoodsDetailResult getGoodsRedisById(Long id);
 
     /**
      * 获取推荐品牌
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    List<PmsBrand> getRecommendBrandList(int pageNum, int pageSize) ;
+    List<PmsBrand> getRecommendBrandList(int pageNum, int pageSize);
 
     /**
      * 获取最新商品
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    List<PmsProduct> getNewProductList(int pageNum, int pageSize) ;
+    List<PmsProduct> getNewProductList(int pageNum, int pageSize);
 
     /**
      * 获取最热商品列表 按销量倒序
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    List<PmsProduct> getHotProductList(int pageNum, int pageSize) ;
+    List<PmsProduct> getHotProductList(int pageNum, int pageSize);
 
     /**
      * 今日添加的商品
+     *
      * @param id
      * @return
      */
@@ -79,6 +80,7 @@ public interface IPmsProductService extends IService<PmsProduct> {
 
     /**
      * 拍卖商品详情
+     *
      * @param id
      * @return
      */
@@ -86,6 +88,7 @@ public interface IPmsProductService extends IService<PmsProduct> {
 
     /**
      * 参与竞价
+     *
      * @param goods
      * @return
      */
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pms/service/impl/PmsFavoriteServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pms/service/impl/PmsFavoriteServiceImpl.java
index ad9948f1266492ae37f74f0f0a2f3b389055df6a..ec407a4494b0c5b64363800fcb9ce752f8982eb6 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pms/service/impl/PmsFavoriteServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pms/service/impl/PmsFavoriteServiceImpl.java
@@ -20,7 +20,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
@@ -39,6 +39,7 @@ public class PmsFavoriteServiceImpl extends ServiceImpl<PmsFavoriteMapper, PmsFa
     private SysStoreMapper storeMapper;
     @Autowired
     private IUmsMemberService memberService;
+
     @Override
     public int addProduct(PmsFavorite productCollection) {
         int count = 0;
@@ -51,34 +52,34 @@ public class PmsFavoriteServiceImpl extends ServiceImpl<PmsFavoriteMapper, PmsFa
         if (findCollection == null) {
             productCollection.setAddTime(new Date());
             productCollectionRepository.insert(productCollection);
-            if (productCollection.getType()==1){
+            if (productCollection.getType() == 1) {
                 PmsProduct subject = productMapper.selectById(productCollection.getObjId());
                 subject.setId(productCollection.getObjId());
-                subject.setGiftGrowth(subject.getGiftGrowth()+1);
+                subject.setGiftGrowth(subject.getGiftGrowth() + 1);
                 //更新到数据库
                 productMapper.updateById(subject);
             }
-            if (productCollection.getType()==2){
+            if (productCollection.getType() == 2) {
                 CmsSubject subject = subjectService.getById(productCollection.getObjId());
                 subject.setId(productCollection.getObjId());
-                subject.setForwardCount(subject.getForwardCount()+1);
+                subject.setForwardCount(subject.getForwardCount() + 1);
                 //更新到数据库
                 subjectService.updateById(subject);
             }
 
             count = 1;
-        }else {
-            if (productCollection.getType()==1){
+        } else {
+            if (productCollection.getType() == 1) {
                 PmsProduct subject = productMapper.selectById(productCollection.getObjId());
                 subject.setId(productCollection.getObjId());
-                subject.setGiftGrowth(subject.getGiftGrowth()-1);
+                subject.setGiftGrowth(subject.getGiftGrowth() - 1);
                 //更新到数据库
                 productMapper.updateById(subject);
             }
-            if (productCollection.getType()==2){
+            if (productCollection.getType() == 2) {
                 CmsSubject subject = subjectService.getById(productCollection.getObjId());
                 subject.setId(productCollection.getObjId());
-                subject.setForwardCount(subject.getForwardCount()-1);
+                subject.setForwardCount(subject.getForwardCount() - 1);
                 //更新到数据库
                 subjectService.updateById(subject);
             }
@@ -88,13 +89,13 @@ public class PmsFavoriteServiceImpl extends ServiceImpl<PmsFavoriteMapper, PmsFa
     }
 
 
-
     @Override
     public List<PmsFavorite> listProduct(Long memberId, int type) {
-        return productCollectionRepository.selectList(new QueryWrapper<PmsFavorite>().eq("member_id",memberId).eq("type",type).orderByAsc("add_time"));
+        return productCollectionRepository.selectList(new QueryWrapper<PmsFavorite>().eq("member_id", memberId).eq("type", type).orderByAsc("add_time"));
     }
+
     @Override
     public List<PmsFavorite> listCollect(Long memberId) {
-        return productCollectionRepository.selectList(new QueryWrapper<PmsFavorite>().eq("member_id",memberId).orderByAsc("add_time"));
+        return productCollectionRepository.selectList(new QueryWrapper<PmsFavorite>().eq("member_id", memberId).orderByAsc("add_time"));
     }
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pms/service/impl/PmsProductServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pms/service/impl/PmsProductServiceImpl.java
index 5c16f6610486cd7bc5d66e87cd4d7f2466352c1a..044a88ba131400aae80140913a92d871835aedab 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/pms/service/impl/PmsProductServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pms/service/impl/PmsProductServiceImpl.java
@@ -9,9 +9,11 @@ import com.zscat.mallplus.pms.entity.*;
 import com.zscat.mallplus.pms.mapper.*;
 import com.zscat.mallplus.pms.service.*;
 import com.zscat.mallplus.pms.vo.GoodsDetailResult;
-import com.zscat.mallplus.pms.vo.PmsProductAndGroup;
 import com.zscat.mallplus.pms.vo.PmsProductParam;
-import com.zscat.mallplus.sms.entity.*;
+import com.zscat.mallplus.sms.entity.SmsHomeBrand;
+import com.zscat.mallplus.sms.entity.SmsHomeNewProduct;
+import com.zscat.mallplus.sms.entity.SmsHomeRecommendProduct;
+import com.zscat.mallplus.sms.entity.SmsPaimaiLog;
 import com.zscat.mallplus.sms.mapper.SmsGroupMapper;
 import com.zscat.mallplus.sms.mapper.SmsGroupMemberMapper;
 import com.zscat.mallplus.sms.mapper.SmsPaimaiLogMapper;
@@ -27,10 +29,8 @@ import com.zscat.mallplus.util.DateUtils;
 import com.zscat.mallplus.util.JsonUtils;
 import com.zscat.mallplus.utils.CommonResult;
 import com.zscat.mallplus.utils.ValidatorUtils;
-
 import com.zscat.mallplus.vo.Rediskey;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -113,75 +113,12 @@ public class PmsProductServiceImpl extends ServiceImpl<PmsProductMapper, PmsProd
     private SmsPaimaiLogMapper paimaiLogMapper;
     @Autowired
     private IUmsMemberService memberService;
-    @Override
-    public PmsProductAndGroup getProductAndGroup(Long id) {
-        PmsProduct goods = productMapper.selectById(id);
-        PmsProductAndGroup vo = new PmsProductAndGroup();
-        try {
-            BeanUtils.copyProperties(goods, vo);
-            SmsGroup queryG = new SmsGroup();
-            queryG.setGoodsId(id);
-            SmsGroup group = groupMapper.selectOne(new QueryWrapper<>(queryG));
-            SmsGroupMember newG = new SmsGroupMember();
-            newG.setGoodsId(id);
-            List<SmsGroupMember> list = groupMemberMapper.selectList(new QueryWrapper<>(newG));
-            if (group != null) {
-                Map<String, List<SmsGroupMember>> map = groupMemberByMainId(list, group);
-                vo.setMap(map);
-            }
 
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return vo;
-    }
 
-    /**
-     * 按照异常批次号对已开单数据进行分组
-     *
-     * @param billingList
-     * @return
-     * @throws Exception
-     */
-    private Map<String, List<SmsGroupMember>> groupMemberByMainId(List<SmsGroupMember> billingList, SmsGroup group) throws Exception {
-        Map<String, List<SmsGroupMember>> resultMap = new HashMap<String, List<SmsGroupMember>>();
-        Map<String, List<SmsGroupMember>> map = new HashMap<String, List<SmsGroupMember>>();
-        try {
-            List<Long> ids = new ArrayList<>();
-            for (SmsGroupMember tmExcpNew : billingList) {
-                if (tmExcpNew.getMemberId().equals(tmExcpNew.getMainId())) {
-                    Date cr = tmExcpNew.getCreateTime();
-                    Long nowT = System.currentTimeMillis();
-                    Date endTime = DateUtils.convertStringToDate(DateUtils.addHours(cr, group.getHours()), "yyyy-MM-dd HH:mm:ss");
-                    if (nowT <= endTime.getTime()) {
-                        ids.add(tmExcpNew.getMainId());
-                    }
-                }
-                if (resultMap.containsKey(tmExcpNew.getMainId() + "")) {//map中异常批次已存在，将该数据存放到同一个key（key存放的是异常批次）的map中
-                    resultMap.get(tmExcpNew.getMainId() + "").add(tmExcpNew);
-                } else {//map中不存在，新建key，用来存放数据
-                    List<SmsGroupMember> tmpList = new ArrayList<SmsGroupMember>();
-                    tmpList.add(tmExcpNew);
-                    resultMap.put(tmExcpNew.getMainId() + "", tmpList);
-                }
-            }
-            for (Long id : ids) {
-                if (resultMap.get(id + "") != null) {
-                    map.put(id + "", resultMap.get(id + ""));
-                }
-            }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new Exception("按照异常批次号对已开单数据进行分组时出现异常", e);
-        }
-
-        return map;
-    }
 
     @Override
     public PmsProduct getUpdateInfo(Long id) {
-        return  productMapper.selectById(id);
+        return productMapper.selectById(id);
     }
 
     @Override
@@ -234,73 +171,75 @@ public class PmsProductServiceImpl extends ServiceImpl<PmsProductMapper, PmsProd
         param.setProductLadderList(productLadderList);
 */
         List<PmsSkuStock> skuStockList = skuStockMapper.selectList(new QueryWrapper<PmsSkuStock>().eq("product_id", goods.getId()));
+        param.setSkuStockList(skuStockList);
+        List<PmsProductAttributeValue> productAttributeValueList = productAttributeValueMapper.selectList(new QueryWrapper<PmsProductAttributeValue>().eq("product_id", goods.getId()).eq("type", 1));
+        param.setProductAttributeValueList(productAttributeValueList);
 
-        List<PmsProductAttributeValue> productAttributeValueList = productAttributeValueMapper.selectList(new QueryWrapper<PmsProductAttributeValue>().eq("product_id", goods.getId()).eq("type",1));
-
-        List<CmsSubjectProductRelation> subjectProductRelationList = subjectProductRelationMapper.selectList(new QueryWrapper<CmsSubjectProductRelation>().eq("product_id", goods.getId()));
+        // List<CmsSubjectProductRelation> subjectProductRelationList = subjectProductRelationMapper.selectList(new QueryWrapper<CmsSubjectProductRelation>().eq("product_id", goods.getId()));
 
-        List<CmsPrefrenceAreaProductRelation> prefrenceAreaProductRelationList = prefrenceAreaProductRelationMapper.selectList(new QueryWrapper<CmsPrefrenceAreaProductRelation>().eq("product_id", goods.getId()));
+        //   List<CmsPrefrenceAreaProductRelation> prefrenceAreaProductRelationList = prefrenceAreaProductRelationMapper.selectList(new QueryWrapper<CmsPrefrenceAreaProductRelation>().eq("product_id", goods.getId()));
 
-        List<PmsProductAttributeValue> productCanShuValueList = productAttributeValueMapper.selectList(new QueryWrapper<PmsProductAttributeValue>().eq("product_id", goods.getId()).eq("type",2));
-        param.setProductCanShuValueList(productCanShuValueList);
+        // List<PmsProductAttributeValue> productCanShuValueList = productAttributeValueMapper.selectList(new QueryWrapper<PmsProductAttributeValue>().eq("product_id", goods.getId()).eq("type", 2));
+        // param.setProductCanShuValueList(productCanShuValueList);
 
-        param.setPrefrenceAreaProductRelationList(prefrenceAreaProductRelationList);
-        param.setProductAttributeValueList(productAttributeValueList);
+        //  param.setPrefrenceAreaProductRelationList(prefrenceAreaProductRelationList);
 
-        param.setSkuStockList(skuStockList);
-        param.setSubjectProductRelationList(subjectProductRelationList);
+        //param.setSubjectProductRelationList(subjectProductRelationList);
 
-        List<PmsProduct> typeGoodsList = productMapper.selectList(new QueryWrapper<PmsProduct>().eq("product_attribute_category_id",goods.getProductAttributeCategoryId()).select(ConstansValue.sampleGoodsList));
-        param.setTypeGoodsList(typeGoodsList.subList(0,typeGoodsList.size()>8?8:typeGoodsList.size()));
+        //List<PmsProduct> typeGoodsList = productMapper.selectList(new QueryWrapper<PmsProduct>().eq("product_attribute_category_id", goods.getProductAttributeCategoryId()).select(ConstansValue.sampleGoodsList));
+        //  param.setTypeGoodsList(typeGoodsList.subList(0, typeGoodsList.size() > 8 ? 8 : typeGoodsList.size()));
         redisService.set(String.format(Rediskey.GOODSDETAIL, goods.getId()), JsonUtils.objectToJson(param));
 
         return param;
     }
+
     @Override
     public List<PmsBrand> getRecommendBrandList(int pageNum, int pageSize) {
 
         List<SmsHomeBrand> brands = homeBrandService.list(new QueryWrapper<>());
-        if (brands!=null && brands.size()>0){
+        if (brands != null && brands.size() > 0) {
             List<Long> ids = brands.stream()
                     .map(SmsHomeBrand::getBrandId)
                     .collect(Collectors.toList());
-            if (ids!=null && ids.size()>0) {
+            if (ids != null && ids.size() > 0) {
                 return (List<PmsBrand>) brandService.listByIds(ids);
             }
         }
-        return  new ArrayList<>();
+        return new ArrayList<>();
 
     }
+
     @Override
     public List<PmsProduct> getNewProductList(int pageNum, int pageSize) {
 
         List<SmsHomeNewProduct> brands = homeNewProductService.list(new QueryWrapper<>());
-        if (brands!=null && brands.size()>0){
+        if (brands != null && brands.size() > 0) {
             List<Long> ids = brands.stream()
                     .map(SmsHomeNewProduct::getProductId)
                     .collect(Collectors.toList());
-            if (ids!=null && ids.size()>0) {
-                return  productMapper.selectList(new QueryWrapper<PmsProduct>().in("id",ids).select(ConstansValue.sampleGoodsList));
+            if (ids != null && ids.size() > 0) {
+                return productMapper.selectList(new QueryWrapper<PmsProduct>().in("id", ids).select(ConstansValue.sampleGoodsList));
             }
         }
-        return  new ArrayList<>();
+        return new ArrayList<>();
     }
+
     @Override
     public List<PmsProduct> getHotProductList(int pageNum, int pageSize) {
         List<SmsHomeRecommendProduct> brands = homeRecommendProductService.list(new QueryWrapper<>());
-        if (brands!=null && brands.size()>0){
+        if (brands != null && brands.size() > 0) {
             List<Long> ids = brands.stream()
                     .map(SmsHomeRecommendProduct::getProductId)
                     .collect(Collectors.toList());
-            if (ids!=null && ids.size()>0) {
-                return  productMapper.selectList(new QueryWrapper<PmsProduct>().in("id",ids).select(ConstansValue.sampleGoodsList));
+            if (ids != null && ids.size() > 0) {
+                return productMapper.selectList(new QueryWrapper<PmsProduct>().in("id", ids).select(ConstansValue.sampleGoodsList));
             }
         }
-       return  new ArrayList<>();
+        return new ArrayList<>();
     }
 
     @Override
-    public  Integer countGoodsByToday(Long id){
+    public Integer countGoodsByToday(Long id) {
         return productMapper.countGoodsByToday(id);
     }
 
@@ -308,7 +247,7 @@ public class PmsProductServiceImpl extends ServiceImpl<PmsProductMapper, PmsProd
     public Map<String, Object> queryPaiMaigoodsDetail(Long id) {
         Map<String, Object> map = new HashMap<>();
         PmsProduct goods = productMapper.selectById(id);
-        List<SmsPaimaiLog> paimaiLogList = paimaiLogMapper.selectList(new QueryWrapper<SmsPaimaiLog>().eq("goods_id",id).orderByDesc("create_time"));
+        List<SmsPaimaiLog> paimaiLogList = paimaiLogMapper.selectList(new QueryWrapper<SmsPaimaiLog>().eq("goods_id", id).orderByDesc("create_time"));
         map.put("paimaiLogList", paimaiLogList);
         UmsMember umsMember = memberService.getNewCurrentMember();
         map.put("favorite", false);
@@ -318,24 +257,24 @@ public class PmsProductServiceImpl extends ServiceImpl<PmsProductMapper, PmsProd
             query.setMemberId(umsMember.getId());
             query.setType(1);
             PmsFavorite findCollection = favoriteService.getOne(new QueryWrapper<>(query));
-            if(findCollection!=null){
+            if (findCollection != null) {
                 map.put("favorite", true);
             }
         }
         //记录浏览量到redis,然后定时更新到数据库
-        String key=Rediskey.GOODS_VIEWCOUNT_CODE+id;
+        String key = Rediskey.GOODS_VIEWCOUNT_CODE + id;
         //找到redis中该篇文章的点赞数，如果不存在则向redis中添加一条
-        Map<Object,Object> viewCountItem=redisUtil.hGetAll(Rediskey.GOODS_VIEWCOUNT_KEY);
-        Integer viewCount=0;
-        if(!viewCountItem.isEmpty()){
-            if(viewCountItem.containsKey(key)){
-                viewCount=Integer.parseInt(viewCountItem.get(key).toString())+1;
-                redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY,key,viewCount+"");
-            }else {
-                redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY,key,1+"");
+        Map<Object, Object> viewCountItem = redisUtil.hGetAll(Rediskey.GOODS_VIEWCOUNT_KEY);
+        Integer viewCount = 0;
+        if (!viewCountItem.isEmpty()) {
+            if (viewCountItem.containsKey(key)) {
+                viewCount = Integer.parseInt(viewCountItem.get(key).toString()) + 1;
+                redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY, key, viewCount + "");
+            } else {
+                redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY, key, 1 + "");
             }
-        }else{
-            redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY,key,1+"");
+        } else {
+            redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY, key, 1 + "");
         }
         goods.setTimeSecound(ValidatorUtils.getTimeSecound(goods.getExpireTime()));
         map.put("goods", goods);
@@ -345,7 +284,7 @@ public class PmsProductServiceImpl extends ServiceImpl<PmsProductMapper, PmsProd
     @Transactional
     @Override
     public Object updatePaiMai(PmsProduct goods) {
-        goods.setExpireTime(DateUtils.strToDate(DateUtils.addMins(goods.getExpireTime(),5)));
+        goods.setExpireTime(DateUtils.strToDate(DateUtils.addMins(goods.getExpireTime(), 5)));
         productMapper.updateById(goods);
         SmsPaimaiLog log = new SmsPaimaiLog();
         log.setCreateTime(new Date());
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/single/ApiBaseAction.java b/mallplus-portal/src/main/java/com/zscat/mallplus/single/ApiBaseAction.java
index f463b5eaadf000cd3cc929f6c2112d2ddbcaf236..c05168cbacd0ed7d58927f3da70f4d8160473373 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/single/ApiBaseAction.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/single/ApiBaseAction.java
@@ -41,12 +41,30 @@ public class ApiBaseAction {
      */
     @Resource
     protected HttpServletResponse response;
+    /**
+     * 获取请求的用户Id
+     *
+     * @return 客户端Ip
+     */
+    /*public String getUserId() {
+        String token = request.getHeader(AuthorizationInterceptor.LOGIN_TOKEN_KEY);
+        //查询token信息
+        TokenEntity tokenEntity = tokenService.queryByToken(token);
+        if (tokenEntity == null || tokenEntity.getExpireTime().getTime() < System.currentTimeMillis()) {
+            return null;
+        }
+        return tokenEntity.getUserId();
+    }*/
+    @Resource
+    private JwtTokenUtil jwtTokenUtil;
+    @Resource
+    private RedisService redisService;
 
     /**
      * @param requestCode
      * @param msg
      * @param data
-     * @return Map<String               ,               Object>
+     * @return Map<String, Object>
      * @throws
      * @Description:构建统一格式返回对象
      * @date 2016年9月2日
@@ -61,25 +79,12 @@ public class ApiBaseAction {
         return obj;
     }
 
-    public static Map<String, Object> toResponsSuccess(Object data) {
-        Map<String, Object> rp = toResponsObject(200, "执行成功", data);
-        return rp;
-    }
-
-    public static Map<String, Object> toResponsMsgSuccess(String msg) {
-        return toResponsObject(200, msg, "");
-    }
-
     public static Map<String, Object> toResponsSuccessForSelect(Object data) {
         Map<String, Object> result = new HashMap<>(2);
         result.put("list", data);
         return toResponsObject(200, "执行成功", result);
     }
 
-    public static Map<String, Object> toResponsFail(String msg) {
-        return toResponsObject(1, msg, msg);
-    }
-
     /**
      * 参数绑定异常
      */
@@ -124,26 +129,4 @@ public class ApiBaseAction {
     }
 
 
-
-    /**
-     * 获取请求的用户Id
-     *
-     * @return 客户端Ip
-     */
-    /*public String getUserId() {
-        String token = request.getHeader(AuthorizationInterceptor.LOGIN_TOKEN_KEY);
-        //查询token信息
-        TokenEntity tokenEntity = tokenService.queryByToken(token);
-        if (tokenEntity == null || tokenEntity.getExpireTime().getTime() < System.currentTimeMillis()) {
-            return null;
-        }
-        return tokenEntity.getUserId();
-    }*/
-    @Resource
-    private JwtTokenUtil jwtTokenUtil;
-    @Resource
-    private RedisService redisService;
-
-
-
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/single/MemberCollectionController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/single/MemberCollectionController.java
index 0571a0c51d6762022cd3bbdd2dd57e86825238e4..4dc310af916314a6837857f12e8b4944a1bb90b2 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/single/MemberCollectionController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/single/MemberCollectionController.java
@@ -4,7 +4,6 @@ package com.zscat.mallplus.single;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zscat.mallplus.cms.entity.CmsFavorite;
-import com.zscat.mallplus.cms.entity.CmsTopic;
 import com.zscat.mallplus.cms.service.ICmsFavoriteService;
 import com.zscat.mallplus.pms.entity.PmsFavorite;
 import com.zscat.mallplus.pms.service.IPmsFavoriteService;
@@ -63,16 +62,17 @@ public class MemberCollectionController {
 
     @ApiOperation("显示收藏列表")
     @GetMapping(value = "/listCollectByType")
-    public Object listCollectByType( PmsFavorite productCollection) {
-        List<PmsFavorite> memberProductCollectionList = memberCollectionService.listProduct(memberService.getNewCurrentMember().getId(),productCollection.getType());
+    public Object listCollectByType(PmsFavorite productCollection) {
+        List<PmsFavorite> memberProductCollectionList = memberCollectionService.listProduct(memberService.getNewCurrentMember().getId(), productCollection.getType());
         return new CommonResult().success(memberProductCollectionList);
     }
+
     @ApiOperation("显示收藏列表")
     @GetMapping(value = "/listCollect")
-    public Object listCollect( PmsFavorite productCollection,
-                               @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                               @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
-       productCollection.setMemberId(memberService.getNewCurrentMember().getId());
+    public Object listCollect(PmsFavorite productCollection,
+                              @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                              @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
+        productCollection.setMemberId(memberService.getNewCurrentMember().getId());
         return new CommonResult().success(memberCollectionService.page(new Page<PmsFavorite>(pageNum, pageSize), new QueryWrapper<>(productCollection).orderByDesc("add_time")));
 
     }
@@ -108,13 +108,14 @@ public class MemberCollectionController {
 
     @ApiOperation("显示点赞列表")
     @GetMapping(value = "/listLikeByType")
-    public Object listLikeByType( CmsFavorite productCollection) {
-        List<CmsFavorite> memberProductCollectionList = cmsFavoriteService.listProduct(memberService.getNewCurrentMember().getId(),productCollection.getType());
+    public Object listLikeByType(CmsFavorite productCollection) {
+        List<CmsFavorite> memberProductCollectionList = cmsFavoriteService.listProduct(memberService.getNewCurrentMember().getId(), productCollection.getType());
         return new CommonResult().success(memberProductCollectionList);
     }
+
     @ApiOperation("显示点赞列表")
     @GetMapping(value = "/listLike")
-    public Object listLike( CmsFavorite productCollection) {
+    public Object listLike(CmsFavorite productCollection) {
         List<CmsFavorite> memberProductCollectionList = cmsFavoriteService.listCollect(memberService.getNewCurrentMember().getId());
         return new CommonResult().success(memberProductCollectionList);
     }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/single/OmsCartItemController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/single/OmsCartItemController.java
index c520f33b3e625a1ea78f5126b14e108833817f85..6bd404ff25a05824dce475236b3a7fe9adeb70b3 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/single/OmsCartItemController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/single/OmsCartItemController.java
@@ -46,6 +46,7 @@ public class OmsCartItemController {
     private IOmsOrderService orderService;
     @Resource
     private ISmsBasicMarkingService smsBasicMarkingService;
+
     @ApiOperation("添加商品到购物车")
     @RequestMapping(value = "/addCart")
     @ResponseBody
@@ -67,17 +68,17 @@ public class OmsCartItemController {
     @ResponseBody
     public Object list() {
         UmsMember umsMember = memberService.getNewCurrentMember();
-        Map<String,Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         if (umsMember != null && umsMember.getId() != null) {
             List<OmsCartItem> cartItemList = cartItemService.list(umsMember.getId(), null);
-            map.put("cartItemList",cartItemList);
+            map.put("cartItemList", cartItemList);
             CartMarkingVo vo = new CartMarkingVo();
             vo.setCartList(cartItemList);
-            SmsBasicMarking marking =smsBasicMarkingService.matchOrderBasicMarking(vo) ;
-            if (marking!=null){
-                map.put("promoteAmount",marking.getMinAmount());
-            }else {
-                map.put("promoteAmount",0);
+            SmsBasicMarking marking = smsBasicMarkingService.matchOrderBasicMarking(vo);
+            if (marking != null) {
+                map.put("promoteAmount", marking.getMinAmount());
+            } else {
+                map.put("promoteAmount", 0);
             }
 
             return new CommonResult().success(map);
@@ -86,7 +87,6 @@ public class OmsCartItemController {
     }
 
 
-
     @ApiOperation("修改购物车中某个商品的数量")
     @RequestMapping(value = "/update/quantity", method = RequestMethod.GET)
     @ResponseBody
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/single/PayController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/single/PayController.java
index fd8c97057648ae3cc3d08209a65504ce89691a50..901d5ac35442bd32bb08b2fac4bca00fed899970 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/single/PayController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/single/PayController.java
@@ -2,16 +2,18 @@ package com.zscat.mallplus.single;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zscat.mallplus.annotation.IgnoreAuth;
 import com.zscat.mallplus.annotation.SysLog;
-import com.zscat.mallplus.config.WxAppletProperties;
 import com.zscat.mallplus.enums.AllEnum;
 import com.zscat.mallplus.enums.OrderStatus;
+import com.zscat.mallplus.exception.ApiMallPlusException;
 import com.zscat.mallplus.oms.entity.OmsOrder;
-import com.zscat.mallplus.oms.entity.OmsOrderItem;
 import com.zscat.mallplus.oms.entity.OmsOrderOperateHistory;
+import com.zscat.mallplus.oms.entity.OmsPayments;
 import com.zscat.mallplus.oms.service.IOmsOrderItemService;
 import com.zscat.mallplus.oms.service.IOmsOrderOperateHistoryService;
 import com.zscat.mallplus.oms.service.IOmsOrderService;
+import com.zscat.mallplus.oms.service.IOmsPaymentsService;
 import com.zscat.mallplus.oms.vo.OrderParam;
 import com.zscat.mallplus.oms.vo.PayParam;
 import com.zscat.mallplus.sms.mapper.SmsGroupMapper;
@@ -57,29 +59,27 @@ import java.util.TreeMap;
 @RequestMapping("/api/pay")
 public class PayController extends ApiBaseAction {
     private static Logger LOGGER = LoggerFactory.getLogger(PayController.class);
-
+    String tradeType = "JSAPI";
+    String uniformorder = "https://api.mch.weixin.qq.com/pay/unifiedorder";
+    String orderquery = "https://api.mch.weixin.qq.com/pay/orderquery";
+    String refundUrl = "https://api.mch.weixin.qq.com/secapi/pay/refund";
+    String refundqueryUrl = "https://api.mch.weixin.qq.com/pay/refundquery";
+    @Autowired
+    private IOmsPaymentsService paymentsService;
+    @Resource
+    private SysAppletSetMapper appletSetMapper;
     @Resource
     private IOmsOrderService orderService;
     @Resource
     private IUmsMemberService memberService;
     @Resource
     private IUmsMemberBlanceLogService blanceLogService;
-
     @Resource
     private IOmsOrderItemService orderItemService;
     @Resource
     private SmsGroupMapper groupMapper;
-
-    @Resource
-    private WxAppletProperties wxAppletProperties;
-
     @Autowired
     private IOmsOrderOperateHistoryService orderOperateHistoryService;
-    String tradeType="JSAPI";
-    String uniformorder="https://api.mch.weixin.qq.com/pay/unifiedorder";
-    String orderquery="https://api.mch.weixin.qq.com/pay/orderquery";
-    String refundUrl="https://api.mch.weixin.qq.com/secapi/pay/refund";
-    String refundqueryUrl="https://api.mch.weixin.qq.com/pay/refundquery";
 
     /**
      * 订单退款请求
@@ -126,19 +126,38 @@ public class PayController extends ApiBaseAction {
         return "<xml><appid><![CDATA[wx2421b1c4370ec43b]]></appid><attach><![CDATA[支付测试]]></attach><bank_type><![CDATA[CFT]]></bank_type><fee_type><![CDATA[CNY]]></fee_type> <is_subscribe><![CDATA[Y]]></is_subscribe><mch_id><![CDATA[10000100]]></mch_id><nonce_str><![CDATA[5d2b6c2a8db53831f7eda20af46e531c]]></nonce_str><openid><![CDATA[oUpF8uMEb4qRXf22hE3X68TekukE]]></openid> <out_trade_no><![CDATA[" + orderNum + "]]></out_trade_no>  <result_code><![CDATA[SUCCESS]]></result_code> <return_code><![CDATA[SUCCESS]]></return_code><sign><![CDATA[B552ED6B279343CB493C5DD0D78AB241]]></sign><sub_mch_id><![CDATA[10000100]]></sub_mch_id> <time_end><![CDATA[20140903131540]]></time_end><total_fee>1</total_fee><trade_type><![CDATA[JSAPI]]></trade_type><transaction_id><![CDATA[1004400740201409030005092168]]></transaction_id></xml>";
     }
 
+    @IgnoreAuth
+    @ApiOperation("显示所有支付方式")
+    @RequestMapping(value = "/paymentlist", method = RequestMethod.GET)
+    public Object getPayments() {
+        List<OmsPayments> paymentss = paymentsService.list(new QueryWrapper<OmsPayments>().eq("status", 1));
+        return new CommonResult().success(paymentss);
+    }
+
+    /**
+     * 余额支付
+     */
+    @SysLog(MODULE = "pay", REMARK = "余额支付")
+    @ApiOperation(value = "余额支付")
+    @PostMapping("allPay")
+    public Object allPay(PayParam payParam) {
+        OmsOrder order = orderService.blancePay(orderService.getById(payParam.getOrderId()));
+        return new CommonResult().success(order);
+    }
+
     /**
      * 余额支付
      */
     @SysLog(MODULE = "pay", REMARK = "余额支付")
     @ApiOperation(value = "余额支付")
     @PostMapping("balancePay")
-    public Object balancePay(PayParam payParam){
+    public Object balancePay(PayParam payParam) {
 
-        if(payParam.getPayAmount().compareTo(payParam.getBalance())>0){
-            return new CommonResult().failed("余额不足！");
-        }else {
-            OmsOrder order = orderService.blancePay(orderService.getById(payParam.getOrderId()));
+        try {
+            OmsOrder order = orderService.blancePay(payParam);
             return new CommonResult().success(order);
+        } catch (Exception e) {
+            return new CommonResult().failed(e.getMessage());
         }
     }
 
@@ -148,7 +167,7 @@ public class PayController extends ApiBaseAction {
     @SysLog(MODULE = "pay", REMARK = "积分兑换")
     @ApiOperation(value = "积分兑换")
     @PostMapping("jifenPay")
-    public Object jifenPay(OrderParam payParam){
+    public Object jifenPay(OrderParam payParam) {
         return orderService.jifenPay(payParam);
     }
 
@@ -162,13 +181,16 @@ public class PayController extends ApiBaseAction {
         UmsMember user = memberService.getNewCurrentMember();
         //
         OmsOrder orderInfo = orderService.getById(orderId);
-
+        SysAppletSet appletSet = appletSetMapper.selectOne(new QueryWrapper<>());
+        if (null == appletSet) {
+            throw new ApiMallPlusException("没有设置支付配置");
+        }
 
         if (null == orderInfo) {
             return toResponsObject(400, "订单已取消", "");
         }
 
-        if (orderInfo.getStatus() != OrderStatus.CLOSED.getValue()) {
+        if (orderInfo.getStatus() == OrderStatus.CLOSED.getValue()) {
             return toResponsObject(400, "订单已已关闭，请不要重复操作", "");
         }
         if (orderInfo.getStatus() != OrderStatus.INIT.getValue()) {
@@ -182,9 +204,9 @@ public class PayController extends ApiBaseAction {
 
         try {
             Map<Object, Object> parame = new TreeMap<Object, Object>();
-            parame.put("appid", wxAppletProperties.getAppId());
+            parame.put("appid", appletSet.getAppid());
             // 商家账号。
-            parame.put("mch_id", wxAppletProperties.getMchId());
+            parame.put("mch_id", appletSet.getMchid());
             String randomStr = CharUtil.getRandomNum(18).toUpperCase();
             // 随机字符串
             parame.put("nonce_str", randomStr);
@@ -193,28 +215,16 @@ public class PayController extends ApiBaseAction {
 
             // 商品描述
             parame.put("body", "超市-支付");
-            //订单的商品
-            List<OmsOrderItem> orderGoods = orderItemService.list(new QueryWrapper<>(new OmsOrderItem()).eq("order_id", orderId));
-            if (null != orderGoods) {
-                String body = "超市-";
-                for (OmsOrderItem goodsVo : orderGoods) {
-                    body = body + goodsVo.getProductName() + "、";
-                }
-                if (body.length() > 0) {
-                    body = body.substring(0, body.length() - 1);
-                }
-                // 商品描述
-                parame.put("body", body);
-            }
+
             //支付金额
             parame.put("total_fee", orderInfo.getPayAmount().multiply(new BigDecimal(100)).intValue());
             // 回调地址
-            parame.put("notify_url", wxAppletProperties.getNotifyUrl());
+            parame.put("notify_url", appletSet.getNotifyurl());
             // 交易类型APP
             parame.put("trade_type", tradeType);
             parame.put("spbill_create_ip", getClientIp());
             parame.put("openid", user.getWeixinOpenid());
-            String sign = WechatUtil.arraySign(parame, wxAppletProperties.getPaySignKey());
+            String sign = WechatUtil.arraySign(parame, appletSet.getPaySignKey());
             // 数字签证
             parame.put("sign", sign);
 
@@ -226,22 +236,22 @@ public class PayController extends ApiBaseAction {
             String return_msg = MapUtils.getString("return_msg", resultUn);
             //
             if (return_code.equalsIgnoreCase("FAIL")) {
-                return toResponsFail("支付失败," + return_msg);
+                return new CommonResult().failed("支付失败," + return_msg);
             } else if (return_code.equalsIgnoreCase("SUCCESS")) {
                 // 返回数据
                 String result_code = MapUtils.getString("result_code", resultUn);
                 String err_code_des = MapUtils.getString("err_code_des", resultUn);
                 if (result_code.equalsIgnoreCase("FAIL")) {
-                    return toResponsFail("支付失败," + err_code_des);
+                    return new CommonResult().failed("支付失败," + err_code_des);
                 } else if (result_code.equalsIgnoreCase("SUCCESS")) {
                     String prepay_id = MapUtils.getString("prepay_id", resultUn);
                     // 先生成paySign 参考https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=7_7&index=5
-                    resultObj.put("appId", wxAppletProperties.getAppId());
+                    resultObj.put("appId", appletSet.getAppid());
                     resultObj.put("timeStamp", DateUtils.timeToStr(System.currentTimeMillis() / 1000, DateUtils.DATE_TIME_PATTERN));
                     resultObj.put("nonceStr", nonceStr);
                     resultObj.put("package", "prepay_id=" + prepay_id);
                     resultObj.put("signType", "MD5");
-                    String paySign = WechatUtil.arraySign(resultObj, wxAppletProperties.getPaySignKey());
+                    String paySign = WechatUtil.arraySign(resultObj, appletSet.getPaySignKey());
                     resultObj.put("paySign", paySign);
                     // 业务处理
                     orderInfo.setPrepayId(prepay_id);
@@ -249,12 +259,12 @@ public class PayController extends ApiBaseAction {
                     orderInfo.setStatus(OrderStatus.PayNotNotice.getValue());
                     orderService.updateById(orderInfo);
 
-                    if (orderInfo.getPid()==null){
+                    if (orderInfo.getPid() == null) {
                         OmsOrder neworder = new OmsOrder();
                         neworder.setStatus(OrderStatus.TO_DELIVER.getValue());
                         neworder.setPayType(AllEnum.OrderPayType.weixinAppletPay.code());
                         neworder.setPaymentTime(new Date());
-                        orderService.update(neworder,new QueryWrapper<OmsOrder>().eq("pid",orderInfo.getId()));
+                        orderService.update(neworder, new QueryWrapper<OmsOrder>().eq("pid", orderInfo.getId()));
                     }
                     OmsOrderOperateHistory history = new OmsOrderOperateHistory();
                     history.setOrderId(orderInfo.getId());
@@ -265,16 +275,16 @@ public class PayController extends ApiBaseAction {
                     history.setNote("小程序支付");
                     orderOperateHistoryService.save(history);
 
-                    memberService.addIntegration(user.getId(),orderInfo.getPayAmount().multiply(new BigDecimal("0.1")).intValue(),1,"小程序支付添加积分", AllEnum.ChangeSource.order.code(),user.getUsername());
+                    memberService.addIntegration(user.getId(), orderInfo.getPayAmount().multiply(new BigDecimal("0.1")).intValue(), 1, "小程序支付添加积分", AllEnum.ChangeSource.order.code(), user.getUsername());
 
                     return toResponsObject(200, "微信统一订单下单成功", resultObj);
                 }
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return toResponsFail("下单失败,error=" + e.getMessage());
+            return new CommonResult().failed("支付失败,error=" + e.getMessage());
         }
-        return toResponsFail("下单失败");
+        return new CommonResult().failed("支付失败");
     }
 
     /**
@@ -286,22 +296,25 @@ public class PayController extends ApiBaseAction {
     public Object orderQuery(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
         UmsMember user = memberService.getNewCurrentMember();
         //
-
+        SysAppletSet appletSet = appletSetMapper.selectOne(new QueryWrapper<>());
+        if (null == appletSet) {
+            throw new ApiMallPlusException("没有设置支付配置");
+        }
         OmsOrder orderDetail = orderService.getById(id);
         if (id == null) {
-            return toResponsFail("订单不存在");
+            throw new ApiMallPlusException("订单不存在");
         }
         Map<Object, Object> parame = new TreeMap<Object, Object>();
-        parame.put("appid", wxAppletProperties.getAppId());
+        parame.put("appid", appletSet.getAppid());
         // 商家账号。
-        parame.put("mch_id", wxAppletProperties.getMchId());
+        parame.put("mch_id", appletSet.getMchid());
         String randomStr = CharUtil.getRandomNum(18).toUpperCase();
         // 随机字符串
         parame.put("nonce_str", randomStr);
         // 商户订单编号
         parame.put("out_trade_no", orderDetail.getOrderSn());
 
-        String sign = WechatUtil.arraySign(parame, wxAppletProperties.getPaySignKey());
+        String sign = WechatUtil.arraySign(parame, appletSet.getPaySignKey());
         // 数字签证
         parame.put("sign", sign);
 
@@ -312,14 +325,14 @@ public class PayController extends ApiBaseAction {
             resultUn = XmlUtil.xmlStrToMap(WechatUtil.requestOnce(orderquery, xml));
         } catch (Exception e) {
             e.printStackTrace();
-            return toResponsFail("查询失败,error=" + e.getMessage());
+            throw new ApiMallPlusException("查询失败,error=" + e.getMessage());
         }
         // 响应报文
         String return_code = MapUtils.getString("return_code", resultUn);
         String return_msg = MapUtils.getString("return_msg", resultUn);
 
         if (!"SUCCESS".equals(return_code)) {
-            return toResponsFail("查询失败,error=" + return_msg);
+            throw new ApiMallPlusException("查询失败,error=" + return_msg);
         }
 
         String trade_state = MapUtils.getString("trade_state", resultUn);
@@ -332,7 +345,7 @@ public class PayController extends ApiBaseAction {
             orderInfo.setConfirmStatus(1);
             orderInfo.setPaymentTime(new Date());
             orderService.updateById(orderInfo);
-            return toResponsMsgSuccess("支付成功");
+            return new CommonResult().success("支付成功");
         } else if ("USERPAYING".equals(trade_state)) {
             // 重新查询 正在支付中
            /* Integer num = (Integer) J2CacheUtils.get(J2CacheUtils.SHOP_CACHE_NAME, "queryRepeatNum" + id + "");
@@ -343,15 +356,15 @@ public class PayController extends ApiBaseAction {
                 J2CacheUtils.remove(J2CacheUtils.SHOP_CACHE_NAME, "queryRepeatNum" + id);
                 this.orderQuery(id);
             } else {
-                return toResponsFail("查询失败,error=" + trade_state);
+                throw new ApiMallPlusException("查询失败,error=" + trade_state);
             }*/
 
         } else {
             // 失败
-            return toResponsFail("查询失败,error=" + trade_state);
+            throw new ApiMallPlusException("查询失败,error=" + trade_state);
         }
 
-        return toResponsFail("查询失败，未知错误");
+        throw new ApiMallPlusException("查询失败，未知错误");
     }
 
     /**
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeBuildController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeBuildController.java
index fab6941c37af8b14b60ed9339df0901a29b98548..b6e20450e15ba4dd2c295678b5e10c8a82cb12c0 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeBuildController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeBuildController.java
@@ -85,7 +85,7 @@ public class SingeBuildController extends ApiBaseAction {
     @Resource
     private SmsGroupMemberMapper groupMemberMapper;
     @Resource
-    private  PmsProductCategoryMapper categoryMapper;
+    private PmsProductCategoryMapper categoryMapper;
     @Resource
     private IPmsGiftsService giftsService;
     @Resource
@@ -100,21 +100,21 @@ public class SingeBuildController extends ApiBaseAction {
     @SysLog(MODULE = "home", REMARK = "首页内容页信息展示")
     @RequestMapping(value = "/home_mobile", method = RequestMethod.GET)
     public Object home_mobile() {
-        String key = Rediskey.HOMEPAGEMOBILE ;
+        String key = Rediskey.HOMEPAGEMOBILE;
         String json = redisService.get(key);
         HomeContentResult contentResult = null;
         try {
-            if (ValidatorUtils.empty(json)){
+            if (ValidatorUtils.empty(json)) {
                 contentResult = advertiseService.singelmobileContent();
-                redisService.set(key,JsonUtils.objectToJson(contentResult));
-                redisService.expire(key,30);
-            }else{
+                redisService.set(key, JsonUtils.objectToJson(contentResult));
+                redisService.expire(key, 30);
+            } else {
                 contentResult = JsonUtils.jsonToPojo(redisService.get(key), HomeContentResult.class);
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             contentResult = advertiseService.singelmobileContent();
-            redisService.set(key,JsonUtils.objectToJson(contentResult));
-            redisService.expire(key,30);
+            redisService.set(key, JsonUtils.objectToJson(contentResult));
+            redisService.expire(key, 30);
         }
         return new CommonResult().success(contentResult);
     }
@@ -126,13 +126,13 @@ public class SingeBuildController extends ApiBaseAction {
     public Object queryProductDetail(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
         GoodsDetailResult goods = null;
         try {
-            goods = JsonUtils.jsonToPojo(redisService.get(String.format(Rediskey.GOODSDETAIL, id+"")), GoodsDetailResult.class);
-            if (ValidatorUtils.empty(goods) || ValidatorUtils.empty(goods.getGoods())){
-                log.info("redis缓存失效："+id);
+            goods = JsonUtils.jsonToPojo(redisService.get(String.format(Rediskey.GOODSDETAIL, id + "")), GoodsDetailResult.class);
+            if (ValidatorUtils.empty(goods) || ValidatorUtils.empty(goods.getGoods())) {
+                log.info("redis缓存失效：" + id);
                 goods = pmsProductService.getGoodsRedisById(id);
             }
         } catch (Exception e) {
-            log.info("redis缓存失效："+id);
+            log.info("redis缓存失效：" + id);
             goods = pmsProductService.getGoodsRedisById(id);
         }
         Map<String, Object> map = new HashMap<>();
@@ -144,5 +144,4 @@ public class SingeBuildController extends ApiBaseAction {
     }
 
 
-
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeCmsController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeCmsController.java
index e23bad7c99fc475e3caec873c193dc6bc84cb732..2056244edaec73dba9adb0c8e9f3c640bb040ebc 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeCmsController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeCmsController.java
@@ -82,15 +82,15 @@ public class SingeCmsController extends ApiBaseAction {
     private IUmsMemberService memberService;
 
     @Resource
-    private  CmsSubjectProductRelationMapper subjectProductRelationMapper;
+    private CmsSubjectProductRelationMapper subjectProductRelationMapper;
 
     @IgnoreAuth
     @SysLog(MODULE = "cms", REMARK = "查询打赏列表")
     @ApiOperation(value = "查询打赏列表")
     @GetMapping(value = "/reward/list")
     public Object rewardList(UmsRewardLog subject,
-                              @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                              @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
+                             @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                             @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
         return new CommonResult().success(rewardLogService.page(new Page<UmsRewardLog>(pageNum, pageSize), new QueryWrapper<>(subject).orderByDesc("create_time")));
     }
 
@@ -101,7 +101,7 @@ public class SingeCmsController extends ApiBaseAction {
     public Object subjectList(CmsSubject subject,
                               @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
                               @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
-        return new CommonResult().success(subjectService.page(new Page<CmsSubject>(pageNum, pageSize), new QueryWrapper<>(subject).orderByDesc("create_time").select(ConstansValue.sampleSubjectList)));
+        return new CommonResult().success(subjectService.page(new Page<CmsSubject>(pageNum, pageSize), new QueryWrapper<>(subject).orderByDesc("create_time")));
     }
 
     @SysLog(MODULE = "cms", REMARK = "查询文章分类列表")
@@ -132,8 +132,9 @@ public class SingeCmsController extends ApiBaseAction {
             @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
             @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
 
-        return new CommonResult().success(subjectService.getRecommendSubjectList(1,1));
+        return new CommonResult().success(subjectService.getRecommendSubjectList(1, 1));
     }
+
     @SysLog(MODULE = "cms", REMARK = "查询专题列表")
     @IgnoreAuth
     @ApiOperation(value = "查询公益列表")
@@ -143,6 +144,7 @@ public class SingeCmsController extends ApiBaseAction {
                               @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
         return new CommonResult().success(topicService.page(new Page<CmsTopic>(pageNum, pageSize), new QueryWrapper<>(topic).orderByDesc("create_time")));
     }
+
     @SysLog(MODULE = "cms", REMARK = "查询专题列表")
     @IgnoreAuth
     @ApiOperation(value = "查询公益评论列表")
@@ -159,10 +161,11 @@ public class SingeCmsController extends ApiBaseAction {
     @ApiOperation(value = "查询公益详情信息")
     public Object topicDetail(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
         CmsTopic productResult = topicService.getById(id);
-        productResult.setReadCount(productResult.getReadCount()+1);
+        productResult.setReadCount(productResult.getReadCount() + 1);
         topicService.updateById(productResult);
         return new CommonResult().success(productResult);
     }
+
     @SysLog(MODULE = "pms", REMARK = "查询文章详情信息")
     @IgnoreAuth
     @GetMapping(value = "/subject/detail")
@@ -171,62 +174,63 @@ public class SingeCmsController extends ApiBaseAction {
         CmsSubject productResult = subjectService.getById(id);
         List<CmsSubjectProductRelation> list = subjectProductRelationMapper.selectList(new QueryWrapper<CmsSubjectProductRelation>().eq("subject_id", id));
 
-        if(list!=null && list.size()>0){
+        if (list != null && list.size() > 0) {
             List<Long> ids = list.stream()
                     .map(CmsSubjectProductRelation::getProductId)
                     .collect(Collectors.toList());
-            List<PmsProduct> products = (List<PmsProduct>) pmsProductService.list(new QueryWrapper<PmsProduct>().in("id",ids).select(ConstansValue.sampleGoodsList));
+            List<PmsProduct> products = (List<PmsProduct>) pmsProductService.list(new QueryWrapper<PmsProduct>().in("id", ids).select(ConstansValue.sampleGoodsList));
             productResult.setProducts(products);
         }
 
         //记录浏览量到redis,然后定时更新到数据库
-        String key= Rediskey.ARTICLE_VIEWCOUNT_CODE+id;
+        String key = Rediskey.ARTICLE_VIEWCOUNT_CODE + id;
         //找到redis中该篇文章的点赞数，如果不存在则向redis中添加一条
-        Map<Object,Object> viewCountItem=redisUtil.hGetAll(Rediskey.ARTICLE_VIEWCOUNT_KEY);
-        Integer viewCount=0;
-        if(!viewCountItem.isEmpty()){
-            if(viewCountItem.containsKey(key)){
-                viewCount=Integer.parseInt(viewCountItem.get(key).toString())+1;
-                redisUtil.hPut(Rediskey.ARTICLE_VIEWCOUNT_KEY,key,viewCount+"");
-            }else {
-                viewCount=1;
-                redisUtil.hPut(Rediskey.ARTICLE_VIEWCOUNT_KEY,key,1+"");
+        Map<Object, Object> viewCountItem = redisUtil.hGetAll(Rediskey.ARTICLE_VIEWCOUNT_KEY);
+        Integer viewCount = 0;
+        if (!viewCountItem.isEmpty()) {
+            if (viewCountItem.containsKey(key)) {
+                viewCount = Integer.parseInt(viewCountItem.get(key).toString()) + 1;
+                redisUtil.hPut(Rediskey.ARTICLE_VIEWCOUNT_KEY, key, viewCount + "");
+            } else {
+                viewCount = 1;
+                redisUtil.hPut(Rediskey.ARTICLE_VIEWCOUNT_KEY, key, 1 + "");
             }
-        }else{
-            viewCount=1;
-            redisUtil.hPut(Rediskey.ARTICLE_VIEWCOUNT_KEY,key,1+"");
+        } else {
+            viewCount = 1;
+            redisUtil.hPut(Rediskey.ARTICLE_VIEWCOUNT_KEY, key, 1 + "");
         }
         productResult.setReadCount(viewCount);
         return new CommonResult().success(productResult);
     }
+
     @SysLog(MODULE = "cms", REMARK = "创建文章")
     @ApiOperation(value = "创建文章")
     @PostMapping(value = "/createSubject")
     public Object createSubject(CmsSubject subject, BindingResult result) {
         CommonResult commonResult;
         UmsMember member = memberService.getNewCurrentMember();
-        if (member!=null){
+        if (member != null) {
             subject.setMemberId(member.getId());
             subject.setMemberName(member.getNickname());
-        }else {
+        } else {
             return new CommonResult().failed("请先登录");
         }
         if (member.getMemberLevelId() > 0) {
             UmsMemberLevel memberLevel = memberLevelService.getById(member.getMemberLevelId());
 
             int subjectCounts = subjectService.countByToday(member.getId());
-            if (ValidatorUtils.empty(subjectCounts)){
-                subjectCounts=0;
+            if (ValidatorUtils.empty(subjectCounts)) {
+                subjectCounts = 0;
             }
             if (subjectCounts > memberLevel.getArticlecount()) {
                 commonResult = new CommonResult().failed("你今天已经有发" + memberLevel.getArticlecount() + "篇文章");
                 return commonResult;
             }
         }
-        if (subject.getQsType()==1){
+        if (subject.getQsType() == 1) {
             subject.setSchoolName(member.getSchoolName());
             subject.setSchoolId(member.getSchoolId());
-        }else {
+        } else {
             subject.setAreaName(member.getAreaName());
             subject.setAreaId(member.getAreaId());
         }
@@ -251,17 +255,17 @@ public class SingeCmsController extends ApiBaseAction {
     public Object createTopic(CmsTopic subject, BindingResult result) {
         CommonResult commonResult;
         UmsMember member = memberService.getNewCurrentMember();
-        if (member!=null){
+        if (member != null) {
             subject.setMemberId(member.getId());
             subject.setMemberName(member.getNickname());
-        }else {
+        } else {
             return new CommonResult().failed("请先登录");
         }
 
-        if (subject.getQsType()==1){
+        if (subject.getQsType() == 1) {
             subject.setSchoolName(member.getSchoolName());
             subject.setSchoolId(member.getSchoolId());
-        }else {
+        } else {
             subject.setAreaName(member.getAreaName());
             subject.setAreaId(member.getAreaId());
         }
@@ -288,26 +292,26 @@ public class SingeCmsController extends ApiBaseAction {
 
         CmsTopic subject = topicService.getById(id);
         Date now = new Date();
-        if (now.getTime()>subject.getEndTime().getTime() || now.getTime()<subject.getStartTime().getTime()){
+        if (now.getTime() > subject.getEndTime().getTime() || now.getTime() < subject.getStartTime().getTime()) {
             return new CommonResult().failed("未开始或者已过期");
         }
-        if (member!=null){
-            if (ValidatorUtils.notEmpty(subject.getAtids())){
+        if (member != null) {
+            if (ValidatorUtils.notEmpty(subject.getAtids())) {
                 String[] values = subject.getAtids().split(",");
                 List<String> list = Arrays.asList(values);
-                if(list.contains(member.getId()+"")){
+                if (list.contains(member.getId() + "")) {
                     return new CommonResult().failed("你已参加该活动");
-                }else{
-                    list.add(member.getId()+"");
+                } else {
+                    list.add(member.getId() + "");
                     subject.setAtids(Arrays.toString(list.toArray()));
                 }
             }
 
-        }else {
+        } else {
             return new CommonResult().failed("请先登录");
         }
-        subject.setReadCount(subject.getReadCount()+1);
-        subject.setAttendCount(subject.getAttendCount()+1);
+        subject.setReadCount(subject.getReadCount() + 1);
+        subject.setAttendCount(subject.getAttendCount() + 1);
 
         boolean count = topicService.updateById(subject);
         if (count) {
@@ -326,21 +330,21 @@ public class SingeCmsController extends ApiBaseAction {
         UmsMember member = memberService.getNewCurrentMember();
         CmsTopic subject = topicService.getById(id);
 
-        if (member!=null){
-            if (ValidatorUtils.notEmpty(subject.getAtids())){
+        if (member != null) {
+            if (ValidatorUtils.notEmpty(subject.getAtids())) {
                 String[] values = subject.getAtids().split(",");
                 List<String> list = Arrays.asList(values);
-                if(list.contains(member.getId()+"")){
-                    list.remove(member.getId()+"");
+                if (list.contains(member.getId() + "")) {
+                    list.remove(member.getId() + "");
                     subject.setAtids(Arrays.toString(list.toArray()));
                 }
             }
 
-        }else {
+        } else {
             return new CommonResult().failed("请先登录");
         }
-        subject.setReadCount(subject.getReadCount()-1);
-        subject.setAttendCount(subject.getAttendCount()-1);
+        subject.setReadCount(subject.getReadCount() - 1);
+        subject.setAttendCount(subject.getAttendCount() - 1);
 
         boolean count = topicService.updateById(subject);
         if (count) {
@@ -357,7 +361,7 @@ public class SingeCmsController extends ApiBaseAction {
     public Object favoriteTopic(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
         CommonResult commonResult;
         CmsTopic subject = topicService.getById(id);
-        subject.setAttentionCount(subject.getAttentionCount()+1);
+        subject.setAttentionCount(subject.getAttentionCount() + 1);
         boolean count = topicService.updateById(subject);
         if (count) {
             commonResult = new CommonResult().success(count);
@@ -373,10 +377,10 @@ public class SingeCmsController extends ApiBaseAction {
     public Object addSubjectCom(CmsSubjectComment subject, BindingResult result) {
         CommonResult commonResult;
         UmsMember member = memberService.getNewCurrentMember();
-        if (member!=null){
+        if (member != null) {
             subject.setMemberIcon(member.getIcon());
             subject.setMemberNickName(member.getNickname());
-        }else {
+        } else {
             return new CommonResult().failed("请先登录");
         }
         subject.setCreateTime(new Date());
@@ -389,16 +393,17 @@ public class SingeCmsController extends ApiBaseAction {
         }
         return commonResult;
     }
+
     @SysLog(MODULE = "cms", REMARK = "创建文章")
     @ApiOperation(value = "添加公益评论")
     @PostMapping(value = "/addTopicCom")
     public Object addTopicCom(CmsTopicComment subject, BindingResult result) {
         CommonResult commonResult;
         UmsMember member = memberService.getNewCurrentMember();
-        if (member!=null){
+        if (member != null) {
             subject.setMemberIcon(member.getIcon());
             subject.setMemberNickName(member.getNickname());
-        }else {
+        } else {
             return new CommonResult().failed("请先登录");
         }
         subject.setCreateTime(new Date());
@@ -417,7 +422,7 @@ public class SingeCmsController extends ApiBaseAction {
     @SysLog(MODULE = "ums", REMARK = "打赏文章")
     public Object reward(@RequestParam(value = "articlelId", required = true) Long articlelId,
                          @RequestParam(value = "coin", required = true) int coin) {
-        return subjectService.reward(articlelId,coin);
+        return subjectService.reward(articlelId, coin);
     }
 
     @GetMapping("/listTimeline")
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeMarkingController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeMarkingController.java
index 8b11375b7b6c32bf5a3992fd04f1dc3af284b3d6..d9fdddc57f7da6a7951316c4efa09d74de6dc641 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeMarkingController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeMarkingController.java
@@ -50,6 +50,8 @@ import java.util.stream.Collectors;
 @RequestMapping("/api/single/sms")
 public class SingeMarkingController extends ApiBaseAction {
 
+    @Autowired
+    ISmsCouponService couponService;
     @Resource
     private ISmsBasicGiftsService basicGiftsService;
     @Resource
@@ -60,8 +62,6 @@ public class SingeMarkingController extends ApiBaseAction {
     private ISmsGroupActivityService smsGroupActivityService;
     @Resource
     private IPmsProductService productService;
-    @Autowired
-    ISmsCouponService couponService;
     @Resource
     private RedisUtil redisUtil;
     @Autowired
@@ -92,9 +92,9 @@ public class SingeMarkingController extends ApiBaseAction {
     public Object detail(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
         List<SmsBasicMarking> basicMarkingList = basicMarkingService.matchGoodsBasicMarking(id);
         List<SmsBasicGifts> basicGiftsList = basicGiftsService.matchGoodsBasicGifts(id);
-        Map<String,Object> map = new HashMap<>();
-        map.put("basicMarkingList",basicMarkingList);
-        map.put("basicGiftsList",basicGiftsList);
+        Map<String, Object> map = new HashMap<>();
+        map.put("basicMarkingList", basicMarkingList);
+        map.put("basicGiftsList", basicGiftsList);
         return new CommonResult().success(map);
     }
 
@@ -109,11 +109,11 @@ public class SingeMarkingController extends ApiBaseAction {
 
         IPage<SmsGroupActivity> page = null;
         groupActivity.setStatus(1);
-        page = smsGroupActivityService.page(new Page<SmsGroupActivity>(pageNum, pageSize), new QueryWrapper<>(groupActivity).orderByDesc("create_time")) ;
+        page = smsGroupActivityService.page(new Page<SmsGroupActivity>(pageNum, pageSize), new QueryWrapper<>(groupActivity).orderByDesc("create_time"));
 
         for (SmsGroupActivity smsGroupActivity : page.getRecords()) {
             if (ValidatorUtils.notEmpty(smsGroupActivity.getGoodsIds())) {
-                List<PmsProduct> productList = (List<PmsProduct>) productService.list(new QueryWrapper<PmsProduct>().in("id",Arrays.asList(smsGroupActivity.getGoodsIds().split(",")).stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList())).select(ConstansValue.sampleGoodsList));
+                List<PmsProduct> productList = (List<PmsProduct>) productService.list(new QueryWrapper<PmsProduct>().in("id", Arrays.asList(smsGroupActivity.getGoodsIds().split(",")).stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList())).select(ConstansValue.sampleGoodsList));
                 if (productList != null && productList.size() > 0) {
                     smsGroupActivity.setProductList(productList);
                 }
@@ -138,25 +138,25 @@ public class SingeMarkingController extends ApiBaseAction {
                 if (goods == null || goods.getGoods() == null) {
                     goods = productService.getGoodsRedisById(goodIds.get(0));
                 }
-                    if (goods != null && goods.getGoods() != null) {
-                        UmsMember umsMember = memberService.getNewCurrentMember();
-                        if (umsMember != null && umsMember.getId() != null) {
-                            isCollectGoods(map, goods, umsMember);
-                        }
-                        recordGoodsFoot(id);
-
-                        List<Long> newGoodIds = goodIds.subList(1, goodIds.size());
-                        if (newGoodIds != null && newGoodIds.size() > 0) {
-                            List<PmsProduct> productList = (List<PmsProduct>) productService.list(new QueryWrapper<PmsProduct>().in("id",goodIds).select(ConstansValue.sampleGoodsList));
-                            if (productList != null && productList.size() > 0) {
-                                groupActivity.setProductList(productList);
-                            }
+                if (goods != null && goods.getGoods() != null) {
+                    UmsMember umsMember = memberService.getNewCurrentMember();
+                    if (umsMember != null && umsMember.getId() != null) {
+                        isCollectGoods(map, goods, umsMember);
+                    }
+                    recordGoodsFoot(id);
+
+                    List<Long> newGoodIds = goodIds.subList(1, goodIds.size());
+                    if (newGoodIds != null && newGoodIds.size() > 0) {
+                        List<PmsProduct> productList = (List<PmsProduct>) productService.list(new QueryWrapper<PmsProduct>().in("id", goodIds).select(ConstansValue.sampleGoodsList));
+                        if (productList != null && productList.size() > 0) {
+                            groupActivity.setProductList(productList);
                         }
-                        map.put("groupActivity", groupActivity);
-                        map.put("goods", goods);
-                        return new CommonResult().success(map);
                     }
+                    map.put("groupActivity", groupActivity);
+                    map.put("goods", goods);
+                    return new CommonResult().success(map);
                 }
+            }
 
         }
         return new CommonResult().failed();
@@ -164,6 +164,7 @@ public class SingeMarkingController extends ApiBaseAction {
 
     /**
      * 判断是否收藏商品
+     *
      * @param map
      * @param goods
      * @param umsMember
@@ -184,6 +185,7 @@ public class SingeMarkingController extends ApiBaseAction {
 
     /**
      * 记录商品浏览记录
+     *
      * @param id
      */
     private void recordGoodsFoot(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeOmsController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeOmsController.java
index fd03f207e9774f01a0981f238380190c4633c1d7..6eeb1195599827610c4cc2fc38dbc67c349e75e1 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeOmsController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeOmsController.java
@@ -21,17 +21,26 @@ import com.zscat.mallplus.sms.service.ISmsGroupService;
 import com.zscat.mallplus.ums.entity.UmsMember;
 import com.zscat.mallplus.ums.mapper.UmsMemberMapper;
 import com.zscat.mallplus.ums.service.IUmsMemberService;
+import com.zscat.mallplus.ums.service.impl.RedisUtil;
+import com.zscat.mallplus.util.JsonUtils;
 import com.zscat.mallplus.utils.CommonResult;
+import com.zscat.mallplus.utils.HttpUtils;
 import com.zscat.mallplus.utils.ValidatorUtils;
+import com.zscat.mallplus.vo.Rediskey;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpResponse;
+import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Auther: shenzhuan
@@ -43,6 +52,8 @@ import java.util.List;
 @Api(tags = "OmsController", description = "订单管理系统")
 @RequestMapping("/api/single/oms")
 public class SingeOmsController extends ApiBaseAction {
+    // 物流信息缓存间隔暂定3个小时
+    private static final Long maxCacheTime = 1000 * 60 * 60 * 3L;
     @Resource
     private UmsMemberMapper memberMapper;
     @Resource
@@ -56,6 +67,9 @@ public class SingeOmsController extends ApiBaseAction {
     @Autowired
     private IUmsMemberService memberService;
 
+    @Autowired
+    private RedisUtil redisUtil;
+
     @IgnoreAuth
     @SysLog(MODULE = "oms", REMARK = "查询订单列表")
     @ApiOperation(value = "查询订单列表")
@@ -65,36 +79,42 @@ public class SingeOmsController extends ApiBaseAction {
                             @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
 
         IPage<OmsOrder> page = null;
-        if (order.getStatus()!=null && order.getStatus()==0){
-            page = orderService.page(new Page<OmsOrder>(pageNum, pageSize), new QueryWrapper<OmsOrder>().eq("member_id",memberService.getNewCurrentMember().getId()).isNull("pid").orderByDesc("create_time").select(ConstansValue.sampleOrderList)) ;
-        }else {
+        if (order.getStatus() != null && order.getStatus() == 0) {
+            page = orderService.page(new Page<OmsOrder>(pageNum, pageSize), new QueryWrapper<OmsOrder>().eq("member_id", memberService.getNewCurrentMember().getId()).isNull("pid").orderByDesc("create_time").select(ConstansValue.sampleOrderList));
+        } else {
             order.setMemberId(memberService.getNewCurrentMember().getId());
-            page = orderService.page(new Page<OmsOrder>(pageNum, pageSize), new QueryWrapper<>(order).isNull("pid").orderByDesc("create_time").select(ConstansValue.sampleOrderList)) ;
+            page = orderService.page(new Page<OmsOrder>(pageNum, pageSize), new QueryWrapper<>(order).isNull("pid").orderByDesc("create_time").select(ConstansValue.sampleOrderList));
 
         }
-        for (OmsOrder omsOrder : page.getRecords()){
-            List<OmsOrderItem> itemList = orderItemService.list(new QueryWrapper<OmsOrderItem>().eq("order_id",omsOrder.getId()).eq("type", AllEnum.OrderItemType.GOODS.code()));
+        for (OmsOrder omsOrder : page.getRecords()) {
+            List<OmsOrderItem> itemList = orderItemService.list(new QueryWrapper<OmsOrderItem>().eq("order_id", omsOrder.getId()).eq("type", AllEnum.OrderItemType.GOODS.code()));
             omsOrder.setOrderItemList(itemList);
         }
         return new CommonResult().success(page);
     }
+
     @ApiOperation("获取订单详情:订单信息、商品信息、操作记录")
     @RequestMapping(value = "/detail", method = RequestMethod.GET)
     @ResponseBody
     public Object detail(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
         OmsOrder orderDetailResult = null;
-            orderDetailResult = orderService.getById(id);
-            OmsOrderItem query = new OmsOrderItem();
-            query.setOrderId(id);
-            List<OmsOrderItem> orderItemList = orderItemService.list(new QueryWrapper<>(query));
-            orderDetailResult.setOrderItemList(orderItemList);
-            UmsMember member = memberMapper.selectById(orderDetailResult.getMemberId());
-            if(member!=null){
-                orderDetailResult.setBlance(member.getBlance());
-            }
+        orderDetailResult = orderService.getById(id);
+        OmsOrderItem query = new OmsOrderItem();
+        query.setOrderId(id);
+        List<OmsOrderItem> orderItemList = orderItemService.list(new QueryWrapper<>(query));
+        orderDetailResult.setOrderItemList(orderItemList);
+        UmsMember member = memberMapper.selectById(orderDetailResult.getMemberId());
+        if (member != null) {
+            orderDetailResult.setBlance(member.getBlance());
+        }
         return new CommonResult().success(orderDetailResult);
     }
-
+    @ApiOperation("获取订单详情:订单信息、商品信息、操作记录")
+    @RequestMapping(value = "/itemDetail", method = RequestMethod.GET)
+    @ResponseBody
+    public Object itemDetail(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
+        return new CommonResult().success(orderItemService.getById(id));
+    }
     @SysLog(MODULE = "小程序订单管理", REMARK = "取消订单")
     @ApiOperation("关闭订单")
     @RequestMapping(value = "/closeOrder", method = RequestMethod.POST)
@@ -115,6 +135,7 @@ public class SingeOmsController extends ApiBaseAction {
         }
         return new CommonResult().failed();
     }
+
     @SysLog(MODULE = "订单管理", REMARK = "订单确认收货")
     @ApiOperation("订单确认收货")
     @RequestMapping(value = "/confimDelivery", method = RequestMethod.POST)
@@ -126,6 +147,7 @@ public class SingeOmsController extends ApiBaseAction {
             return new CommonResult().failed();
         }
     }
+
     @SysLog(MODULE = "订单管理", REMARK = "订单申请退款")
     @ApiOperation("申请退款")
     @RequestMapping(value = "/applyRefund", method = RequestMethod.POST)
@@ -142,10 +164,17 @@ public class SingeOmsController extends ApiBaseAction {
     @SysLog(MODULE = "oms", REMARK = "添加订单评论")
     @ApiOperation(value = "添加订单评论")
     @PostMapping(value = "/orderevaluate")
-    public Object addGoodsConsult( @RequestParam(value = "orderId", defaultValue = "1") Long orderId,
-                                   @RequestParam(value = "items", defaultValue = "10") String items) throws Exception {
+    public Object addGoodsConsult(@RequestParam(value = "orderId", defaultValue = "1") Long orderId,
+                                  @RequestParam(value = "items", defaultValue = "10") String items) throws Exception {
 
-        return orderService.orderComment(orderId,items);
+        return orderService.orderComment(orderId, items);
+    }
+
+    @SysLog(MODULE = "oms", REMARK = "申请售后")
+    @ApiOperation(value = "申请售后")
+    @PostMapping(value = "/applyRe")
+    public Object applyRe(@RequestParam(value = "items", defaultValue = "10") String items) throws Exception {
+        return orderService.applyRe(items);
     }
     @ResponseBody
     @GetMapping("/submitPreview")
@@ -177,6 +206,7 @@ public class SingeOmsController extends ApiBaseAction {
 
     /**
      * 团购商品订单预览
+     *
      * @param orderParam
      * @return
      */
@@ -192,6 +222,7 @@ public class SingeOmsController extends ApiBaseAction {
         }
         return null;
     }
+
     /**
      * 提交订单
      *
@@ -239,6 +270,100 @@ public class SingeOmsController extends ApiBaseAction {
         }
         return null;
     }
+    /**
+     * 查看物流
+     */
+    @ApiOperation("查看物流")
+    @ResponseBody
+    @RequestMapping("/logisticbyapi")
+    public Object getWayBillInfo(String no, String type) throws Exception {
+        try {
+            no = "801132164062135036";
+            if (StringUtils.isEmpty(no)) {
+                throw new ApiMallPlusException("请传入运单号");
+            }
+            // String host = "http://kdwlcxf.market.alicloudapi.com";
+            // String path = "/kdwlcx";
+
+            // String host = "https://wdexpress.market.alicloudapi.com";
+            // String path = "/gxali";
+
+            String host = "https://wuliu.market.alicloudapi.com";
+            String path = "/kdi";
 
+            String method = "GET";
+
+            String appcode = "436e99b5b81044698cbaf100d164aa63";  // !!! 替换这里填写你自己的AppCode 请在买家中心查看
+
+            Map<String, String> headers = new HashMap<String, String>();
+            headers.put("Authorization", "APPCODE " + appcode); //格式为:Authorization:APPCODE 83359fd73fe11248385f570e3c139xxx
+            Map<String, String> querys = new HashMap<String, String>();
+            querys.put("no", no);  // !!! 请求参数  运单号
+            if (ValidatorUtils.notEmpty(type)) {
+                querys.put("type", type);// !!! 请求参数   快递公司
+            }
+
+            // 物流信息
+            String returnStr = "";
+
+
+            Map<String, Object> returnMap = new HashMap<String, Object>();
+
+            try {
+                log.info("---------开始查询运单号为{}的物流信息", no);
+
+                // 只有当redis里面有缓存，且缓存时间不超过最大缓存时长，直接取缓存数据
+                if (redisUtil.hExists(Rediskey.KDWL_INFO_CACHE, no)) {
+
+                    // redis已经有缓存
+                    Object kdwlInfo = redisUtil.hGet(Rediskey.KDWL_INFO_CACHE, no);
+                    if (ValidatorUtils.notEmpty(kdwlInfo)) {
+                        Map<String, Object> kdwlInfoToMap = JsonUtils.readJsonToMap(kdwlInfo.toString());
+                        Long cacheBeginTime = (Long) kdwlInfoToMap.get("queryTime");
+                        // 计算已经缓存时长
+                        if (System.currentTimeMillis() - cacheBeginTime < maxCacheTime) {
+                            // 直接取缓存
+                            // kdwlInfoToMap.remove("queryTime");
+                            log.info("---------此次查询的物流信息来至于Redis缓存");
+                            log.info("---------查询运单号为{}的物流信息结束,物流信息：{}", no, kdwlInfo);
+                            return kdwlInfoToMap;
+                        } else {
+                            // TODO: 2018/8/23 这里已经存过缓存时间 如果缓存数据得到的 物流的状态是已签收，是否需要重新查询？？还是直接返回
+
+                        }
+
+                    }
+                }
+
+                // 重新查询最新物流信息
+                HttpResponse response = HttpUtils.doGet(host, path, method, headers, querys);
+
+                // 从返回信息中拿到
+                returnStr = EntityUtils.toString(response.getEntity());
+
+                if (StringUtils.isEmpty(returnStr)) {
+                    throw new ApiMallPlusException("查询物流信息失败");
+                }
+
+                // 重新缓存 [这里包含运单号输错 也缓存 避免有人故意调我们物流接口 次数用完]
+                returnMap = JsonUtils.readJsonToMap(returnStr);
+                if (returnMap != null) {
+                    returnMap.put("queryTime", System.currentTimeMillis());
+                }
+                redisUtil.hPut(Rediskey.KDWL_INFO_CACHE, no, JsonUtils.objectToJson(returnMap));
+
+                log.info("---------此次查询的物流信息来至于重新查询");
+                log.info("---------查询运单号为{}的物流信息结束,物流信息：{}", no, returnStr);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            return returnMap;
+        } catch (Exception e) {
+            log.error("get waybillInfo error. error=" + e.getMessage(), e);
+            return new CommonResult().failed("获取物流信息失败，请稍后重试");
+        }
+
+    }
 
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingePmsController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingePmsController.java
index 3069dbf7c857bc2b261c8353db11917900acfc3b..f16fd29f5707b9409280d1876e5942e520bf016f 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingePmsController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingePmsController.java
@@ -4,6 +4,7 @@ package com.zscat.mallplus.single;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zscat.mallplus.ApiContext;
 import com.zscat.mallplus.annotation.IgnoreAuth;
 import com.zscat.mallplus.annotation.SysLog;
 import com.zscat.mallplus.cms.service.ICmsSubjectCategoryService;
@@ -18,8 +19,10 @@ import com.zscat.mallplus.pms.vo.*;
 import com.zscat.mallplus.sms.entity.SmsFlashPromotionProductRelation;
 import com.zscat.mallplus.sms.entity.SmsGroup;
 import com.zscat.mallplus.sms.entity.SmsGroupMember;
+import com.zscat.mallplus.sms.entity.SmsGroupRecord;
 import com.zscat.mallplus.sms.mapper.SmsGroupMapper;
 import com.zscat.mallplus.sms.mapper.SmsGroupMemberMapper;
+import com.zscat.mallplus.sms.mapper.SmsGroupRecordMapper;
 import com.zscat.mallplus.sms.service.ISmsFlashPromotionProductRelationService;
 import com.zscat.mallplus.sms.service.ISmsGroupService;
 import com.zscat.mallplus.sms.service.ISmsHomeAdvertiseService;
@@ -33,7 +36,6 @@ import com.zscat.mallplus.util.DateUtils;
 import com.zscat.mallplus.util.JsonUtils;
 import com.zscat.mallplus.utils.CommonResult;
 import com.zscat.mallplus.utils.ValidatorUtils;
-
 import com.zscat.mallplus.vo.Rediskey;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -72,7 +74,10 @@ public class SingePmsController extends ApiBaseAction {
     private IUmsMemberLevelService memberLevelService;
     @Resource
     private IPmsProductService pmsProductService;
-
+    @Resource
+    private SmsGroupRecordMapper groupRecordMapper;
+    @Autowired
+    private ApiContext apiContext;
     @Resource
     private IPmsProductAttributeCategoryService productAttributeCategoryService;
     @Resource
@@ -99,7 +104,7 @@ public class SingePmsController extends ApiBaseAction {
     @Resource
     private SmsGroupMemberMapper groupMemberMapper;
     @Resource
-    private  PmsProductCategoryMapper categoryMapper;
+    private PmsProductCategoryMapper categoryMapper;
     @Resource
     private IPmsGiftsService giftsService;
     @Resource
@@ -123,10 +128,10 @@ public class SingePmsController extends ApiBaseAction {
     @PostMapping(value = "/updatePaiMai")
     public Object updatePaiMai(PaiMaiParam paiMaiParam) {
         PmsProduct goods = pmsProductService.getById(paiMaiParam.getId());
-        if(paiMaiParam.getPrice().compareTo(goods.getOriginalPrice())>0){
+        if (paiMaiParam.getPrice().compareTo(goods.getOriginalPrice()) > 0) {
             goods.setOriginalPrice(paiMaiParam.getPrice());
             return pmsProductService.updatePaiMai(goods);
-        }else{
+        } else {
             return new CommonResult().failed("出价低于上次价格");
         }
     }
@@ -138,22 +143,22 @@ public class SingePmsController extends ApiBaseAction {
     public Object queryProductDetail(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
         GoodsDetailResult goods = null;
         try {
-            goods = JsonUtils.jsonToPojo(redisService.get(String.format(Rediskey.GOODSDETAIL, id+"")), GoodsDetailResult.class);
-            if (ValidatorUtils.empty(goods) || ValidatorUtils.empty(goods.getGoods())){
-                log.info("redis缓存失效："+id);
+            goods = JsonUtils.jsonToPojo(redisService.get(apiContext.getCurrentProviderId() + ":" + String.format(Rediskey.GOODSDETAIL, id + "")), GoodsDetailResult.class);
+            if (ValidatorUtils.empty(goods) || ValidatorUtils.empty(goods.getGoods())) {
+                log.info("redis缓存失效：" + id);
                 goods = pmsProductService.getGoodsRedisById(id);
             }
         } catch (Exception e) {
-            log.info("redis缓存失效："+id);
+            log.info("redis缓存失效：" + id);
             goods = pmsProductService.getGoodsRedisById(id);
         }
         Map<String, Object> map = new HashMap<>();
         UmsMember umsMember = memberService.getNewCurrentMember();
         if (umsMember != null && umsMember.getId() != null) {
-          isCollectGoods(map,goods,umsMember);
+            isCollectGoods(map, goods, umsMember);
         }
         //记录浏览量到redis,然后定时更新到数据库
-       recordGoodsFoot(id);
+        recordGoodsFoot(id);
 
         map.put("goods", goods);
         return new CommonResult().success(map);
@@ -170,9 +175,9 @@ public class SingePmsController extends ApiBaseAction {
         product.setVerifyStatus(1);
         product.setMemberId(null);
         IPage<PmsProduct> list;
-        if (ValidatorUtils.notEmpty(product.getKeyword())){
-            list = pmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<>(product).like("name",product.getKeyword()).select(ConstansValue.sampleGoodsList));
-        }else{
+        if (ValidatorUtils.notEmpty(product.getKeyword())) {
+            list = pmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<>(product).like("name", product.getKeyword()).select(ConstansValue.sampleGoodsList));
+        } else {
             list = pmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<>(product).select(ConstansValue.sampleGoodsList));
         }
         return new CommonResult().success(list);
@@ -197,21 +202,21 @@ public class SingePmsController extends ApiBaseAction {
         UmsMember member = memberService.getNewCurrentMember();
         if (member.getMemberLevelId() > 0) {
             UmsMemberLevel memberLevel = memberLevelService.getById(member.getMemberLevelId());
-            Integer countGoodsByToday  = pmsProductService.countGoodsByToday(member.getId());
-            if (ValidatorUtils.empty(countGoodsByToday)){
-                countGoodsByToday=0;
+            Integer countGoodsByToday = pmsProductService.countGoodsByToday(member.getId());
+            if (ValidatorUtils.empty(countGoodsByToday)) {
+                countGoodsByToday = 0;
             }
             if (countGoodsByToday > memberLevel.getGoodscount()) {
                 commonResult = new CommonResult().failed("你今天已经有发" + countGoodsByToday + "个商品");
                 return commonResult;
             }
-        }else {
+        } else {
             return new CommonResult().success("没有设置会员等级");
         }
-        if (productParam.getQsType()==1){
+        if (productParam.getQsType() == 1) {
             productParam.setSchoolName(member.getSchoolName());
             productParam.setSchoolId(member.getSchoolId());
-        }else {
+        } else {
             productParam.setAreaName(member.getAreaName());
             productParam.setAreaId(member.getAreaId());
         }
@@ -247,11 +252,11 @@ public class SingePmsController extends ApiBaseAction {
     public Object addGoodsConsult(PmsProductConsult subject, BindingResult result) {
         CommonResult commonResult;
         UmsMember member = memberService.getNewCurrentMember();
-        if (member!=null){
+        if (member != null) {
             subject.setPic(member.getIcon());
             subject.setMemberName(member.getNickname());
             subject.setMemberId(member.getId());
-        }else {
+        } else {
             return new CommonResult().failed("请先登录");
         }
         subject.setConsultAddtime(new Date());
@@ -270,11 +275,11 @@ public class SingePmsController extends ApiBaseAction {
     @ResponseBody
     public Object list(@RequestParam(value = "goodsId", required = false, defaultValue = "0") Long goodsId,
                        @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
-                       @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+                       @RequestParam(value = "pageSize", required = false, defaultValue = "5") Integer pageSize) {
 
         PmsProductConsult productConsult = new PmsProductConsult();
         productConsult.setGoodsId(goodsId);
-        List<PmsProductConsult> list =  pmsProductConsultService.list(new QueryWrapper<>(productConsult));
+        List<PmsProductConsult> list = pmsProductConsultService.list(new QueryWrapper<>(productConsult));
 
         int goods = 0;
         int general = 0;
@@ -282,13 +287,13 @@ public class SingePmsController extends ApiBaseAction {
         ConsultTypeCount count = new ConsultTypeCount();
         for (PmsProductConsult consult : list) {
             if (consult.getStars() != null) {
-                if (consult.getStars()==1){
+                if (consult.getStars() == 1) {
                     bad++;
                 }
-                if (consult.getStars()==2){
+                if (consult.getStars() == 2) {
                     general++;
                 }
-                if (consult.getStars()==3){
+                if (consult.getStars() == 3) {
                     goods++;
                 }
             }
@@ -297,9 +302,9 @@ public class SingePmsController extends ApiBaseAction {
         count.setBad(bad);
         count.setGeneral(general);
         count.setGoods(goods);
-        if (count.getAll()>0){
+        if (count.getAll() > 0) {
             count.setPersent(new BigDecimal(goods).divide(new BigDecimal(count.getAll())).multiply(new BigDecimal(100)));
-        }else {
+        } else {
             count.setPersent(new BigDecimal(200));
         }
         Map<String, Object> objectMap = new HashMap<>();
@@ -307,24 +312,25 @@ public class SingePmsController extends ApiBaseAction {
         objectMap.put("count", count);
         return new CommonResult().success(objectMap);
     }
+
     @SysLog(MODULE = "pms", REMARK = "查询团购商品列表")
     @IgnoreAuth
-    @ApiOperation(value = "查询团购商品列表")
+    @ApiOperation(value = "查询带团购商品列表")
     @GetMapping(value = "/groupHotGoods/list")
     public Object groupHotGoods(PmsProduct product,
-                                 @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                                 @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
-        List<SmsGroup> groupList =  groupService.list(new QueryWrapper<>());
+                                @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                                @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
+        List<SmsGroup> groupList = groupService.list(new QueryWrapper<>());
         List<SmsGroup> result = new ArrayList<>();
-        for (SmsGroup group :groupList){
-            if (ValidatorUtils.empty(group.getHours())){
+        for (SmsGroup group : groupList) {
+            if (ValidatorUtils.empty(group.getHours())) {
                 continue;
             }
             Long nowT = System.currentTimeMillis();
             Date endTime = DateUtils.convertStringToDate(DateUtils.addHours(group.getEndTime(), group.getHours()), "yyyy-MM-dd HH:mm:ss");
             if (nowT > group.getStartTime().getTime() && nowT < endTime.getTime()) {
-                PmsProduct g =pmsProductService.getById(group.getGoodsId());
-                if(g!=null){
+                PmsProduct g = pmsProductService.getById(group.getGoodsId());
+                if (g != null) {
                     group.setGoods(g);
                     result.add(group);
                 }
@@ -339,19 +345,19 @@ public class SingePmsController extends ApiBaseAction {
     @ApiOperation(value = "查询团购商品列表")
     @GetMapping(value = "/groupGoods/list")
     public Object groupGoodsList(PmsProduct product,
-                            @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                            @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
-       List<SmsGroup> groupList =  groupService.list(new QueryWrapper<>());
-       if (groupList!=null && groupList.size()>0){
-           List<Long> ids = groupList.stream()
-                   .map(SmsGroup::getGoodsId)
-                   .collect(Collectors.toList());
-           product.setPublishStatus(1);
-           product.setVerifyStatus(1);
-           product.setMemberId(null);
-           IPage<PmsProduct> list  = pmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<>(product).in("id",ids));
-           return new CommonResult().success(list);
-       }
+                                 @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                                 @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
+        List<SmsGroup> groupList = groupService.list(new QueryWrapper<>());
+        if (groupList != null && groupList.size() > 0) {
+            List<Long> ids = groupList.stream()
+                    .map(SmsGroup::getGoodsId)
+                    .collect(Collectors.toList());
+            product.setPublishStatus(1);
+            product.setVerifyStatus(1);
+            product.setMemberId(null);
+            IPage<PmsProduct> list = pmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<>(product).in("id", ids));
+            return new CommonResult().success(list);
+        }
         return null;
     }
 
@@ -364,13 +370,13 @@ public class SingePmsController extends ApiBaseAction {
 
         GoodsDetailResult goods = null;
         try {
-              goods = JsonUtils.jsonToPojo(redisService.get(String.format(Rediskey.GOODSDETAIL, id+"")), GoodsDetailResult.class);
-            if (ValidatorUtils.empty(goods)){
-                log.info("redis缓存失效："+id);
+            goods = JsonUtils.jsonToPojo(redisService.get(apiContext.getCurrentProviderId() + ":" + String.format(Rediskey.GOODSDETAIL, id + "")), GoodsDetailResult.class);
+            if (ValidatorUtils.empty(goods)) {
+                log.info("redis缓存失效：" + id);
                 goods = pmsProductService.getGoodsRedisById(id);
             }
         } catch (Exception e) {
-            log.info("redis缓存失效："+id);
+            log.info("redis缓存失效：" + id);
             goods = pmsProductService.getGoodsRedisById(id);
             e.printStackTrace();
         }
@@ -385,14 +391,19 @@ public class SingePmsController extends ApiBaseAction {
             query.setMemberId(umsMember.getId());
             query.setType(1);
             PmsFavorite findCollection = favoriteService.getOne(new QueryWrapper<>(query));
-            if(findCollection!=null){
+            if (findCollection != null) {
                 map.put("favorite", true);
-            }else{
+            } else {
                 map.put("favorite", false);
             }
         }
-        if (group!=null){
-            map.put("memberGroupList",groupMemberMapper.selectList(new QueryWrapper<SmsGroupMember>().eq("group_id",group.getId())));
+        if (group != null) {
+            List<SmsGroupRecord> groupRecords = groupRecordMapper.selectList(new QueryWrapper<SmsGroupRecord>().eq("group_id", group.getId()));
+            for (SmsGroupRecord groupRecord : groupRecords) {
+                List<SmsGroupMember> groupMembers = groupMemberMapper.selectList(new QueryWrapper<SmsGroupMember>().eq("group_record_id", groupRecord.getId()).eq("status",2));
+                groupRecord.setList(groupMembers);
+            }
+            map.put("memberGroupList", groupRecords);
             map.put("group", group);
         }
 
@@ -407,11 +418,11 @@ public class SingePmsController extends ApiBaseAction {
     @ApiOperation(value = "查询礼物商品列表")
     @GetMapping(value = "/gift/list")
     public Object giftList(PmsGifts product,
-                                 @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                                 @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
+                           @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                           @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
 
-            IPage<PmsGifts> list  = giftsService.page(new Page<PmsGifts>(pageNum, pageSize), new QueryWrapper<>(product));
-            return new CommonResult().success(list);
+        IPage<PmsGifts> list = giftsService.page(new Page<PmsGifts>(pageNum, pageSize), new QueryWrapper<>(product));
+        return new CommonResult().success(list);
 
     }
 
@@ -426,13 +437,13 @@ public class SingePmsController extends ApiBaseAction {
 
         GoodsDetailResult goods = null;
         try {
-            goods = JsonUtils.jsonToPojo(redisService.get(String.format(Rediskey.GOODSDETAIL, relation.getProductId()+"")), GoodsDetailResult.class);
-            if (ValidatorUtils.empty(goods)){
-                log.info("redis缓存失效："+relation.getProductId());
+            goods = JsonUtils.jsonToPojo(redisService.get(String.format(Rediskey.GOODSDETAIL, relation.getProductId() + "")), GoodsDetailResult.class);
+            if (ValidatorUtils.empty(goods)) {
+                log.info("redis缓存失效：" + relation.getProductId());
                 goods = pmsProductService.getGoodsRedisById(relation.getProductId());
             }
         } catch (Exception e) {
-            log.info("redis缓存失效："+relation.getProductId());
+            log.info("redis缓存失效：" + relation.getProductId());
             goods = pmsProductService.getGoodsRedisById(relation.getProductId());
             e.printStackTrace();
         }
@@ -446,9 +457,9 @@ public class SingePmsController extends ApiBaseAction {
             query.setMemberId(umsMember.getId());
             query.setType(1);
             PmsFavorite findCollection = favoriteService.getOne(new QueryWrapper<>(query));
-            if(findCollection!=null){
+            if (findCollection != null) {
                 map.put("favorite", true);
-            }else{
+            } else {
                 map.put("favorite", false);
             }
         }
@@ -462,7 +473,7 @@ public class SingePmsController extends ApiBaseAction {
     @GetMapping(value = "/gift/detail")
     @ApiOperation(value = "查询礼物商品详情信息")
     public Object giftDetail(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
-        PmsGifts  goods = giftsService.getById(id);
+        PmsGifts goods = giftsService.getById(id);
         Map<String, Object> map = new HashMap<>();
         UmsMember umsMember = memberService.getNewCurrentMember();
         if (umsMember != null && umsMember.getId() != null) {
@@ -471,15 +482,16 @@ public class SingePmsController extends ApiBaseAction {
             query.setMemberId(umsMember.getId());
             query.setType(4);
             PmsFavorite findCollection = favoriteService.getOne(new QueryWrapper<>(query));
-            if(findCollection!=null){
+            if (findCollection != null) {
                 map.put("favorite", true);
-            }else{
+            } else {
                 map.put("favorite", false);
             }
         }
         map.put("goods", goods);
         return new CommonResult().success(map);
     }
+
     @SysLog(MODULE = "pms", REMARK = "查询商品类型下的商品列表")
     @IgnoreAuth
     @ApiOperation(value = "查询积分商品类型")
@@ -513,7 +525,7 @@ public class SingePmsController extends ApiBaseAction {
             @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
             @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
 
-        return new CommonResult().success(pmsProductService.getRecommendBrandList(1,1));
+        return new CommonResult().success(pmsProductService.getRecommendBrandList(1, 1));
     }
 
     @SysLog(MODULE = "pms", REMARK = "查询首页新品")
@@ -524,7 +536,7 @@ public class SingePmsController extends ApiBaseAction {
             @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
             @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
 
-        return new CommonResult().success(pmsProductService.getHotProductList(1,1));
+        return new CommonResult().success(pmsProductService.getHotProductList(1, 1));
     }
 
     @SysLog(MODULE = "pms", REMARK = "查询首页热销商品")
@@ -535,14 +547,14 @@ public class SingePmsController extends ApiBaseAction {
             @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
             @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
 
-        return new CommonResult().success(pmsProductService.getHotProductList(1,1));
+        return new CommonResult().success(pmsProductService.getHotProductList(1, 1));
     }
 
     @SysLog(MODULE = "pms", REMARK = "查询商品列表")
     @IgnoreAuth
     @ApiOperation(value = "查询商品优惠")
     @GetMapping(value = "/getPromotionProductList")
-    public List<PromotionProduct> getPromotionProductList(@Param("ids") List<Long> ids){
+    public List<PromotionProduct> getPromotionProductList(@Param("ids") List<Long> ids) {
         return productMapper.getPromotionProductList(ids);
     }
 
@@ -553,17 +565,17 @@ public class SingePmsController extends ApiBaseAction {
     public Object typeGoodsList(PmsProductCategory productCategory) throws Exception {
         List<ProductTypeVo> relList = new ArrayList<>();
         String json = redisService.get(Rediskey.specialcategoryAndGoodsList);
-        if (ValidatorUtils.notEmpty(json)){
-            relList = JsonUtils.json2list(json,ProductTypeVo.class);
-            return   new CommonResult().success(relList);
+        if (ValidatorUtils.notEmpty(json)) {
+            relList = JsonUtils.json2list(json, ProductTypeVo.class);
+            return new CommonResult().success(relList);
         }
         PmsProduct productQueryParam = new PmsProduct();
 
         productQueryParam.setPublishStatus(1);
         productQueryParam.setVerifyStatus(1);
-        List<PmsProduct>  list = pmsProductService.page(new Page<PmsProduct>(1, 100), new QueryWrapper<>(productQueryParam)).getRecords();
+        List<PmsProduct> list = pmsProductService.page(new Page<PmsProduct>(1, 100), new QueryWrapper<>(productQueryParam)).getRecords();
 
-        for (PmsProduct l : list){
+        for (PmsProduct l : list) {
             ProductTypeVo vo = new ProductTypeVo();
             vo.setGoodsId(l.getId());
             vo.setId(l.getId());
@@ -574,13 +586,13 @@ public class SingePmsController extends ApiBaseAction {
             relList.add(vo);
         }
         List<PmsProductCategory> categories = categoryMapper.selectList(new QueryWrapper<>());
-        for (PmsProductCategory v : categories){
-            if (v.getParentId()==0){
+        for (PmsProductCategory v : categories) {
+            if (v.getParentId() == 0) {
                 ProductTypeVo vo = new ProductTypeVo();
                 vo.setName(v.getName());
                 vo.setId(v.getId());
                 relList.add(vo);
-            }else{
+            } else {
                 ProductTypeVo vo = new ProductTypeVo();
                 vo.setName(v.getName());
                 vo.setId(v.getId());
@@ -588,11 +600,49 @@ public class SingePmsController extends ApiBaseAction {
                 relList.add(vo);
             }
         }
-        redisService.set(Rediskey.specialcategoryAndGoodsList,JsonUtils.objectToJson(relList));
-        redisService.expire(Rediskey.specialcategoryAndGoodsList,3600*5);
+        redisService.set(Rediskey.specialcategoryAndGoodsList + apiContext.getCurrentProviderId(), JsonUtils.objectToJson(relList));
+        redisService.expire(Rediskey.specialcategoryAndGoodsList + apiContext.getCurrentProviderId(), 2);
         return new CommonResult().success(relList);
     }
 
+
+    @SysLog(MODULE = "pms", REMARK = "查询商品分类")
+    @IgnoreAuth
+    @ApiOperation(value = "查询商品分类")
+    @GetMapping(value = "/getGoodsTypes")
+    public Object getGoodsTypes() throws Exception {
+        List<PmsProductCategory> relList = new ArrayList<>();
+        String json = redisService.get(Rediskey.goodsCategorys);
+        if (ValidatorUtils.notEmpty(json)) {
+            relList = JsonUtils.json2list(json, PmsProductCategory.class);
+            return new CommonResult().success(relList);
+        }
+        PmsProductCategory pmsProductCategory = new PmsProductCategory();
+        pmsProductCategory.setShowStatus(1);
+        pmsProductCategory.setNavStatus(1);
+        List<PmsProductCategory> categories = categoryMapper.selectList(new QueryWrapper<>(pmsProductCategory));
+        for (PmsProductCategory v : categories) {
+            if (v.getParentId() == 0) {
+                relList.add(v);
+            }
+        }
+        List<PmsProductCategory> list=null;
+        //组装二级分类
+        for (int i=0;i<relList.size();i++){
+            list=new ArrayList<>();
+            for (PmsProductCategory v : categories) {
+                if (v.getParentId().longValue() == relList.get(i).getId().longValue()) {
+                    list.add(v);
+                }
+            }
+            relList.get(i).setChildList(list);
+        }
+        redisService.set(Rediskey.goodsCategorys + apiContext.getCurrentProviderId(), JsonUtils.objectToJson(relList));
+        redisService.expire(Rediskey.goodsCategorys + apiContext.getCurrentProviderId(), 2);
+        return new CommonResult().success(relList);
+    }
+
+
     @SysLog(MODULE = "pms", REMARK = "查询商品类型下的商品列表")
     @IgnoreAuth
     @ApiOperation(value = "查询商品类型下的商品列表")
@@ -600,13 +650,13 @@ public class SingePmsController extends ApiBaseAction {
     public Object typeList(PmsProductCategory productCategory) {
         List<ProductTypeVo> relList = new ArrayList<>();
         List<PmsProductCategory> categories = categoryMapper.selectList(new QueryWrapper<>());
-        for (PmsProductCategory v : categories){
-            if (v.getParentId()==0){
+        for (PmsProductCategory v : categories) {
+            if (v.getParentId() == 0) {
                 ProductTypeVo vo = new ProductTypeVo();
                 vo.setName(v.getName());
                 vo.setId(v.getId());
                 relList.add(vo);
-            }else{
+            } else {
                 ProductTypeVo vo = new ProductTypeVo();
                 vo.setName(v.getName());
                 vo.setId(v.getId());
@@ -617,11 +667,12 @@ public class SingePmsController extends ApiBaseAction {
 
         return new CommonResult().success(relList);
     }
+
     @IgnoreAuth
     @ApiOperation("添加商品浏览记录")
     @SysLog(MODULE = "pms", REMARK = "添加商品浏览记录")
     @PostMapping(value = "/addView")
-    public Object addView(@RequestParam  Long goodsId) {
+    public Object addView(@RequestParam Long goodsId) {
 
         String key = String.format(Rediskey.GOODSHISTORY, memberService.getNewCurrentMember().getUsername());
 
@@ -629,62 +680,72 @@ public class SingePmsController extends ApiBaseAction {
 
         redisUtil.lRemove(key, 1, goodsId.toString());
         //将value push 到该key下的list中
-        redisUtil.lLeftPush(key,goodsId.toString());
+        redisUtil.lLeftPush(key, goodsId.toString());
         //使用ltrim将60个数据之后的数据剪切掉
-        redisUtil.lTrim(key,0,59);
+        redisUtil.lTrim(key, 0, 59);
         //设置缓存时间为一个月
-        redisUtil.expire(key,60*60*24*30, TimeUnit.SECONDS);
+        redisUtil.expire(key, 60 * 60 * 24 * 30, TimeUnit.SECONDS);
         return new CommonResult().success();
     }
+
     @SysLog(MODULE = "pms", REMARK = "查询用户浏览记录列表")
     @IgnoreAuth
     @ApiOperation(value = "查询用户浏览记录列表")
     @GetMapping(value = "/viewList")
     public Object viewList(
-                                       @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                                       @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
+            @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+            @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
+        //拼装返回
+        Map<String, Object> map = new HashMap<>();
+        if (memberService.getNewCurrentMember()==null){
+            return new CommonResult().success(map);
+        }
         String key = String.format(Rediskey.GOODSHISTORY, memberService.getNewCurrentMember().getId());
 
         //获取用户的浏览的商品的总页数;
         long pageCount = redisUtil.lLen(key);
-        //拼装返回
-        Map<String,Object> map = new HashMap<>();
+
         //根据用户的ID分頁获取该用户最近浏览的50个商品信息
-        List<String> result = redisUtil.lRange(key,(pageNum-1)*pageSize,pageNum*pageSize-1);
-        if (result!=null && result.size()>0){
+        List<String> result = redisUtil.lRange(key, (pageNum - 1) * pageSize, pageNum * pageSize - 1);
+        if (result != null && result.size() > 0) {
             List<PmsProduct> list = (List<PmsProduct>) pmsProductService.listByIds(result);
 
-            map.put("result",list);
-            map.put("pageCount",(pageCount%pageSize == 0 ? pageCount/pageSize : pageCount/pageSize+1));
+            map.put("result", list);
+            map.put("pageCount", (pageCount % pageSize == 0 ? pageCount / pageSize : pageCount / pageSize + 1));
         }
 
         return new CommonResult().success(map);
     }
 
-
-
+    @ApiOperation("生成商品海报")
+    @GetMapping(value = "/getposter")
+    public Object getposter(@RequestParam Long id) {
+        PmsProduct product = pmsProductService.getById(id);
+        return new CommonResult().success(product.getPic());
+    }
     private Integer recordGoodsFoot(Long id) {
         //记录浏览量到redis,然后定时更新到数据库
-        String key=Rediskey.GOODS_VIEWCOUNT_CODE+id;
+        String key = Rediskey.GOODS_VIEWCOUNT_CODE + id;
         //找到redis中该篇文章的点赞数，如果不存在则向redis中添加一条
-        Map<Object,Object> viewCountItem=redisUtil.hGetAll(Rediskey.GOODS_VIEWCOUNT_KEY);
-        Integer viewCount=0;
-        if(!viewCountItem.isEmpty()){
-            if(viewCountItem.containsKey(key)){
-                viewCount=Integer.parseInt(viewCountItem.get(key).toString())+1;
-                redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY,key,viewCount+"");
-            }else {
-                redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY,key,1+"");
+        Map<Object, Object> viewCountItem = redisUtil.hGetAll(Rediskey.GOODS_VIEWCOUNT_KEY);
+        Integer viewCount = 0;
+        if (!viewCountItem.isEmpty()) {
+            if (viewCountItem.containsKey(key)) {
+                viewCount = Integer.parseInt(viewCountItem.get(key).toString()) + 1;
+                redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY, key, viewCount + "");
+            } else {
+                redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY, key, 1 + "");
             }
-        }else{
-            viewCount=1;
-            redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY,key,1+"");
+        } else {
+            viewCount = 1;
+            redisUtil.hPut(Rediskey.GOODS_VIEWCOUNT_KEY, key, 1 + "");
         }
         return viewCount;
     }
 
     /**
      * 判断是否收藏商品
+     *
      * @param map
      * @param goods
      * @param umsMember
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeUmsController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeUmsController.java
index 36b6b06656ba7018bf1d857631b293c98370689d..ef4a10b1279fddffbbb8ba4fde61926b31610b4a 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeUmsController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingeUmsController.java
@@ -82,6 +82,7 @@ public class SingeUmsController extends ApiBaseAction {
     private IPmsFavoriteService favoriteService;
     @Resource
     private PmsProductAttributeCategoryMapper productAttributeCategoryMapper;
+
     @ApiOperation("获取会员详情")
     @RequestMapping(value = "/detail", method = RequestMethod.GET)
     @ResponseBody
@@ -89,50 +90,52 @@ public class SingeUmsController extends ApiBaseAction {
         UmsMember member = memberService.getById(id);
         return new CommonResult().success(member);
     }
+
     @IgnoreAuth
     @ApiOperation(value = "查询商铺列表")
     @GetMapping(value = "/store/list")
     @SysLog(MODULE = "ums", REMARK = "查询学校列表")
     public Object storeList(SysStore entity,
-                              @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                              @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
-        return new CommonResult().success(storeMapper.selectList( new QueryWrapper<SysStore>(entity)));
+                            @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                            @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
+        return new CommonResult().success(storeMapper.selectList(new QueryWrapper<SysStore>(entity)));
     }
+
     @ApiOperation("获取商铺详情")
     @RequestMapping(value = "/storeDetail", method = RequestMethod.GET)
     @ResponseBody
     public Object storeDetail(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
         SysStore store = storeMapper.selectById(id);
-        List<PmsProductAttributeCategory> list = productAttributeCategoryMapper.selectList(new QueryWrapper<PmsProductAttributeCategory>().eq("store_id",id));
+        List<PmsProductAttributeCategory> list = productAttributeCategoryMapper.selectList(new QueryWrapper<PmsProductAttributeCategory>().eq("store_id", id));
         for (PmsProductAttributeCategory gt : list) {
             PmsProduct productQueryParam = new PmsProduct();
             productQueryParam.setProductAttributeCategoryId(gt.getId());
             productQueryParam.setPublishStatus(1);
             productQueryParam.setVerifyStatus(1);
-            IPage<PmsProduct> goodsList = pmsProductService.page(new Page<PmsProduct>(0, 8),new QueryWrapper<>(productQueryParam).select(ConstansValue.sampleGoodsList));
-            if (goodsList!=null&& goodsList.getRecords()!=null && goodsList.getRecords().size()>0){
+            IPage<PmsProduct> goodsList = pmsProductService.page(new Page<PmsProduct>(0, 8), new QueryWrapper<>(productQueryParam).select(ConstansValue.sampleGoodsList));
+            if (goodsList != null && goodsList.getRecords() != null && goodsList.getRecords().size() > 0) {
                 gt.setGoodsList(goodsList.getRecords());
-            }else{
+            } else {
                 gt.setGoodsList(new ArrayList<>());
             }
         }
         store.setList(list);
-        store.setGoodsCount(pmsProductService.count(new QueryWrapper<PmsProduct>().eq("store_id",id)));
+        store.setGoodsCount(pmsProductService.count(new QueryWrapper<PmsProduct>().eq("store_id", id)));
         //记录浏览量到redis,然后定时更新到数据库
-        String key= Rediskey.STORE_VIEWCOUNT_CODE+id;
+        String key = Rediskey.STORE_VIEWCOUNT_CODE + id;
         //找到redis中该篇文章的点赞数，如果不存在则向redis中添加一条
-        Map<Object,Object> viewCountItem=redisUtil.hGetAll(Rediskey.STORE_VIEWCOUNT_KEY);
-        Integer viewCount=0;
-        if(!viewCountItem.isEmpty()){
-            if(viewCountItem.containsKey(key)){
-                viewCount=Integer.parseInt(viewCountItem.get(key).toString())+1;
-                redisUtil.hPut(Rediskey.STORE_VIEWCOUNT_KEY,key,viewCount+"");
-            }else {
-                viewCount=1;
-                redisUtil.hPut(Rediskey.STORE_VIEWCOUNT_KEY,key,1+"");
+        Map<Object, Object> viewCountItem = redisUtil.hGetAll(Rediskey.STORE_VIEWCOUNT_KEY);
+        Integer viewCount = 0;
+        if (!viewCountItem.isEmpty()) {
+            if (viewCountItem.containsKey(key)) {
+                viewCount = Integer.parseInt(viewCountItem.get(key).toString()) + 1;
+                redisUtil.hPut(Rediskey.STORE_VIEWCOUNT_KEY, key, viewCount + "");
+            } else {
+                viewCount = 1;
+                redisUtil.hPut(Rediskey.STORE_VIEWCOUNT_KEY, key, 1 + "");
             }
-        }else{
-            redisUtil.hPut(Rediskey.STORE_VIEWCOUNT_KEY,key,1+"");
+        } else {
+            redisUtil.hPut(Rediskey.STORE_VIEWCOUNT_KEY, key, 1 + "");
         }
         Map<String, Object> map = new HashMap<>();
         UmsMember umsMember = memberService.getNewCurrentMember();
@@ -143,9 +146,9 @@ public class SingeUmsController extends ApiBaseAction {
             query.setMemberId(umsMember.getId());
             query.setType(3);
             PmsFavorite findCollection = favoriteService.getOne(new QueryWrapper<>(query));
-            if(findCollection!=null){
+            if (findCollection != null) {
                 map.put("favorite", true);
-            }else{
+            } else {
                 map.put("favorite", false);
             }
         }
@@ -153,25 +156,28 @@ public class SingeUmsController extends ApiBaseAction {
         map.put("store", store);
         return new CommonResult().success(map);
     }
+
     @IgnoreAuth
     @ApiOperation(value = "查询学校列表")
     @GetMapping(value = "/school/list")
     @SysLog(MODULE = "ums", REMARK = "查询学校列表")
     public Object schoolList(SysSchool entity,
-                              @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                              @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
+                             @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                             @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum) {
         return new CommonResult().success(schoolService.page(new Page<SysSchool>(pageNum, pageSize), new QueryWrapper<>(entity)));
     }
+
     @ApiOperation("获取学校详情")
     @RequestMapping(value = "/schoolDetail", method = RequestMethod.GET)
     @ResponseBody
     public Object schoolDetail(@RequestParam(value = "id", required = false, defaultValue = "0") Long id) {
         SysSchool school = schoolService.getById(id);
-       List<PmsProduct> list = productMapper.selectList(new QueryWrapper<PmsProduct>().eq("school_id",id).select(ConstansValue.sampleGoodsList));
-       school.setGoodsList(list);
-       school.setGoodsCount(list.size());
-       return new CommonResult().success(school);
+        List<PmsProduct> list = productMapper.selectList(new QueryWrapper<PmsProduct>().eq("school_id", id).select(ConstansValue.sampleGoodsList));
+        school.setGoodsList(list);
+        school.setGoodsCount(list.size());
+        return new CommonResult().success(school);
     }
+
     @IgnoreAuth
     @SysLog(MODULE = "ums", REMARK = "根据pid查询区域")
     @ApiOperation("根据pid查询区域")
@@ -190,6 +196,7 @@ public class SingeUmsController extends ApiBaseAction {
     public Object addJob(UmsEmployInfo member) {
         return employInfoMapper.insert(member);
     }
+
     @ApiOperation(value = "会员绑定学校")
     @PostMapping(value = "/bindSchool")
     @SysLog(MODULE = "ums", REMARK = "会员绑定学校")
@@ -206,7 +213,7 @@ public class SingeUmsController extends ApiBaseAction {
                 }
             }
             SysSchool area = schoolService.getById(schoolId);
-            if (area==null){
+            if (area == null) {
                 return new CommonResult().failed("学校不存在");
             }
             member.setSchoolName(area.getName());
@@ -214,7 +221,7 @@ public class SingeUmsController extends ApiBaseAction {
             memberService.updateById(member);
             // 当天发送验证码次数+1
             redisService.increment(countKey, 1L);
-            redisService.expire(countKey, 1 * 3600 * 24*365);
+            redisService.expire(countKey, 1 * 3600 * 24 * 365);
             return new CommonResult().success("绑定学校成功");
         } catch (Exception e) {
             e.printStackTrace();
@@ -237,16 +244,16 @@ public class SingeUmsController extends ApiBaseAction {
                 }
             }
 
-           SysArea area = areaService.getById(areaId);
-           if (area==null){
-               return new CommonResult().failed("区域不存在");
-           }
+            SysArea area = areaService.getById(areaId);
+            if (area == null) {
+                return new CommonResult().failed("区域不存在");
+            }
             member.setAreaId(areaId);
             member.setAreaName(area.getName());
             memberService.updateById(member);
             // 当天发送验证码次数+1
             redisService.increment(countKey, 1L);
-            redisService.expire(countKey, 1 * 3600 * 24*365);
+            redisService.expire(countKey, 1 * 3600 * 24 * 365);
             return new CommonResult().success(area);
         } catch (Exception e) {
             e.printStackTrace();
@@ -263,11 +270,11 @@ public class SingeUmsController extends ApiBaseAction {
             entity.setTryTime(new Date());
             entity.setCreateTime(new Date());
             UmsMember umsMember = memberService.getNewCurrentMember();
-            if (storeMapper.insert(entity)>0) {
+            if (storeMapper.insert(entity) > 0) {
                 SysUser user = new SysUser();
                 user.setUsername(umsMember.getUsername());
                 SysUser umsAdminList = userMapper.selectByUserName(entity.getName());
-                if (umsAdminList!=null && umsAdminList.getId()!=null) {
+                if (umsAdminList != null && umsAdminList.getId() != null) {
                     return new CommonResult().failed("保存失败");
                 }
                 user.setStatus(1);
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingelHomeController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingelHomeController.java
index 91aa1b3a049dd9cccd2337bac1aa2c3af6280fc2..750c9db14d466db4bac49ec1270ff701bce5a99f 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingelHomeController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingelHomeController.java
@@ -24,7 +24,6 @@ import com.zscat.mallplus.util.OssAliyunUtil;
 import com.zscat.mallplus.utils.CommonResult;
 import com.zscat.mallplus.utils.PhoneUtil;
 import com.zscat.mallplus.utils.ValidatorUtils;
-
 import com.zscat.mallplus.vo.Rediskey;
 import com.zscat.mallplus.vo.SmsCode;
 import com.zscat.mallplus.vo.UmsMemberInfoDetail;
@@ -58,11 +57,12 @@ import java.util.Map;
 @RequestMapping("/api/single/home")
 public class SingelHomeController {
 
+    @Autowired
+    OssAliyunUtil aliyunOSSUtil;
     @Value("${jwt.tokenHeader}")
     private String tokenHeader;
     @Value("${jwt.tokenHead}")
     private String tokenHead;
-
     @Resource
     private IPmsProductService pmsProductService;
     @Autowired
@@ -77,7 +77,7 @@ public class SingelHomeController {
     private IOmsOrderService orderService;
     @Resource
     private ISmsCouponService couponService;
-
+    @Resource
     private SmsCouponHistoryMapper couponHistoryMapper;
 
     @IgnoreAuth
@@ -86,36 +86,36 @@ public class SingelHomeController {
     @RequestMapping(value = "/userInfo", method = RequestMethod.GET)
     public Object userInfo() {
         UmsMemberInfoDetail detail = new UmsMemberInfoDetail();
-       UmsMember umsMember = memberService.getNewCurrentMember();
-       if (umsMember!=null && umsMember.getId()!=null){
-           umsMember = memberService.getById(umsMember.getId());
-           List<SmsCouponHistory> histories = couponHistoryMapper.selectList(new QueryWrapper<SmsCouponHistory>().eq("member_id",umsMember.getId()));
-           detail.setHistories(histories);
-           detail.setMember(umsMember);
-           return new CommonResult().success(detail);
-       }
+        UmsMember umsMember = memberService.getNewCurrentMember();
+        if (umsMember != null && umsMember.getId() != null) {
+            List<SmsCouponHistory> histories = couponHistoryMapper.selectList(new QueryWrapper<SmsCouponHistory>().eq("member_id", umsMember.getId()));
+            detail.setHistories(histories);
+            detail.setMember(umsMember);
+            return new CommonResult().success(detail);
+        }
         return new CommonResult().failed();
     }
+
     @IgnoreAuth
     @ApiOperation("首页内容页信息展示")
     @SysLog(MODULE = "home", REMARK = "首页内容页信息展示")
     @RequestMapping(value = "/home_mobile", method = RequestMethod.GET)
     public Object home_mobile() {
-        String key = Rediskey.HOMEPAGEMOBILE ;
+        String key = Rediskey.HOMEPAGEMOBILE;
         String json = redisService.get(key);
         HomeContentResult contentResult = null;
         try {
-            if (ValidatorUtils.empty(json)){
+            if (ValidatorUtils.empty(json)) {
                 contentResult = advertiseService.singelmobileContent();
-                redisService.set(key,JsonUtils.objectToJson(contentResult));
-                redisService.expire(key,3600*5);
-            }else{
+                redisService.set(key, JsonUtils.objectToJson(contentResult));
+                redisService.expire(key, 60);
+            } else {
                 contentResult = JsonUtils.jsonToPojo(redisService.get(key), HomeContentResult.class);
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             contentResult = advertiseService.singelmobileContent();
-            redisService.set(key,JsonUtils.objectToJson(contentResult));
-            redisService.expire(key,3600*5);
+            redisService.set(key, JsonUtils.objectToJson(contentResult));
+            redisService.expire(key, 60);
         }
         return new CommonResult().success(contentResult);
     }
@@ -125,21 +125,21 @@ public class SingelHomeController {
     @SysLog(MODULE = "home", REMARK = "首页内容页信息展示")
     @RequestMapping(value = "/content", method = RequestMethod.GET)
     public Object content() {
-        String key = Rediskey.HOMEPAGEmallplus1 ;
+        String key = Rediskey.HOMEPAGEmallplus1;
         String json = redisService.get(key);
         HomeContentResult contentResult = null;
         try {
-            if (ValidatorUtils.empty(json)){
+            if (ValidatorUtils.empty(json)) {
                 contentResult = advertiseService.singelContent();
-                redisService.set(key,JsonUtils.objectToJson(contentResult));
-                redisService.expire(key,3600*5);
-            }else{
+                redisService.set(key, JsonUtils.objectToJson(contentResult));
+                redisService.expire(key, 60);
+            } else {
                 contentResult = JsonUtils.jsonToPojo(redisService.get(key), HomeContentResult.class);
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             contentResult = advertiseService.singelContent();
-            redisService.set(key,JsonUtils.objectToJson(contentResult));
-            redisService.expire(key,3600*5);
+            redisService.set(key, JsonUtils.objectToJson(contentResult));
+            redisService.expire(key, 60);
         }
         return new CommonResult().success(contentResult);
     }
@@ -149,21 +149,21 @@ public class SingelHomeController {
     @SysLog(MODULE = "home", REMARK = "首页内容页信息展示")
     @RequestMapping(value = "/content1", method = RequestMethod.GET)
     public Object content1() {
-        String key = Rediskey.HOMEPAGEmallplus2 ;
+        String key = Rediskey.HOMEPAGEmallplus2;
         String json = redisService.get(key);
         HomeContentResult contentResult = null;
         try {
-            if (ValidatorUtils.empty(json)){
+            if (ValidatorUtils.empty(json)) {
                 contentResult = advertiseService.singelContent1();
-                redisService.set(key,JsonUtils.objectToJson(contentResult));
-                redisService.expire(key,3600*5);
-            }else{
+                redisService.set(key, JsonUtils.objectToJson(contentResult));
+                redisService.expire(key, 60);
+            } else {
                 contentResult = JsonUtils.jsonToPojo(redisService.get(key), HomeContentResult.class);
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             contentResult = advertiseService.singelContent1();
-            redisService.set(key,JsonUtils.objectToJson(contentResult));
-            redisService.expire(key,3600*5);
+            redisService.set(key, JsonUtils.objectToJson(contentResult));
+            redisService.expire(key, 60);
         }
         return new CommonResult().success(contentResult);
     }
@@ -243,25 +243,6 @@ public class SingelHomeController {
         return new CommonResult().success(advertiseService.getRecommendSubjectList(1, 1));
     }
 
-    @IgnoreAuth
-    @ApiOperation(value = "登录以后返回token")
-    @GetMapping(value = "/login")
-    public Object login(UmsMember umsMember) {
-        if (umsMember == null) {
-            return new CommonResult().validateFailed("用户名或密码错误");
-        }
-        try {
-            Map<String, Object> token = memberService.login(umsMember.getUsername(), umsMember.getPassword());
-            if (token.get("token") == null) {
-                return new CommonResult().validateFailed("用户名或密码错误");
-            }
-            return new CommonResult().success(token);
-        } catch (AuthenticationException e) {
-            return new CommonResult().validateFailed("用户名或密码错误");
-        }
-
-    }
-
     /* @IgnoreAuth
      @ApiOperation("获取验证码")
      @RequestMapping(value = "/getAuthCode", method = RequestMethod.GET)
@@ -285,8 +266,8 @@ public class SingelHomeController {
                            @RequestParam Integer sex,
                            @RequestParam String headimgurl,
                            @RequestParam String unionid,
-                           @RequestParam boolean status,
-                          @RequestParam String nickname,
+
+                           @RequestParam String nickname,
                            @RequestParam String city,
                            @RequestParam Integer source) {
 
@@ -295,7 +276,7 @@ public class SingelHomeController {
         }
         try {
 
-            Map<String, Object> token = memberService.appLogin(openid, sex,headimgurl,unionid,nickname,city,source);
+            Map<String, Object> token = memberService.appLogin(openid, sex, headimgurl, unionid, nickname, city, source);
             if (token.get("token") == null) {
                 return new CommonResult().validateFailed("用户名或密码错误");
             }
@@ -307,6 +288,7 @@ public class SingelHomeController {
         }
 
     }
+
     @IgnoreAuth
     @ApiOperation(value = "手机号 密码登录")
     @PostMapping(value = "/login")
@@ -322,12 +304,15 @@ public class SingelHomeController {
 
             Map<String, Object> token = memberService.login(phone, password);
             if (token.get("token") == null) {
+                log.info("用户名或密码错误");
                 return new CommonResult().validateFailed("用户名或密码错误");
             }
             return new CommonResult().success(token);
         } catch (AuthenticationException e) {
+            log.info("用户名或密码错误");
             return new CommonResult().validateFailed("用户名或密码错误");
         } catch (Exception e) {
+            log.info(e.getMessage());
             return new CommonResult().validateFailed(e.getMessage());
         }
 
@@ -380,7 +365,7 @@ public class SingelHomeController {
             return new CommonResult().validateFailed("手机验证码为空");
         }
 
-        return memberService.register(phone, password, confimpassword, authCode,invitecode);
+        return memberService.register(phone, password, confimpassword, authCode, invitecode);
     }
 
     @IgnoreAuth
@@ -388,7 +373,7 @@ public class SingelHomeController {
     @PostMapping(value = "/simpleReg")
     public Object simpleReg(@RequestParam String phone,
                             @RequestParam String password,
-                            @RequestParam String confimpassword,@RequestParam(required = false)  String invitecode) {
+                            @RequestParam String confimpassword, @RequestParam(required = false) String invitecode) {
         if (phone == null || "".equals(phone)) {
             return new CommonResult().validateFailed("用户名或密码错误");
         }
@@ -400,7 +385,7 @@ public class SingelHomeController {
         }
 
 
-        return memberService.simpleReg(phone, password, confimpassword,invitecode);
+        return memberService.simpleReg(phone, password, confimpassword, invitecode);
     }
 
     /**
@@ -426,9 +411,6 @@ public class SingelHomeController {
         }
     }
 
-    @Autowired
-    OssAliyunUtil aliyunOSSUtil;
-
     @IgnoreAuth
     @PostMapping("/upload")
     @ApiOperation("上传文件")
@@ -455,7 +437,7 @@ public class SingelHomeController {
     public Object test() throws Exception {
         try { // 防止文件建立或读取失败，用catch捕捉错误并打印，也可以throw
 
-                /* 读入TXT文件 */
+            /* 读入TXT文件 */
             String pathname = "E:\\test\\test.txt"; // 绝对路径或相对路径都可以，这里是绝对路径，写入文件时演示相对路径
             File filename = new File(pathname); // 要读取以上路径的input。txt文件
             InputStreamReader reader = new InputStreamReader(
@@ -496,7 +478,6 @@ public class SingelHomeController {
     }
 
 
-
     @SysLog(MODULE = "pms", REMARK = "查询商品列表")
     @IgnoreAuth
     @ApiOperation(value = "查询首页推荐商品")
@@ -506,6 +487,7 @@ public class SingelHomeController {
         return pmsProductService.initGoodsRedis();
 
     }
+
     @SysLog(MODULE = "pms", REMARK = "查询商品列表")
     @IgnoreAuth
     @ApiOperation(value = "查询首页推荐商品")
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/single/TestController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/single/TestController.java
index 48597625e24b8413085505a6af41cff18e782ae3..cb44efb8772fc26cbda4805ed46e8ff21333e66f 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/single/TestController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/single/TestController.java
@@ -46,6 +46,14 @@ import java.util.Random;
 @RequestMapping("/test")
 public class TestController extends ApiBaseAction {
 
+    @Resource
+    CmsSubjectMapper subjectMapper;
+    @Resource
+    SysSchoolMapper schoolMapper;
+    @Resource
+    SysAreaMapper sysAreaMapper;
+    @Resource
+    CmsSubjectCategoryMapper categoryMapper;
     @Resource
     private ISysSchoolService schoolService;
     @Resource
@@ -72,14 +80,6 @@ public class TestController extends ApiBaseAction {
     private IPmsFavoriteService favoriteService;
     @Resource
     private PmsProductAttributeCategoryMapper productAttributeCategoryMapper;
-    @Resource
-    CmsSubjectMapper subjectMapper;
-    @Resource
-    SysSchoolMapper schoolMapper;
-    @Resource
-    SysAreaMapper sysAreaMapper;
-    @Resource
-    CmsSubjectCategoryMapper categoryMapper;
 
     @ApiOperation("获取会员详情")
     @RequestMapping(value = "/test", method = RequestMethod.GET)
@@ -87,22 +87,23 @@ public class TestController extends ApiBaseAction {
     public Object test() {
         PmsProduct product = new PmsProduct();
         product.setStoreName("北京皮包专卖");
-        productMapper.update(product,new QueryWrapper<PmsProduct>().eq("store_id",1));
+        productMapper.update(product, new QueryWrapper<PmsProduct>().eq("store_id", 1));
 
         product = new PmsProduct();
         product.setStoreName("北京豪车专卖");
-        productMapper.update(product,new QueryWrapper<PmsProduct>().eq("store_id",2));
+        productMapper.update(product, new QueryWrapper<PmsProduct>().eq("store_id", 2));
 
         product = new PmsProduct();
         product.setStoreName("北京服装专卖");
-        productMapper.update(product,new QueryWrapper<PmsProduct>().eq("store_id",3));
+        productMapper.update(product, new QueryWrapper<PmsProduct>().eq("store_id", 3));
 
         product = new PmsProduct();
         product.setStoreName("北京手术专卖");
-        productMapper.update(product,new QueryWrapper<PmsProduct>().eq("store_id",4));
+        productMapper.update(product, new QueryWrapper<PmsProduct>().eq("store_id", 4));
 
         return new CommonResult().success();
     }
+
     @ApiOperation("获取会员详情")
     @RequestMapping(value = "/detail", method = RequestMethod.GET)
     @ResponseBody
@@ -110,43 +111,44 @@ public class TestController extends ApiBaseAction {
         List<SysArea> areas = sysAreaMapper.selectList(new QueryWrapper<>());
         List<SysSchool> schools = schoolMapper.selectList(new QueryWrapper<>());
         List<CmsSubject> list = subjectMapper.selectList(new QueryWrapper<>());
-        for (CmsSubject subject : list){
-            Random r = new Random();  Integer a = r.nextInt(100);
+        for (CmsSubject subject : list) {
+            Random r = new Random();
+            Integer a = r.nextInt(100);
             Integer c = r.nextInt(3);
             Integer d = r.nextInt(5);
             CmsSubjectCategory cate = categoryMapper.selectById(d);
 
-            if(cate!=null){
+            if (cate != null) {
                 subject.setCategoryName(cate.getName());
                 subject.setCategoryId(Long.valueOf(d));
             }
 
             subject.setType(c);
             Integer b = r.nextInt(100);
-           SysSchool school =  schools.get(a);
-           if (school!=null){
-               subject.setSchoolId(school.getId());
-               subject.setSchoolName(school.getName());
-           }else{
-               SysSchool school1 =   schools.get(b);
-               if (school1!=null){
-                   subject.setSchoolId(school1.getId());
-                   subject.setSchoolName(school1.getName());
-               }
-           }
+            SysSchool school = schools.get(a);
+            if (school != null) {
+                subject.setSchoolId(school.getId());
+                subject.setSchoolName(school.getName());
+            } else {
+                SysSchool school1 = schools.get(b);
+                if (school1 != null) {
+                    subject.setSchoolId(school1.getId());
+                    subject.setSchoolName(school1.getName());
+                }
+            }
 
-            SysArea area =  areas.get(b);
-            if (area!=null){
+            SysArea area = areas.get(b);
+            if (area != null) {
                 subject.setAreaId(area.getId());
                 subject.setAreaName(area.getName());
-            }else{
-                SysArea area1 =    areas.get(a);
-                if (area1!=null){
+            } else {
+                SysArea area1 = areas.get(a);
+                if (area1 != null) {
                     subject.setAreaId(area1.getId());
                     subject.setAreaName(area1.getName());
                 }
             }
-              subjectMapper.updateById(subject);
+            subjectMapper.updateById(subject);
         }
         return new CommonResult().success();
     }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/single/WechatController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/single/WechatController.java
new file mode 100644
index 0000000000000000000000000000000000000000..8d3e90d3f1cba1c4ce2774e3e064da0d1c99f94e
--- /dev/null
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/single/WechatController.java
@@ -0,0 +1,42 @@
+package com.zscat.mallplus.single;
+
+import com.zscat.mallplus.util.WeixinCheckoutUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @ClassName WechatController
+ * @Author hupeng <610796224@qq.com>
+ * @Date 2019/11/5
+ **/
+@Slf4j
+@RestController
+public class WechatController  {
+
+    /**
+     * 微信公众号签名认证接口
+     * @Title: test
+     * @Description: TODO
+     * @param: @param signature
+     * @param: @param timestamp
+     * @param: @param nonce
+     * @param: @param echostr
+     * @param: @return
+     * @return: String
+     * @throws
+     */
+    @RequestMapping("/wx")
+    public String test(String signature,String timestamp,String nonce,String echostr) {
+
+        // 通过检验signature对请求进行校验，若校验成功则原样返回echostr，表示接入成功，否则接入失败
+        if (signature != null && WeixinCheckoutUtil.checkSignature(signature, timestamp, nonce)) {
+            return echostr;
+        }
+
+        return null;
+    }
+
+
+
+}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsBasicGiftsService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsBasicGiftsService.java
index 3627d17bc1caf864ab03ce835c80584dd29074ac..36aa82fe4158ef644878112bcc98a3e8105f3e69 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsBasicGiftsService.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsBasicGiftsService.java
@@ -8,7 +8,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
@@ -20,6 +20,7 @@ public interface ISmsBasicGiftsService extends IService<SmsBasicGifts> {
 
     /**
      * 满足商品的所有赠品优惠
+     *
      * @param id
      * @return
      */
@@ -27,6 +28,7 @@ public interface ISmsBasicGiftsService extends IService<SmsBasicGifts> {
 
     /**
      * 满足订单的所有赠品优惠
+     *
      * @param vo
      * @return
      */
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsBasicMarkingService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsBasicMarkingService.java
index 77403466354cb7538d21327a1568f4a27192a2f1..6d85a90f708be86e3e876ad6424bb740d62fd28c 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsBasicMarkingService.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsBasicMarkingService.java
@@ -8,7 +8,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
@@ -20,6 +20,7 @@ public interface ISmsBasicMarkingService extends IService<SmsBasicMarking> {
 
     /**
      * 满足所有符合商品的优惠
+     *
      * @param id
      * @return
      */
@@ -27,6 +28,7 @@ public interface ISmsBasicMarkingService extends IService<SmsBasicMarking> {
 
     /**
      * 满足订单商品的满减和折扣 取优惠最大的那个
+     *
      * @param vo
      * @return
      */
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsGroupActivityService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsGroupActivityService.java
index 8ec964bde6d430599188f7f0654634eb64883a7c..defe57713ba055c7434f13bc05e3af8b27d30711 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsGroupActivityService.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsGroupActivityService.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.sms.entity.SmsGroupActivity;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsHomeAdvertiseService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsHomeAdvertiseService.java
index 7391b56c8111b4c8982ff7457f69a68a44d6b169..1eaef6268b7dbf5c1db94c62e94eed7eda56c385 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsHomeAdvertiseService.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsHomeAdvertiseService.java
@@ -26,6 +26,7 @@ import java.util.List;
 public interface ISmsHomeAdvertiseService extends IService<SmsHomeAdvertise> {
 
     HomeContentResult singelContent();
+
     HomeContentResult singelContent1();
 
     List<PmsBrand> getRecommendBrandList(int pageNum, int pageSize);
@@ -39,11 +40,15 @@ public interface ISmsHomeAdvertiseService extends IService<SmsHomeAdvertise> {
     List<PmsProduct> getHotProductList(int pageNum, int pageSize);
 
     List<CmsSubject> getRecommendSubjectList(int pageNum, int pageSize);
-    List<SmsHomeAdvertise> getHomeAdvertiseList(int type) ;
+
+    List<SmsHomeAdvertise> getHomeAdvertiseList(int type);
+
     List<SmsHomeAdvertise> getHomeAdvertiseList();
+
     List<PmsProductAttributeCategory> getPmsProductAttributeCategories();
 
     List<SysStore> getStoreList(int pageNum, int pageSize);
+
     List<HomeFlashPromotion> homeFlashPromotionList();
 
     List<PmsSmallNaviconCategory> getNav();
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsPaimaiLogService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsPaimaiLogService.java
index 7a61ec02ac69361ab4189fa81849bbf65fbce5ba..f26afda321ef7b8c557ce0e28942a43647caf09c 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsPaimaiLogService.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsPaimaiLogService.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.sms.entity.SmsPaimaiLog;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsBasicGiftsServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsBasicGiftsServiceImpl.java
index a7075433005b909fe15ccf06f57e719aa6251799..cc5d1f45ac7060302d829acf93e5a6c55da8bb01 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsBasicGiftsServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsBasicGiftsServiceImpl.java
@@ -124,7 +124,6 @@ public class SmsBasicGiftsServiceImpl extends ServiceImpl<SmsBasicGiftsMapper, S
     }
 
 
-
     @Override
     public List<SmsBasicGifts> matchOrderBasicGifts(CartMarkingVo vo) {
         List<SmsBasicGifts> list = giftsMapper.selectList(new QueryWrapper<SmsBasicGifts>().eq("status", 0));
@@ -135,7 +134,7 @@ public class SmsBasicGiftsServiceImpl extends ServiceImpl<SmsBasicGiftsMapper, S
                 newBasicGift.setName(m.getName());
                 newBasicGift.setId(m.getId());
                 // BeanUtils.copyProperties(m, newBasicGift);
-               if (m.getBigType() == 2) { // 1 首购礼 2 满 购礼 3 单品礼赠
+                if (m.getBigType() == 2) { // 1 首购礼 2 满 购礼 3 单品礼赠
                     BigDecimal totalAmount = new BigDecimal("0");//实付金额
                     int totalCount = 0;
                     for (OmsCartItem cart : vo.getCartList()) {
@@ -184,7 +183,7 @@ public class SmsBasicGiftsServiceImpl extends ServiceImpl<SmsBasicGiftsMapper, S
 
     private void getList(SmsBasicGifts m, SmsBasicGifts newBasicGift, BigDecimal totalAmount, int totalCount, List<BasicRuls> actrule) {
         if (m.getBigType() == 1) {
-            if ( m.getSmallType() == 2) {
+            if (m.getSmallType() == 2) {
                 for (BasicRuls rule : actrule) {
                     if (totalCount >= rule.getFullPrice().intValue()) {
                         newBasicGift.setGiftsList(JsonUtils.jsonToList(m.getGiftIds(), BeanKv.class));
@@ -274,6 +273,7 @@ public class SmsBasicGiftsServiceImpl extends ServiceImpl<SmsBasicGiftsMapper, S
         }
         return singleAmount;
     }
+
     private void getByRule(CartMarkingVo vo, SmsBasicGifts m, SmsBasicGifts newBasicGift, BigDecimal singleAmount, int singleCount, List<BasicRuls> actrule) {
         if (m.getBigType() == 1) {
             if (vo.getType() == 1 && m.getSmallType() == 1) {
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsBasicMarkingServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsBasicMarkingServiceImpl.java
index 2d71186efc43d7f2a8fa93e7113e2137b11c31e4..5bb4c101724a8667d3d2a4cf226ff6f22a2fea01 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsBasicMarkingServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsBasicMarkingServiceImpl.java
@@ -71,27 +71,27 @@ public class SmsBasicMarkingServiceImpl extends ServiceImpl<SmsBasicMarkingMappe
     public List<SmsBasicMarking> matchGoodsBasicMarking(Long id) {
         List<SmsBasicMarking> newList = new ArrayList<>();
         PmsProduct product = goodsMapper.selectById(id);
-       if (product!=null){
-           List<SmsBasicMarking> list = markingMapper.selectList(new QueryWrapper<SmsBasicMarking>().eq("status", 0));
-           BigDecimal totalAmount = product.getPrice();//实付金额
-           int totalCount = 1;
-           for (SmsBasicMarking m : list) {
-               if (checkManjian(m)) {
-                   SmsBasicMarking newBasicGift = new SmsBasicMarking();
-                   newBasicGift.setName(m.getName());
-                   newBasicGift.setSmallType(m.getSmallType());
-                   newBasicGift.setBigType(m.getBigType());
-                   newBasicGift.setId(m.getId());
-                   List<BasicRuls> actrule = JsonUtils.jsonToList(m.getRules(), BasicRuls.class);
-                   Collections.sort(actrule, Comparator.comparing(BasicRuls::getFullPrice).reversed());
-                   if (m.getBigType() == 1) { // 1 满减 2 折扣
-                       getList(newList, product, totalAmount, totalCount, m, newBasicGift, actrule);
-                   } else if (m.getBigType() == 2) {
-                       getList(newList, product, totalAmount, totalCount, m, newBasicGift, actrule);
-                   }
-               }
-           }
-       }
+        if (product != null) {
+            List<SmsBasicMarking> list = markingMapper.selectList(new QueryWrapper<SmsBasicMarking>().eq("status", 0));
+            BigDecimal totalAmount = product.getPrice();//实付金额
+            int totalCount = 1;
+            for (SmsBasicMarking m : list) {
+                if (checkManjian(m)) {
+                    SmsBasicMarking newBasicGift = new SmsBasicMarking();
+                    newBasicGift.setName(m.getName());
+                    newBasicGift.setSmallType(m.getSmallType());
+                    newBasicGift.setBigType(m.getBigType());
+                    newBasicGift.setId(m.getId());
+                    List<BasicRuls> actrule = JsonUtils.jsonToList(m.getRules(), BasicRuls.class);
+                    Collections.sort(actrule, Comparator.comparing(BasicRuls::getFullPrice).reversed());
+                    if (m.getBigType() == 1) { // 1 满减 2 折扣
+                        getList(newList, product, totalAmount, totalCount, m, newBasicGift, actrule);
+                    } else if (m.getBigType() == 2) {
+                        getList(newList, product, totalAmount, totalCount, m, newBasicGift, actrule);
+                    }
+                }
+            }
+        }
         return newList;
     }
 
@@ -139,7 +139,7 @@ public class SmsBasicMarkingServiceImpl extends ServiceImpl<SmsBasicMarkingMappe
                 }
             }
         }
-        if (newBasicGift!=null){
+        if (newBasicGift != null) {
             newBasicGift.setMinAmount(lastAmount);
         }
         return newBasicGift;
@@ -295,7 +295,7 @@ public class SmsBasicMarkingServiceImpl extends ServiceImpl<SmsBasicMarkingMappe
             for (BasicRuls rule : actrule) {
                 if (totalAmount.compareTo(rule.getFullPrice()) >= 0) {
                     if (rule.getReducePrice().compareTo(lastAmount) > 0) {
-                        lastAmount = rule.getReducePrice().multiply(totalAmount).divide(new BigDecimal(10),2);
+                        lastAmount = rule.getReducePrice().multiply(totalAmount).divide(new BigDecimal(10), 2);
                         newBasicGift.setMinAmount(totalAmount.subtract(lastAmount));
                         newBasicGift.setName(m.getName());
                         newBasicGift.setSmallType(m.getSmallType());
@@ -309,7 +309,7 @@ public class SmsBasicMarkingServiceImpl extends ServiceImpl<SmsBasicMarkingMappe
             for (BasicRuls rule : actrule) {
                 if (totalCount >= rule.getFullPrice().intValue()) {
                     if (rule.getReducePrice().compareTo(lastAmount) > 0) {
-                        lastAmount = rule.getReducePrice().multiply(totalAmount).divide(new BigDecimal(10),2);
+                        lastAmount = rule.getReducePrice().multiply(totalAmount).divide(new BigDecimal(10), 2);
                         newBasicGift.setMinAmount(totalAmount.subtract(lastAmount));
                         newBasicGift.setName(m.getName());
                         newBasicGift.setSmallType(m.getSmallType());
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsCouponServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsCouponServiceImpl.java
index b0e4d2d67de72561f192625aea61faae4df72620..e104b0982e7df1971488b924e6c9fca1bd882fea 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsCouponServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsCouponServiceImpl.java
@@ -56,52 +56,60 @@ public class SmsCouponServiceImpl extends ServiceImpl<SmsCouponMapper, SmsCoupon
 
     @Override
     public List<SmsCoupon> selectNotRecive() {
-        UmsMember currentMember = memberService.getNewCurrentMember();
         SmsCoupon coupon = new SmsCoupon();
-        coupon.setType(0);
+        List<SmsCoupon>   list = couponMapper.selectList(new QueryWrapper<>(coupon).lt("start_time", new Date()).gt("end_time", new Date()));
+        return list;
+
+    }
+
+
+    public List<SmsCoupon> selectNotRecive1() {
         List<SmsCoupon> list = new ArrayList<>();
-        if (currentMember != null && currentMember.getId()!=null) {
-            List<SmsCouponHistory> histories = couponHistoryMapper.selectList(new QueryWrapper<SmsCouponHistory>().eq("member_id",currentMember.getId()));
-            if (histories != null && histories.size() > 0) {
-                List<Long> ids = histories.stream()
-                        .map(SmsCouponHistory::getCouponId)
-                        .collect(Collectors.toList());
-                list = couponMapper.selectList(new QueryWrapper<>(coupon).lt("start_time", new Date()).gt("end_time", new Date()).notIn("id",ids));
-            }
+        SmsCoupon coupon = new SmsCoupon();
+        try {
+            UmsMember currentMember = memberService.getNewCurrentMember();
+            coupon.setType(0);
+            if (currentMember != null && currentMember.getId() != null) {
+                List<SmsCouponHistory> histories = couponHistoryMapper.selectList(new QueryWrapper<SmsCouponHistory>().eq("member_id", currentMember.getId()));
+                if (histories != null && histories.size() > 0) {
+                    List<Long> ids = histories.stream()
+                            .map(SmsCouponHistory::getCouponId)
+                            .collect(Collectors.toList());
+                    list = couponMapper.selectList(new QueryWrapper<>(coupon).lt("start_time", new Date()).gt("end_time", new Date()).notIn("id", ids));
+                }
 
-        }else {
+            }
+        }catch (Exception e){
             list = couponMapper.selectList(new QueryWrapper<>(coupon).lt("start_time", new Date()).gt("end_time", new Date()));
+
         }
         return list;
 
     }
-
-
-
     @Override
     public List<SmsCouponHistory> listMemberCoupon(Integer useStatus) {
         UmsMember currentMember = memberService.getNewCurrentMember();
         if (currentMember == null) {
-            return  new ArrayList<>();
+            return new ArrayList<>();
         }
-        if (ValidatorUtils.empty(useStatus)){
-            return couponHistoryMapper.selectList(new QueryWrapper<SmsCouponHistory>().eq("member_id",currentMember.getId()));
+        if (ValidatorUtils.empty(useStatus)) {
+            return couponHistoryMapper.selectList(new QueryWrapper<SmsCouponHistory>().eq("member_id", currentMember.getId()));
         }
-        return couponHistoryMapper.selectList(new QueryWrapper<SmsCouponHistory>().eq("member_id",currentMember.getId()).eq("use_status",useStatus));
+        return couponHistoryMapper.selectList(new QueryWrapper<SmsCouponHistory>().eq("member_id", currentMember.getId()).eq("use_status", useStatus));
     }
 
     @Transactional
     @Override
-    public CommonResult addbatch(String couponIds){
+    public CommonResult addbatch(String couponIds) {
         UmsMember currentMember = memberService.getNewCurrentMember();
         if (currentMember == null) {
             return new CommonResult().failed("优惠券不存在");
         }
-        if (ValidatorUtils.empty(couponIds)){
+        if (ValidatorUtils.empty(couponIds)) {
             return new CommonResult().failed("优惠券不存在");
         }
-        String []ids= couponIds.split(",");
-        for (String couponId : ids){
+        String[] ids = couponIds.split(",");
+        for (String couponId : ids) {
             //获取优惠券信息，判断数量
             SmsCoupon coupon = couponMapper.selectById(Long.valueOf(couponId));
             if (coupon == null) {
@@ -146,6 +154,7 @@ public class SmsCouponServiceImpl extends ServiceImpl<SmsCouponMapper, SmsCoupon
         }
         return new CommonResult().success("领取成功", null);
     }
+
     @Transactional
     @Override
     public CommonResult add(Long couponId) {
@@ -291,7 +300,7 @@ public class SmsCouponServiceImpl extends ServiceImpl<SmsCouponMapper, SmsCoupon
     private BigDecimal calcTotalAmount(List<OmsCartItem> cartItemList) {
         BigDecimal total = new BigDecimal("0");
         for (OmsCartItem item : cartItemList) {
-          //  BigDecimal realPrice = item.getPrice().subtract(item.getReduceAmount());
+            //  BigDecimal realPrice = item.getPrice().subtract(item.getReduceAmount());
             total = total.add(item.getPrice().multiply(new BigDecimal(item.getQuantity())));
         }
         return total;
@@ -301,7 +310,7 @@ public class SmsCouponServiceImpl extends ServiceImpl<SmsCouponMapper, SmsCoupon
         BigDecimal total = new BigDecimal("0");
         for (OmsCartItem item : cartItemList) {
             if (productCategoryIds.contains(item.getProductCategoryId())) {
-             //   BigDecimal realPrice = item.getPrice().subtract(item.getReduceAmount());
+                //   BigDecimal realPrice = item.getPrice().subtract(item.getReduceAmount());
                 total = total.add(item.getPrice().multiply(new BigDecimal(item.getQuantity())));
             }
         }
@@ -312,7 +321,7 @@ public class SmsCouponServiceImpl extends ServiceImpl<SmsCouponMapper, SmsCoupon
         BigDecimal total = new BigDecimal("0");
         for (OmsCartItem item : cartItemList) {
             if (productIds.contains(item.getProductId())) {
-              //  BigDecimal realPrice = item.getPrice().subtract(item.getReduceAmount());
+                //  BigDecimal realPrice = item.getPrice().subtract(item.getReduceAmount());
                 total = total.add(item.getPrice().multiply(new BigDecimal(item.getQuantity())));
             }
         }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsGroupActivityServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsGroupActivityServiceImpl.java
index ba32950abb722d12a3bcfa70e01f599ff1956679..97c2d261d43af634cbda69bb29be1dbfcfc73faf 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsGroupActivityServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsGroupActivityServiceImpl.java
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsHomeAdvertiseServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsHomeAdvertiseServiceImpl.java
index 06dcdd8f2602fe078c6a67ac52f457fe759a2045..4bb5e5577c5cf9a8d9dad7354b5670b90050d1af 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsHomeAdvertiseServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsHomeAdvertiseServiceImpl.java
@@ -30,18 +30,18 @@ import com.zscat.mallplus.sms.vo.HomeProductAttr;
 import com.zscat.mallplus.sms.vo.SmsFlashSessionInfo;
 import com.zscat.mallplus.sys.entity.SysStore;
 import com.zscat.mallplus.sys.mapper.SysStoreMapper;
-import com.zscat.mallplus.ums.entity.UmsRewardLog;
 import com.zscat.mallplus.ums.service.IUmsMemberLevelService;
 import com.zscat.mallplus.ums.service.IUmsMemberService;
 import com.zscat.mallplus.util.DateUtils;
 import com.zscat.mallplus.utils.ValidatorUtils;
-
 import com.zscat.mallplus.vo.home.Pages;
 import com.zscat.mallplus.vo.home.PagesItems;
 import com.zscat.mallplus.vo.home.Params;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StopWatch;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -49,7 +49,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.*;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -59,6 +58,7 @@ import java.util.stream.Collectors;
  * @author zscat
  * @since 2019-04-19
  */
+@Slf4j
 @Service
 public class SmsHomeAdvertiseServiceImpl extends ServiceImpl<SmsHomeAdvertiseMapper, SmsHomeAdvertise> implements ISmsHomeAdvertiseService {
     @Autowired
@@ -114,19 +114,22 @@ public class SmsHomeAdvertiseServiceImpl extends ServiceImpl<SmsHomeAdvertiseMap
     private PmsSmallNaviconCategoryMapper smallNaviconCategoryMapper;
     @Resource
     private SysStoreMapper storeMapper;
+
     @Override
-    public   List<PmsSmallNaviconCategory> getNav(){
+    public List<PmsSmallNaviconCategory> getNav() {
         return smallNaviconCategoryMapper.selectList(new QueryWrapper<>());
     }
-    public   List<ActivityVo> getActivityList(){
+
+    public List<ActivityVo> getActivityList() {
         List<ActivityVo> activityList = new ArrayList<>();
-        activityList.add(new ActivityVo("优惠多多","/pages/activity/goods_combination/index","http://datong.crmeb.net/public/uploads/attach/2019/03/28/5c9ccf7e9f4d0.jpg","一起来拼团","/activity/group"));
-        activityList.add(new ActivityVo("新能源汽车火热销售","/pages/activity/goods_seckill/index","http://datong.crmeb.net/public/uploads/attach/2019/03/28/5c9ccf7e97660.jpg","秒杀专区","/activity/goods_seckill"));
+        activityList.add(new ActivityVo("优惠多多", "/pages/activity/goods_combination/index", "http://datong.crmeb.net/public/uploads/attach/2019/03/28/5c9ccf7e9f4d0.jpg", "一起来拼团", "/activity/group"));
+        activityList.add(new ActivityVo("新能源汽车火热销售", "/pages/activity/goods_seckill/index", "http://datong.crmeb.net/public/uploads/attach/2019/03/28/5c9ccf7e97660.jpg", "秒杀专区", "/activity/goods_seckill"));
 
-        activityList.add(new ActivityVo("呼朋唤友来砍价~~~","/pages/activity/goods_bargain/index","http://datong.crmeb.net/public/uploads/attach/2019/03/28/5c9ccfc86a6c1.jpg","砍价活动","/activity/bargain"));
+        activityList.add(new ActivityVo("呼朋唤友来砍价~~~", "/pages/activity/goods_bargain/index", "http://datong.crmeb.net/public/uploads/attach/2019/03/28/5c9ccfc86a6c1.jpg", "砍价活动", "/activity/bargain"));
 
         return activityList;
     }
+
     @Override
     public HomeContentResult singelContent() {
         ExecutorService executorService = Executors.newFixedThreadPool(10);
@@ -167,33 +170,36 @@ public class SmsHomeAdvertiseServiceImpl extends ServiceImpl<SmsHomeAdvertiseMap
         }
         return result;
     }
+
     @Override
     public HomeContentResult singelContent1() {
 
         HomeContentResult result = new HomeContentResult();
         List<SmsCoupon> couponList = couponService.selectNotRecive();
-            if (couponList!=null && couponList.size()>2){
-                couponList = couponList.subList(0,2);
-            }
-            result.setCouponList(couponList);
+        if (couponList != null && couponList.size() > 2) {
+            couponList = couponList.subList(0, 2);
+        }
+        result.setCouponList(couponList);
 
-            //获取新品推荐
+        //获取新品推荐
         result.setNewProductList(this.getNewProductList(0, 4));
-            //获取人气推荐
+        //获取人气推荐
         result.setHotProductList(this.getHotProductList(0, 4));
-            //获取推荐专题
+        //获取推荐专题
 
         return result;
     }
+
     @Override
-    public  HomeContentResult singelmobileContent(){
+    public HomeContentResult singelmobileContent() {
         HomeContentResult result = new HomeContentResult();
         result.setNavList(getNav());
         result.setAdvertiseList(getHomeAdvertiseList());
         return result;
     }
+
     @Override
-    public HomeContentResult contentPc(){
+    public HomeContentResult contentPc() {
         ExecutorService executorService = Executors.newFixedThreadPool(10);
         HomeContentResult result = new HomeContentResult();
         Callable<List> couponListCallable = () -> couponService.selectNotRecive();
@@ -215,8 +221,8 @@ public class SmsHomeAdvertiseServiceImpl extends ServiceImpl<SmsHomeAdvertiseMap
         executorService.submit(advListTask);
         try {
             List<SmsCoupon> couponList = couponListTask.get();
-            if (couponList!=null && couponList.size()>2){
-                couponList = couponList.subList(0,2);
+            if (couponList != null && couponList.size() > 2) {
+                couponList = couponList.subList(0, 2);
             }
             result.setCouponList(couponList);
             //获取首页广告
@@ -227,10 +233,10 @@ public class SmsHomeAdvertiseServiceImpl extends ServiceImpl<SmsHomeAdvertiseMap
             result.setHotProductList(newHotListTask.get());
             //获取推荐专题
             result.setSubjectList(recomSubListTask.get());
-            result.setBrandList(getRecommendBrandList(1,8));
+            result.setBrandList(getRecommendBrandList(1, 8));
             result.setNavList(getNav());
             result.setActivityList(getActivityList());
-            result.setSaleProductList(getSaleProductList(1,3));
+            result.setSaleProductList(getSaleProductList(1, 3));
 
             result.setCat_list(getPmsProductAttributeCategories());
         } catch (InterruptedException e) {
@@ -240,92 +246,115 @@ public class SmsHomeAdvertiseServiceImpl extends ServiceImpl<SmsHomeAdvertiseMap
         }
         return result;
     }
+
     @Override
-    public  HomeContentResult contentNew1(){
-        ExecutorService executorService = Executors.newFixedThreadPool(10);
+    public HomeContentResult contentNew1() {
         HomeContentResult result = new HomeContentResult();
-        Callable<List> couponListCallable = () -> couponService.selectNotRecive();
-        Callable<List> newGoodsListCallable = () -> this.getNewProductList(0, 4);
-        Callable<List> newHotListCallable = () -> this.getHotProductList(0, 4);
-        Callable<List> recomSubListCallable = () -> this.getRecommendSubjectList(0, 4);
-        Callable<List> advListCallable = this::getHomeAdvertiseList;
-
-        FutureTask<List> couponListTask = new FutureTask<>(couponListCallable);
-        FutureTask<List> newGoodsListTask = new FutureTask<>(newGoodsListCallable);
-        FutureTask<List> newHotListTask = new FutureTask<>(newHotListCallable);
-        FutureTask<List> recomSubListTask = new FutureTask<>(recomSubListCallable);
-        FutureTask<List> advListTask = new FutureTask<>(advListCallable);
-
-        executorService.submit(couponListTask);
-        executorService.submit(newGoodsListTask);
-        executorService.submit(newHotListTask);
-        executorService.submit(recomSubListTask);
-        executorService.submit(advListTask);
         try {
-            List<SmsCoupon> couponList = couponListTask.get();
-            if (couponList!=null && couponList.size()>2){
-                couponList = couponList.subList(0,2);
+            org.springframework.util.StopWatch stopWatch = new StopWatch("HomeCrmmall" );
+            stopWatch.start("1单条循环处理");
+            List<SmsCoupon> couponList = couponService.selectNotRecive();
+            if (couponList != null && couponList.size() > 0) {
+                if (couponList.size()>4){
+                    couponList = couponList.subList(0, 4);
+                }else {
+                    couponList = couponList.subList(0, couponList.size());
+                }
             }
             result.setCouponList(couponList);
+            stopWatch.stop();
+            stopWatch.start("2单条循环处理");
             //获取首页广告
-            result.setAdvertiseList(advListTask.get());
+            result.setAdvertiseList(getHomeAdvertiseList());
+            stopWatch.stop();
+            stopWatch.start("3单条循环处理");
             //获取新品推荐
-            result.setNewProductList(newGoodsListTask.get());
+            result.setNewProductList(this.getNewProductList(0, 4));
+            stopWatch.stop();
+            stopWatch.start("4单条循环处理");
             //获取人气推荐
-            result.setHotProductList(newHotListTask.get());
+            result.setHotProductList(this.getNewProductList(0, 4));
             //获取推荐专题
-            result.setSubjectList(recomSubListTask.get());
-            result.setStoreList(getStoreList(1,8));
+            stopWatch.stop();
+            stopWatch.start("5单条循环处理");
+            result.setSubjectList(this.getRecommendSubjectList(0, 4));
+            stopWatch.stop();
+            stopWatch.start("6单条循环处理");
+            result.setStoreList(getStoreList(1, 8));
+            stopWatch.stop();
+            stopWatch.start("7单条循环处理");
             result.setNavList(getNav());
+            stopWatch.stop();
+            stopWatch.start("8单条循环处理");
             result.setActivityList(getActivityList());
-            result.setSaleProductList(getSaleProductList(1,3));
+            stopWatch.stop();
+            stopWatch.start("9单条循环处理");
+            result.setSaleProductList(getSaleProductList(1, 3));
+            stopWatch.stop();
+            log.info(stopWatch.prettyPrint());
 
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        } catch (ExecutionException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return result;
     }
+
     @Override
-    public   Pages contentNew(){
+    public Pages contentNew() {
 
-        Params searchPa = new Params(); searchPa.setKeywords("请输入关键字搜索");searchPa.setStyle("round");
-        PagesItems searchItems = new PagesItems(1,"search","mobile_home",1,1,searchPa);
+        Params searchPa = new Params();
+        searchPa.setKeywords("请输入关键字搜索");
+        searchPa.setStyle("round");
+        PagesItems searchItems = new PagesItems(1, "search", "mobile_home", 1, 1, searchPa);
 
-        Params imgSlidePa = new Params(); imgSlidePa.setDuration(2500);
+        Params imgSlidePa = new Params();
+        imgSlidePa.setDuration(2500);
         imgSlidePa.setList(getHomeAdvertiseList());
-        PagesItems imgSlideItems = new PagesItems(2,"imgSlide","mobile_home",2,2,imgSlidePa);
+        PagesItems imgSlideItems = new PagesItems(2, "imgSlide", "mobile_home", 2, 2, imgSlidePa);
 
 
-        Params navBarPa = new Params(); navBarPa.setLimit(4);
+        Params navBarPa = new Params();
+        navBarPa.setLimit(4);
         navBarPa.setList(getNav());
-        PagesItems navBarItems = new PagesItems(3,"navBar","mobile_home",3,3,navBarPa);
-
-        Params pintuanPa = new Params(); navBarPa.setLimit(4);
-        pintuanPa.setList(lastGroupGoods(10));pintuanPa.setTitle("最新拼团");
-        PagesItems pintuanItems = new PagesItems(4,"pintuan","mobile_home",4,4,pintuanPa);
-
-        Params groupPurchasePa = new Params(); groupPurchasePa.setLimit(4);
-        groupPurchasePa.setList(homeFlashPromotionList());groupPurchasePa.setTitle("限时秒杀");
-        PagesItems groupPurchaseItems = new PagesItems(5,"groupPurchase","mobile_home",5,5,groupPurchasePa);
-
-        Params articleClassifyPa = new Params(); articleClassifyPa.setLimit(10);
-        articleClassifyPa.setList(subjectCategoryService.list(new QueryWrapper<CmsSubjectCategory>().eq("show_status",1)));
-        PagesItems articleClassifyItems = new PagesItems(6,"articleClassify","mobile_home",6,6,articleClassifyPa);
-
-        Params couponPa = new Params(); couponPa.setLimit(10);
+        PagesItems navBarItems = new PagesItems(3, "navBar", "mobile_home", 3, 3, navBarPa);
+
+        Params pintuanPa = new Params();
+        navBarPa.setLimit(4);
+        pintuanPa.setList(lastGroupGoods(10));
+        pintuanPa.setTitle("最新拼团");
+        PagesItems pintuanItems = new PagesItems(4, "pintuan", "mobile_home", 4, 4, pintuanPa);
+
+        Params groupPurchasePa = new Params();
+        groupPurchasePa.setLimit(4);
+        groupPurchasePa.setList(homeFlashPromotionList());
+        groupPurchasePa.setTitle("限时秒杀");
+        PagesItems groupPurchaseItems = new PagesItems(5, "groupPurchase", "mobile_home", 5, 5, groupPurchasePa);
+
+        Params articleClassifyPa = new Params();
+        articleClassifyPa.setLimit(10);
+        articleClassifyPa.setList(subjectCategoryService.list(new QueryWrapper<CmsSubjectCategory>().eq("show_status", 1)));
+        PagesItems articleClassifyItems = new PagesItems(6, "articleClassify", "mobile_home", 6, 6, articleClassifyPa);
+
+        Params couponPa = new Params();
+        couponPa.setLimit(10);
         couponPa.setList(couponService.selectNotRecive());
-        PagesItems couponItems = new PagesItems(7,"coupon","mobile_home",7,7,couponPa);
+        PagesItems couponItems = new PagesItems(7, "coupon", "mobile_home", 7, 7, couponPa);
 
-        Params articlePa = new Params(); articlePa.setLimit(10);
-        articlePa.setList(getRecommendSubjectList(1,10));
-        PagesItems articleItems = new PagesItems(6,"article","mobile_home",6,9,articlePa);
+        Params articlePa = new Params();
+        articlePa.setLimit(10);
+        articlePa.setList(getRecommendSubjectList(1, 10));
+        PagesItems articleItems = new PagesItems(6, "article", "mobile_home", 6, 9, articlePa);
 
 
-        Params goodsPa = new Params(); goodsPa.setLimit(10);goodsPa.setTitle("最新商品");goodsPa.setLookMore("true");goodsPa.setType("auto");
-        goodsPa.setList(getNewProductList(1,10));goodsPa.setDisplay("list");goodsPa.setColumn(2);
-        PagesItems goodsItems = new PagesItems(8,"goods","mobile_home",8,10,goodsPa);
+        Params goodsPa = new Params();
+        goodsPa.setLimit(10);
+        goodsPa.setTitle("最新商品");
+        goodsPa.setLookMore("true");
+        goodsPa.setType("auto");
+        goodsPa.setList(getNewProductList(1, 10));
+        goodsPa.setDisplay("list");
+        goodsPa.setColumn(2);
+        PagesItems goodsItems = new PagesItems(8, "goods", "mobile_home", 8, 10, goodsPa);
 
         List<PagesItems> pagesItemsList = new ArrayList<>();
         pagesItemsList.add(searchItems);
@@ -338,11 +367,12 @@ public class SmsHomeAdvertiseServiceImpl extends ServiceImpl<SmsHomeAdvertiseMap
         pagesItemsList.add(goodsItems);
         pagesItemsList.add(articleItems);
 
-        Pages searchPage = new Pages(1,"mobile_home","移动端首页","移动端首页相关操作，可视化移动端、小程序端首页布局",1,1,pagesItemsList);
+        Pages searchPage = new Pages(1, "mobile_home", "移动端首页", "移动端首页相关操作，可视化移动端、小程序端首页布局", 1, 1, pagesItemsList);
 
         return searchPage;
 
     }
+
     @Override
     public List<PmsProductAttributeCategory> getPmsProductAttributeCategories() {
         List<PmsProductAttributeCategory> productAttributeCategoryList = productAttributeCategoryService.list(new QueryWrapper<>());
@@ -363,41 +393,41 @@ public class SmsHomeAdvertiseServiceImpl extends ServiceImpl<SmsHomeAdvertiseMap
 
     /**
      * 最新拼团
+     *
      * @param pageNum
      * @return
      */
     @Override
-    public  List<SmsGroup> lastGroupGoods( Integer pageNum) {
-        List<SmsGroup> groupList =  groupService.list(new QueryWrapper<SmsGroup>().orderByDesc("create_time"));
+    public List<SmsGroup> lastGroupGoods(Integer pageNum) {
+        List<SmsGroup> groupList = groupService.list(new QueryWrapper<SmsGroup>().orderByDesc("create_time"));
         List<SmsGroup> result = new ArrayList<>();
-        for (SmsGroup group :groupList){
-            if (ValidatorUtils.empty(group.getHours())){
+        for (SmsGroup group : groupList) {
+            if (ValidatorUtils.empty(group.getHours())) {
                 continue;
             }
             group.setPintuan_start_status(1);
             group.setTimeSecound(ValidatorUtils.getTimeSecound(group.getEndTime()));
             Long nowT = System.currentTimeMillis();
             Date endTime = DateUtils.convertStringToDate(DateUtils.addHours(group.getEndTime(), group.getHours()), "yyyy-MM-dd HH:mm:ss");
-            if (nowT < group.getStartTime().getTime() ) {
+            if (nowT < group.getStartTime().getTime()) {
                 group.setPintuan_start_status(2);
             }
-            if ( nowT > endTime.getTime()) {
+            if (nowT > endTime.getTime()) {
                 group.setPintuan_start_status(3);
             }
-            PmsProduct g =pmsProductService.getById(group.getGoodsId());
-            if(g!=null){
+            PmsProduct g = pmsProductService.getById(group.getGoodsId());
+            if (g != null) {
                 group.setGoods(g);
                 result.add(group);
             }
-            if (result!=null && result.size()>pageNum){
-                result = result.subList(0,pageNum);
+            if (result != null && result.size() > pageNum) {
+                result = result.subList(0, pageNum);
             }
         }
         return result;
     }
 
 
-
     @Override
     public List<HomeFlashPromotion> homeFlashPromotionList() {
         List<HomeFlashPromotion> result = new ArrayList<>();
@@ -405,14 +435,14 @@ public class SmsHomeAdvertiseServiceImpl extends ServiceImpl<SmsHomeAdvertiseMap
         queryS.setIsIndex(1);
         List<SmsFlashPromotion> indexFlashPromotionList = smsFlashPromotionService.list(new QueryWrapper<>(queryS));
         for (SmsFlashPromotion indexFlashPromotion : indexFlashPromotionList) {
-            HomeFlashPromotion homeFlashPromotion = getHomeFlashPromotion( indexFlashPromotion);
+            HomeFlashPromotion homeFlashPromotion = getHomeFlashPromotion(indexFlashPromotion);
             result.add(homeFlashPromotion);
         }
 
         return result;
     }
 
-    private HomeFlashPromotion getHomeFlashPromotion( SmsFlashPromotion indexFlashPromotion) {
+    private HomeFlashPromotion getHomeFlashPromotion(SmsFlashPromotion indexFlashPromotion) {
         Long flashPromotionId = 0L;
 
         HomeFlashPromotion tempsmsFlashList = new HomeFlashPromotion();
@@ -429,7 +459,7 @@ public class SmsHomeAdvertiseServiceImpl extends ServiceImpl<SmsHomeAdvertiseMap
 
         List<SmsFlashSessionInfo> smsFlashSessionInfos = smsFlashPromotionSessionMapper.getCurrentDang(formatNow);
 
-        for (SmsFlashSessionInfo smsFlashSessionInfo : smsFlashSessionInfos){
+        for (SmsFlashSessionInfo smsFlashSessionInfo : smsFlashSessionInfos) {
             if (smsFlashSessionInfo != null && flashPromotionId != 0L) {//当前时间有秒杀档，并且有秒杀活动时，获取数据
 
                 Long smsFlashSessionId = smsFlashSessionInfo.getId();
@@ -454,12 +484,12 @@ public class SmsHomeAdvertiseServiceImpl extends ServiceImpl<SmsHomeAdvertiseMap
                         product.setProductPrice(tempproduct.getPrice() != null ? tempproduct.getPrice() : BigDecimal.ZERO);
                         product.setFlashPromotionPrice(item.getFlashPromotionPrice());
                         product.setFlashPromotionCount(item.getFlashPromotionCount());
-                        if (item.getFlashPromotionLimit()<1){
+                        if (item.getFlashPromotionLimit() < 1) {
                             product.setFlashPromotionLimit(1);
-                        }else {
+                        } else {
                             product.setFlashPromotionLimit(item.getFlashPromotionLimit());
                         }
-                        if (product.getProductPrice().compareTo(BigDecimal.ZERO)>0 && item.getFlashPromotionCount()>0){
+                        if (product.getProductPrice().compareTo(BigDecimal.ZERO) > 0 && item.getFlashPromotionCount() > 0) {
                             productAttrs.add(product);
                         }
                     }
@@ -479,29 +509,35 @@ public class SmsHomeAdvertiseServiceImpl extends ServiceImpl<SmsHomeAdvertiseMap
         HomeFlashPromotion homeFlashPromotion = null;
         SmsFlashPromotion queryS = new SmsFlashPromotion();
         queryS.setIsIndex(1);
-        SmsFlashPromotion indexFlashPromotion = smsFlashPromotionService.getOne(new QueryWrapper<>(queryS));
-        homeFlashPromotion = getHomeFlashPromotion( indexFlashPromotion);
+        SmsFlashPromotion indexFlashPromotion = smsFlashPromotionService.getOne(new QueryWrapper<>(queryS).last("limit 1"));
+        homeFlashPromotion = getHomeFlashPromotion(indexFlashPromotion);
         return homeFlashPromotion;
     }
 
 
     @Override
     public List<PmsBrand> getRecommendBrandList(int pageNum, int pageSize) {
-        List<SmsHomeBrand> brands = homeBrandService.list(new QueryWrapper<>());
+        PmsBrand query = new PmsBrand();
+        query.setFactoryStatus(1);
+        return brandService.page(new Page<PmsBrand>(pageNum, pageSize), new QueryWrapper<>(query).orderByDesc("sort")).getRecords();
+
+       /* List<SmsHomeBrand> brands = homeBrandService.list(new QueryWrapper<>());
         if (brands == null || brands.size() == 0) {
             return new ArrayList<>();
         }
         List<Long> ids = brands.stream()
                 .map(SmsHomeBrand::getBrandId)
                 .collect(Collectors.toList());
-        return (List<PmsBrand>) brandService.listByIds(ids);
+        return (List<PmsBrand>) brandService.listByIds(ids);*/
 
     }
+
     @Override
     public List<SysStore> getStoreList(int pageNum, int pageSize) {
         return storeMapper.selectPage(new Page<SysStore>(pageNum, pageSize), new QueryWrapper<>(new SysStore()).orderByDesc("create_time")).getRecords();
 
     }
+
     @Override
     public List<PmsProduct> getSaleProductList(int pageNum, int pageSize) {
         PmsProduct query = new PmsProduct();
@@ -509,6 +545,7 @@ public class SmsHomeAdvertiseServiceImpl extends ServiceImpl<SmsHomeAdvertiseMap
         query.setVerifyStatus(1);
         return pmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<>(query).select(ConstansValue.sampleGoodsList).orderByDesc("sale")).getRecords();
     }
+
     @Override
     public List<PmsProduct> getNewProductList(int pageNum, int pageSize) {
         PmsProduct query = new PmsProduct();
@@ -524,30 +561,35 @@ public class SmsHomeAdvertiseServiceImpl extends ServiceImpl<SmsHomeAdvertiseMap
     }
 
 
-
     @Override
     public List<PmsProduct> getHotProductList(int pageNum, int pageSize) {
-        List<SmsHomeRecommendProduct> brands = homeRecommendProductService.list(new QueryWrapper<>());
+        PmsProduct query = new PmsProduct();
+        query.setRecommandStatus(1);
+        query.setVerifyStatus(1);
+        return pmsProductService.page(new Page<PmsProduct>(pageNum, pageSize), new QueryWrapper<>(query).select(ConstansValue.sampleGoodsList).orderByDesc("create_time")).getRecords();
+       /* List<SmsHomeRecommendProduct> brands = homeRecommendProductService.list(new QueryWrapper<>());
         if (brands == null || brands.size() == 0) {
             return new ArrayList<>();
         }
         List<Long> ids = brands.stream()
                 .map(SmsHomeRecommendProduct::getProductId)
                 .collect(Collectors.toList());
-        return (List<PmsProduct>) pmsProductService.list(new QueryWrapper<PmsProduct>().in("id",ids).select(ConstansValue.sampleGoodsList));
+        return (List<PmsProduct>) pmsProductService.list(new QueryWrapper<PmsProduct>().in("id", ids).select(ConstansValue.sampleGoodsList));*/
     }
 
     @Override
     public List<CmsSubject> getRecommendSubjectList(int pageNum, int pageSize) {
-        List<SmsHomeRecommendSubject> brands = homeRecommendSubjectService.list(new QueryWrapper<>());
+       /* List<SmsHomeRecommendSubject> brands = homeRecommendSubjectService.list(new QueryWrapper<>());
         if (brands == null || brands.size() == 0) {
             return new ArrayList<>();
         }
 
         List<Long> ids = brands.stream()
                 .map(SmsHomeRecommendSubject::getSubjectId)
-                .collect(Collectors.toList());
-        return (List<CmsSubject>) subjectService.listByIds(ids);
+                .collect(Collectors.toList());*/
+        CmsSubject subject = new CmsSubject();
+        subject.setRecommendStatus(1);
+        return subjectService.page(new Page<CmsSubject>(pageNum, pageSize), new QueryWrapper<>(subject).select(ConstansValue.sampleSubjectList)).getRecords();
     }
 
     @Override
@@ -556,6 +598,7 @@ public class SmsHomeAdvertiseServiceImpl extends ServiceImpl<SmsHomeAdvertiseMap
         advertise.setStatus(1);
         return advertiseService.list(new QueryWrapper<>(advertise));
     }
+
     @Override
     public List<SmsHomeAdvertise> getHomeAdvertiseList(int type) {
         SmsHomeAdvertise advertise = new SmsHomeAdvertise();
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsPaimaiLogServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsPaimaiLogServiceImpl.java
index 8feaee433f8703bec456b16f8c841527f801e79f..d035a78590fc40c534d76b2b8a44033a67598545 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsPaimaiLogServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsPaimaiLogServiceImpl.java
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUmsEmployInfoService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUmsEmployInfoService.java
index e647e65e5fba0bcc8d120a6ac6b5b190ed3083b2..8e6b784980392ed97b7be3883592be5546971487 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUmsEmployInfoService.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUmsEmployInfoService.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.ums.entity.UmsEmployInfo;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUmsMemberLocationService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUmsMemberLocationService.java
index 66f07f806a99299d5532e3ef1d825ad234ca3998..f336cf9cd0c7629f9ab767b74bc70812eda5b952 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUmsMemberLocationService.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUmsMemberLocationService.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.ums.entity.UmsMemberLocation;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUmsMemberService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUmsMemberService.java
index e16bb63bda909dd61972fbce5dec5b62add81e8b..08e00c7b43b93bfec117f7cd8f773e6ce147323e 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUmsMemberService.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUmsMemberService.java
@@ -21,9 +21,22 @@ public interface IUmsMemberService extends IService<UmsMember> {
 
     void updataMemberOrderInfo();
 
-    Object loginByWeixin(AppletLoginParam req);
+    /**
+     * 获取小程序openid
+     * @param req
+     * @return
+     */
+    Object getAppletOpenId(AppletLoginParam req);
 
 
+    /**
+     * 小程序 登录注册
+     * @param req
+     * @return
+     */
+    Object loginByWeixin(AppletLoginParam req);
+
+    Object loginByWeixin1(AppletLoginParam req);
     /**
      * 根据用户名获取会员
      */
@@ -38,7 +51,7 @@ public interface IUmsMemberService extends IService<UmsMember> {
      * 用户注册
      */
     @Transactional
-    CommonResult register(String phone, String password, String confim, String authCode,String invitecode);
+    CommonResult register(String phone, String password, String confim, String authCode, String invitecode);
 
     /**
      * 生成验证码
@@ -53,7 +66,6 @@ public interface IUmsMemberService extends IService<UmsMember> {
     CommonResult updatePassword(String telephone, String password, String authCode);
 
 
-
     /**
      * 根据会员id修改会员积分
      */
@@ -73,7 +85,7 @@ public interface IUmsMemberService extends IService<UmsMember> {
 
     Map<String, Object> loginByCode(String phone, String authCode);
 
-    Object simpleReg(String phone, String password, String confimpassword,String invitecode);
+    Object simpleReg(String phone, String password, String confimpassword, String invitecode);
 
     /**
      * 添加余额记录 并更新用户余额
@@ -81,21 +93,41 @@ public interface IUmsMemberService extends IService<UmsMember> {
      * @param id
      * @param integration
      */
-     void addBlance(Long id, Integer integration,int type,String note);
+    void addBlance(Long id, Integer integration, int type, String note);
 
     /**
      * 添加积分记录 并更新用户积分
+     *
      * @param id
      * @param integration
      */
-     void addIntegration(Long id, Integer integration,int changeType,String note,int sourceType,String operateMan) ;
+    void addIntegration(Long id, Integer integration, int changeType, String note, int sourceType, String operateMan);
 
-    Map<String, Object> appLogin(String openid, Integer sex, String headimgurl, String unionid, String nickname,String city,Integer source);
+    Map<String, Object> appLogin(String openid, Integer sex, String headimgurl, String unionid, String nickname, String city, Integer source);
 
 
     Object initMemberRedis();
 
     Object getCurrentMember();
+
     UmsMember getNewCurrentMember();
+
+    /**
+     * openId，采用 网页授权获取 access_token API：SnsAccessTokenApi获取
+     *
+     * @return
+     */
+    Object webLogin(String wxH5Appid,String wxH5Secret, String code);
+
+
+    /**
+     * 小程序获取的手机加密信息进行解密
+     * @param openid
+     * @param keyStr
+     * @param ivStr
+     * @param encDataStr
+     * @return
+     */
+    String getWxPhone(String openid,String keyStr, String ivStr,String encDataStr);
 }
 
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUmsRewardLogService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUmsRewardLogService.java
index 0b103cf9fce048509816c51700f23776b2177d0d..10aa500a593afe882b01cc67d1e6487fbaae6978 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUmsRewardLogService.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUmsRewardLogService.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.ums.entity.UmsRewardLog;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUserBankcardsService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUserBankcardsService.java
index c931aa3973cbdf2d7dc94cfc3a517e8ebe359d4d..88fd5deed63a71a7ee131268dab2878973368b0b 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUserBankcardsService.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUserBankcardsService.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.ums.entity.UserBankcards;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUserTocashService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUserTocashService.java
index b00e7e6734853f42e2ed2629542c201e9e9dbb4e..16ac3f3f11e30d4f8b08a8cd5625f0c2ed8d874c 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUserTocashService.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/IUserTocashService.java
@@ -5,7 +5,7 @@ import com.zscat.mallplus.ums.entity.UserTocash;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/SmsService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/SmsService.java
index 554101d96e4095de5d14cde25e2730ea70234dab..2a55da86612a28c9461167d1e696b50180061721 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/SmsService.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/SmsService.java
@@ -8,34 +8,36 @@ import java.util.Map;
 /**
  * @author 作者 zscat E-mail: 951449465@qq.com
  * @version 创建时间：2017年11月12日 上午22:57:51
- * 短信service 
+ * 短信service
  */
 public interface SmsService {
 
-	/**
-	 * 保存短信
-	 * @param sms
-	 * @param params
-	 */
-	void save(Sms sms, Map<String, String> params);
-
-	/**
-	 * 修改短信
-	 * @param sms
-	 */
-	void update(Sms sms);
-
-	/**
-	 * 查询短信
-	 * @param id
-	 * @return
-	 */
-	Sms findById(Long id);
-
-
-
-	/**
-	 * 发送短信
-	 */
-	SendSmsResponse sendSmsMsg(Sms sms);
+    /**
+     * 保存短信
+     *
+     * @param sms
+     * @param params
+     */
+    void save(Sms sms, Map<String, String> params);
+
+    /**
+     * 修改短信
+     *
+     * @param sms
+     */
+    void update(Sms sms);
+
+    /**
+     * 查询短信
+     *
+     * @param id
+     * @return
+     */
+    Sms findById(Long id);
+
+
+    /**
+     * 发送短信
+     */
+    SendSmsResponse sendSmsMsg(Sms sms);
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/RedisUtil.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/RedisUtil.java
index 5fa51d6d4133957903b0477bbd85474e18c86960..5cc33344399a6ea5367651670a83e4082cea6b5f 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/RedisUtil.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/RedisUtil.java
@@ -14,1345 +14,1316 @@ import java.util.concurrent.TimeUnit;
 
 /**
  * Redis工具类
- * 
+ *
  * @author WangFan
- * @date 2018-02-24 下午03:09:50
  * @version 1.1 (GitHub文档: https://github.com/whvcse/RedisUtil )
+ * @date 2018-02-24 下午03:09:50
  */
 @Service
 public class RedisUtil {
-	@Autowired
-	private StringRedisTemplate redisTemplate;
-
-
-	/** -------------------key相关操作--------------------- */
-
-	/**
-	 * 删除key
-	 * 
-	 * @param key
-	 */
-	public void delete(String key) {
-		redisTemplate.delete(key);
-	}
-
-	/**
-	 * 批量删除key
-	 * 
-	 * @param keys
-	 */
-	public void delete(Collection<String> keys) {
-		redisTemplate.delete(keys);
-	}
-
-	/**
-	 * 序列化key
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public byte[] dump(String key) {
-		return redisTemplate.dump(key);
-	}
-
-	/**
-	 * 是否存在key
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public Boolean hasKey(String key) {
-		return redisTemplate.hasKey(key);
-	}
-
-	/**
-	 * 设置过期时间
-	 * 
-	 * @param key
-	 * @param timeout
-	 * @param unit
-	 * @return
-	 */
-	public Boolean expire(String key, long timeout, TimeUnit unit) {
-		return redisTemplate.expire(key, timeout, unit);
-	}
-
-	/**
-	 * 设置过期时间
-	 * 
-	 * @param key
-	 * @param date
-	 * @return
-	 */
-	public Boolean expireAt(String key, Date date) {
-		return redisTemplate.expireAt(key, date);
-	}
-
-	/**
-	 * 查找匹配的key
-	 * 
-	 * @param pattern
-	 * @return
-	 */
-	public Set<String> keys(String pattern) {
-		return redisTemplate.keys(pattern);
-	}
-
-	/**
-	 * 将当前数据库的 key 移动到给定的数据库 db 当中
-	 * 
-	 * @param key
-	 * @param dbIndex
-	 * @return
-	 */
-	public Boolean move(String key, int dbIndex) {
-		return redisTemplate.move(key, dbIndex);
-	}
-
-	/**
-	 * 移除 key 的过期时间，key 将持久保持
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public Boolean persist(String key) {
-		return redisTemplate.persist(key);
-	}
-
-	/**
-	 * 返回 key 的剩余的过期时间
-	 * 
-	 * @param key
-	 * @param unit
-	 * @return
-	 */
-	public Long getExpire(String key, TimeUnit unit) {
-		return redisTemplate.getExpire(key, unit);
-	}
-
-	/**
-	 * 返回 key 的剩余的过期时间
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public Long getExpire(String key) {
-		return redisTemplate.getExpire(key);
-	}
-
-	/**
-	 * 从当前数据库中随机返回一个 key
-	 * 
-	 * @return
-	 */
-	public String randomKey() {
-		return redisTemplate.randomKey();
-	}
-
-	/**
-	 * 修改 key 的名称
-	 * 
-	 * @param oldKey
-	 * @param newKey
-	 */
-	public void rename(String oldKey, String newKey) {
-		redisTemplate.rename(oldKey, newKey);
-	}
-
-	/**
-	 * 仅当 newkey 不存在时，将 oldKey 改名为 newkey
-	 * 
-	 * @param oldKey
-	 * @param newKey
-	 * @return
-	 */
-	public Boolean renameIfAbsent(String oldKey, String newKey) {
-		return redisTemplate.renameIfAbsent(oldKey, newKey);
-	}
-
-	/**
-	 * 返回 key 所储存的值的类型
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public DataType type(String key) {
-		return redisTemplate.type(key);
-	}
-
-	/** -------------------string相关操作--------------------- */
-
-	/**
-	 * 设置指定 key 的值
-	 * @param key
-	 * @param value
-	 */
-	public void set(String key, String value) {
-		redisTemplate.opsForValue().set(key, value);
-	}
-
-	/**
-	 * 获取指定 key 的值
-	 * @param key
-	 * @return
-	 */
-	public String get(String key) {
-		return redisTemplate.opsForValue().get(key);
-	}
-
-	/**
-	 * 返回 key 中字符串值的子字符
-	 * @param key
-	 * @param start
-	 * @param end
-	 * @return
-	 */
-	public String getRange(String key, long start, long end) {
-		return redisTemplate.opsForValue().get(key, start, end);
-	}
-
-	/**
-	 * 将给定 key 的值设为 value ，并返回 key 的旧值(old value)
-	 * 
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public String getAndSet(String key, String value) {
-		return redisTemplate.opsForValue().getAndSet(key, value);
-	}
-
-	/**
-	 * 对 key 所储存的字符串值，获取指定偏移量上的位(bit)
-	 * 
-	 * @param key
-	 * @param offset
-	 * @return
-	 */
-	public Boolean getBit(String key, long offset) {
-		return redisTemplate.opsForValue().getBit(key, offset);
-	}
-
-	/**
-	 * 批量获取
-	 * 
-	 * @param keys
-	 * @return
-	 */
-	public List<String> multiGet(Collection<String> keys) {
-		return redisTemplate.opsForValue().multiGet(keys);
-	}
-
-	/**
-	 * 设置ASCII码, 字符串'a'的ASCII码是97, 转为二进制是'01100001', 此方法是将二进制第offset位值变为value
-	 * 
-	 * @param key
-	 * @param postion
-	 *            位置
-	 * @param value
-	 *            值,true为1, false为0
-	 * @return
-	 */
-	public boolean setBit(String key, long offset, boolean value) {
-		return redisTemplate.opsForValue().setBit(key, offset, value);
-	}
-
-	/**
-	 * 将值 value 关联到 key ，并将 key 的过期时间设为 timeout
-	 * 
-	 * @param key
-	 * @param value
-	 * @param timeout
-	 *            过期时间
-	 * @param unit
-	 *            时间单位, 天:TimeUnit.DAYS 小时:TimeUnit.HOURS 分钟:TimeUnit.MINUTES
-	 *            秒:TimeUnit.SECONDS 毫秒:TimeUnit.MILLISECONDS
-	 */
-	public void setEx(String key, String value, long timeout, TimeUnit unit) {
-		redisTemplate.opsForValue().set(key, value, timeout, unit);
-	}
-
-	/**
-	 * 只有在 key 不存在时设置 key 的值
-	 * 
-	 * @param key
-	 * @param value
-	 * @return 之前已经存在返回false,不存在返回true
-	 */
-	public boolean setIfAbsent(String key, String value) {
-		return redisTemplate.opsForValue().setIfAbsent(key, value);
-	}
-
-	/**
-	 * 用 value 参数覆写给定 key 所储存的字符串值，从偏移量 offset 开始
-	 * 
-	 * @param key
-	 * @param value
-	 * @param offset
-	 *            从指定位置开始覆写
-	 */
-	public void setRange(String key, String value, long offset) {
-		redisTemplate.opsForValue().set(key, value, offset);
-	}
-
-	/**
-	 * 获取字符串的长度
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public Long size(String key) {
-		return redisTemplate.opsForValue().size(key);
-	}
-
-	/**
-	 * 批量添加
-	 * 
-	 * @param maps
-	 */
-	public void multiSet(Map<String, String> maps) {
-		redisTemplate.opsForValue().multiSet(maps);
-	}
-
-	/**
-	 * 同时设置一个或多个 key-value 对，当且仅当所有给定 key 都不存在
-	 * 
-	 * @param maps
-	 * @return 之前已经存在返回false,不存在返回true
-	 */
-	public boolean multiSetIfAbsent(Map<String, String> maps) {
-		return redisTemplate.opsForValue().multiSetIfAbsent(maps);
-	}
-
-	/**
-	 * 增加(自增长), 负数则为自减
-	 * 
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Long incrBy(String key, long increment) {
-		return redisTemplate.opsForValue().increment(key, increment);
-	}
-
-	/**
-	 * 
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Double incrByFloat(String key, double increment) {
-		return redisTemplate.opsForValue().increment(key, increment);
-	}
-
-	/**
-	 * 追加到末尾
-	 * 
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Integer append(String key, String value) {
-		return redisTemplate.opsForValue().append(key, value);
-	}
-
-	/** -------------------hash相关操作------------------------- */
-
-	/**
-	 * 获取存储在哈希表中指定字段的值
-	 * 
-	 * @param key
-	 * @param field
-	 * @return
-	 */
-	public Object hGet(String key, String field) {
-		return redisTemplate.opsForHash().get(key, field);
-	}
-
-	/**
-	 * 获取所有给定字段的值
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public Map<Object, Object> hGetAll(String key) {
-		return redisTemplate.opsForHash().entries(key);
-	}
-
-	/**
-	 * 获取所有给定字段的值
-	 * 
-	 * @param key
-	 * @param fields
-	 * @return
-	 */
-	public List<Object> hMultiGet(String key, Collection<Object> fields) {
-		return redisTemplate.opsForHash().multiGet(key, fields);
-	}
-
-	public void hPut(String key, String hashKey, String  value) {
-		redisTemplate.opsForHash().put(key, hashKey, value);
-	}
-
-	public void hPutAll(String key, Map<String, String> maps) {
-		redisTemplate.opsForHash().putAll(key, maps);
-	}
-
-	/**
-	 * 仅当hashKey不存在时才设置
-	 * 
-	 * @param key
-	 * @param hashKey
-	 * @param value
-	 * @return
-	 */
-	public Boolean hPutIfAbsent(String key, String hashKey, String value) {
-		return redisTemplate.opsForHash().putIfAbsent(key, hashKey, value);
-	}
-
-	/**
-	 * 删除一个或多个哈希表字段
-	 * 
-	 * @param key
-	 * @param fields
-	 * @return
-	 */
-	public Long hDelete(String key, Object... fields) {
-		return redisTemplate.opsForHash().delete(key, fields);
-	}
-
-	/**
-	 * 查看哈希表 key 中，指定的字段是否存在
-	 * 
-	 * @param key
-	 * @param field
-	 * @return
-	 */
-	public boolean hExists(String key, String field) {
-		return redisTemplate.opsForHash().hasKey(key, field);
-	}
-
-	/**
-	 * 为哈希表 key 中的指定字段的整数值加上增量 increment
-	 * 
-	 * @param key
-	 * @param field
-	 * @param increment
-	 * @return
-	 */
-	public Long hIncrBy(String key, Object field, long increment) {
-		return redisTemplate.opsForHash().increment(key, field, increment);
-	}
-
-	/**
-	 * 为哈希表 key 中的指定字段的整数值加上增量 increment
-	 * 
-	 * @param key
-	 * @param field
-	 * @param delta
-	 * @return
-	 */
-	public Double hIncrByFloat(String key, Object field, double delta) {
-		return redisTemplate.opsForHash().increment(key, field, delta);
-	}
-
-	/**
-	 * 获取所有哈希表中的字段
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public Set<Object> hKeys(String key) {
-		return redisTemplate.opsForHash().keys(key);
-	}
-
-	/**
-	 * 获取哈希表中字段的数量
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public Long hSize(String key) {
-		return redisTemplate.opsForHash().size(key);
-	}
-
-	/**
-	 * 获取哈希表中所有值
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public List<Object> hValues(String key) {
-		return redisTemplate.opsForHash().values(key);
-	}
-
-	/**
-	 * 迭代哈希表中的键值对
-	 * 
-	 * @param key
-	 * @param options
-	 * @return
-	 */
-	public Cursor<Entry<Object, Object>> hScan(String key, ScanOptions options) {
-		return redisTemplate.opsForHash().scan(key, options);
-	}
-
-	/** ------------------------list相关操作---------------------------- */
-
-	/**
-	 * 通过索引获取列表中的元素
-	 * 
-	 * @param key
-	 * @param index
-	 * @return
-	 */
-	public String lIndex(String key, long index) {
-		return redisTemplate.opsForList().index(key, index);
-	}
-
-	/**
-	 * 获取列表指定范围内的元素
-	 * 
-	 * @param key
-	 * @param start
-	 *            开始位置, 0是开始位置
-	 * @param end
-	 *            结束位置, -1返回所有
-	 * @return
-	 */
-	public List<String> lRange(String key, long start, long end) {
-		return redisTemplate.opsForList().range(key, start, end);
-	}
-
-	/**
-	 * 存储在list头部
-	 * 
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Long lLeftPush(String key, String value) {
-		return redisTemplate.opsForList().leftPush(key, value);
-	}
-
-	/**
-	 * 
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Long lLeftPushAll(String key, String... value) {
-		return redisTemplate.opsForList().leftPushAll(key, value);
-	}
-
-	/**
-	 * 
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Long lLeftPushAll(String key, Collection<String> value) {
-		return redisTemplate.opsForList().leftPushAll(key, value);
-	}
-
-	/**
-	 * 当list存在的时候才加入
-	 * 
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Long lLeftPushIfPresent(String key, String value) {
-		return redisTemplate.opsForList().leftPushIfPresent(key, value);
-	}
-
-	/**
-	 * 如果pivot存在,再pivot前面添加
-	 * 
-	 * @param key
-	 * @param pivot
-	 * @param value
-	 * @return
-	 */
-	public Long lLeftPush(String key, String pivot, String value) {
-		return redisTemplate.opsForList().leftPush(key, pivot, value);
-	}
-
-	/**
-	 * 
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Long lRightPush(String key, String value) {
-		return redisTemplate.opsForList().rightPush(key, value);
-	}
-
-	/**
-	 * 
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Long lRightPushAll(String key, String... value) {
-		return redisTemplate.opsForList().rightPushAll(key, value);
-	}
-
-	/**
-	 * 
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Long lRightPushAll(String key, Collection<String> value) {
-		return redisTemplate.opsForList().rightPushAll(key, value);
-	}
-
-	/**
-	 * 为已存在的列表添加值
-	 * 
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Long lRightPushIfPresent(String key, String value) {
-		return redisTemplate.opsForList().rightPushIfPresent(key, value);
-	}
-
-	/**
-	 * 在pivot元素的右边添加值
-	 * 
-	 * @param key
-	 * @param pivot
-	 * @param value
-	 * @return
-	 */
-	public Long lRightPush(String key, String pivot, String value) {
-		return redisTemplate.opsForList().rightPush(key, pivot, value);
-	}
-
-	/**
-	 * 通过索引设置列表元素的值
-	 * 
-	 * @param key
-	 * @param index
-	 *            位置
-	 * @param value
-	 */
-	public void lSet(String key, long index, String value) {
-		redisTemplate.opsForList().set(key, index, value);
-	}
-
-	/**
-	 * 移出并获取列表的第一个元素
-	 * 
-	 * @param key
-	 * @return 删除的元素
-	 */
-	public String lLeftPop(String key) {
-		return redisTemplate.opsForList().leftPop(key);
-	}
-
-	/**
-	 * 移出并获取列表的第一个元素， 如果列表没有元素会阻塞列表直到等待超时或发现可弹出元素为止
-	 * 
-	 * @param key
-	 * @param timeout
-	 *            等待时间
-	 * @param unit
-	 *            时间单位
-	 * @return
-	 */
-	public String lBLeftPop(String key, long timeout, TimeUnit unit) {
-		return redisTemplate.opsForList().leftPop(key, timeout, unit);
-	}
-
-	/**
-	 * 移除并获取列表最后一个元素
-	 * 
-	 * @param key
-	 * @return 删除的元素
-	 */
-	public String lRightPop(String key) {
-		return redisTemplate.opsForList().rightPop(key);
-	}
-
-	/**
-	 * 移出并获取列表的最后一个元素， 如果列表没有元素会阻塞列表直到等待超时或发现可弹出元素为止
-	 * 
-	 * @param key
-	 * @param timeout
-	 *            等待时间
-	 * @param unit
-	 *            时间单位
-	 * @return
-	 */
-	public String lBRightPop(String key, long timeout, TimeUnit unit) {
-		return redisTemplate.opsForList().rightPop(key, timeout, unit);
-	}
-
-	/**
-	 * 移除列表的最后一个元素，并将该元素添加到另一个列表并返回
-	 * 
-	 * @param sourceKey
-	 * @param destinationKey
-	 * @return
-	 */
-	public String lRightPopAndLeftPush(String sourceKey, String destinationKey) {
-		return redisTemplate.opsForList().rightPopAndLeftPush(sourceKey,
-				destinationKey);
-	}
-
-	/**
-	 * 从列表中弹出一个值，将弹出的元素插入到另外一个列表中并返回它； 如果列表没有元素会阻塞列表直到等待超时或发现可弹出元素为止
-	 * 
-	 * @param sourceKey
-	 * @param destinationKey
-	 * @param timeout
-	 * @param unit
-	 * @return
-	 */
-	public String lBRightPopAndLeftPush(String sourceKey, String destinationKey,
-			long timeout, TimeUnit unit) {
-		return redisTemplate.opsForList().rightPopAndLeftPush(sourceKey,
-				destinationKey, timeout, unit);
-	}
-
-	/**
-	 * 删除集合中值等于value得元素
-	 * 
-	 * @param key
-	 * @param index
-	 *            index=0, 删除所有值等于value的元素; index>0, 从头部开始删除第一个值等于value的元素;
-	 *            index<0, 从尾部开始删除第一个值等于value的元素;
-	 * @param value
-	 * @return
-	 */
-	public Long lRemove(String key, long index, String value) {
-		return redisTemplate.opsForList().remove(key, index, value);
-	}
-
-	/**
-	 * 裁剪list
-	 * 
-	 * @param key
-	 * @param start
-	 * @param end
-	 */
-	public void lTrim(String key, long start, long end) {
-		redisTemplate.opsForList().trim(key, start, end);
-	}
-
-	/**
-	 * 获取列表长度
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public Long lLen(String key) {
-		return redisTemplate.opsForList().size(key);
-	}
-
-	/** --------------------set相关操作-------------------------- */
-
-	/**
-	 * set添加元素
-	 * 
-	 * @param key
-	 * @param values
-	 * @return
-	 */
-	public Long sAdd(String key, String... values) {
-		return redisTemplate.opsForSet().add(key, values);
-	}
-
-	/**
-	 * set移除元素
-	 * 
-	 * @param key
-	 * @param values
-	 * @return
-	 */
-	public Long sRemove(String key, Object... values) {
-		return redisTemplate.opsForSet().remove(key, values);
-	}
-
-	/**
-	 * 移除并返回集合的一个随机元素
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public String sPop(String key) {
-		return redisTemplate.opsForSet().pop(key);
-	}
-
-	/**
-	 * 将元素value从一个集合移到另一个集合
-	 * 
-	 * @param key
-	 * @param value
-	 * @param destKey
-	 * @return
-	 */
-	public Boolean sMove(String key, String value, String destKey) {
-		return redisTemplate.opsForSet().move(key, value, destKey);
-	}
-
-	/**
-	 * 获取集合的大小
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public Long sSize(String key) {
-		return redisTemplate.opsForSet().size(key);
-	}
-
-	/**
-	 * 判断集合是否包含value
-	 * 
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Boolean sIsMember(String key, Object value) {
-		return redisTemplate.opsForSet().isMember(key, value);
-	}
-
-	/**
-	 * 获取两个集合的交集
-	 * 
-	 * @param key
-	 * @param otherKey
-	 * @return
-	 */
-	public Set<String> sIntersect(String key, String otherKey) {
-		return redisTemplate.opsForSet().intersect(key, otherKey);
-	}
-
-	/**
-	 * 获取key集合与多个集合的交集
-	 * 
-	 * @param key
-	 * @param otherKeys
-	 * @return
-	 */
-	public Set<String> sIntersect(String key, Collection<String> otherKeys) {
-		return redisTemplate.opsForSet().intersect(key, otherKeys);
-	}
-
-	/**
-	 * key集合与otherKey集合的交集存储到destKey集合中
-	 * 
-	 * @param key
-	 * @param otherKey
-	 * @param destKey
-	 * @return
-	 */
-	public Long sIntersectAndStore(String key, String otherKey, String destKey) {
-		return redisTemplate.opsForSet().intersectAndStore(key, otherKey,
-				destKey);
-	}
-
-	/**
-	 * key集合与多个集合的交集存储到destKey集合中
-	 * 
-	 * @param key
-	 * @param otherKeys
-	 * @param destKey
-	 * @return
-	 */
-	public Long sIntersectAndStore(String key, Collection<String> otherKeys,
-			String destKey) {
-		return redisTemplate.opsForSet().intersectAndStore(key, otherKeys,
-				destKey);
-	}
-
-	/**
-	 * 获取两个集合的并集
-	 * 
-	 * @param key
-	 * @param otherKeys
-	 * @return
-	 */
-	public Set<String> sUnion(String key, String otherKeys) {
-		return redisTemplate.opsForSet().union(key, otherKeys);
-	}
-
-	/**
-	 * 获取key集合与多个集合的并集
-	 * 
-	 * @param key
-	 * @param otherKeys
-	 * @return
-	 */
-	public Set<String> sUnion(String key, Collection<String> otherKeys) {
-		return redisTemplate.opsForSet().union(key, otherKeys);
-	}
-
-	/**
-	 * key集合与otherKey集合的并集存储到destKey中
-	 * 
-	 * @param key
-	 * @param otherKey
-	 * @param destKey
-	 * @return
-	 */
-	public Long sUnionAndStore(String key, String otherKey, String destKey) {
-		return redisTemplate.opsForSet().unionAndStore(key, otherKey, destKey);
-	}
-
-	/**
-	 * key集合与多个集合的并集存储到destKey中
-	 * 
-	 * @param key
-	 * @param otherKeys
-	 * @param destKey
-	 * @return
-	 */
-	public Long sUnionAndStore(String key, Collection<String> otherKeys,
-			String destKey) {
-		return redisTemplate.opsForSet().unionAndStore(key, otherKeys, destKey);
-	}
-
-	/**
-	 * 获取两个集合的差集
-	 * 
-	 * @param key
-	 * @param otherKey
-	 * @return
-	 */
-	public Set<String> sDifference(String key, String otherKey) {
-		return redisTemplate.opsForSet().difference(key, otherKey);
-	}
-
-	/**
-	 * 获取key集合与多个集合的差集
-	 * 
-	 * @param key
-	 * @param otherKeys
-	 * @return
-	 */
-	public Set<String> sDifference(String key, Collection<String> otherKeys) {
-		return redisTemplate.opsForSet().difference(key, otherKeys);
-	}
-
-	/**
-	 * key集合与otherKey集合的差集存储到destKey中
-	 * 
-	 * @param key
-	 * @param otherKey
-	 * @param destKey
-	 * @return
-	 */
-	public Long sDifference(String key, String otherKey, String destKey) {
-		return redisTemplate.opsForSet().differenceAndStore(key, otherKey,
-				destKey);
-	}
-
-	/**
-	 * key集合与多个集合的差集存储到destKey中
-	 * 
-	 * @param key
-	 * @param otherKeys
-	 * @param destKey
-	 * @return
-	 */
-	public Long sDifference(String key, Collection<String> otherKeys,
-			String destKey) {
-		return redisTemplate.opsForSet().differenceAndStore(key, otherKeys,
-				destKey);
-	}
-
-	/**
-	 * 获取集合所有元素
-	 * 
-	 * @param key
-	 * @param otherKeys
-	 * @param destKey
-	 * @return
-	 */
-	public Set<String> setMembers(String key) {
-		return redisTemplate.opsForSet().members(key);
-	}
-
-	/**
-	 * 随机获取集合中的一个元素
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public String sRandomMember(String key) {
-		return redisTemplate.opsForSet().randomMember(key);
-	}
-
-	/**
-	 * 随机获取集合中count个元素
-	 * 
-	 * @param key
-	 * @param count
-	 * @return
-	 */
-	public List<String> sRandomMembers(String key, long count) {
-		return redisTemplate.opsForSet().randomMembers(key, count);
-	}
-
-	/**
-	 * 随机获取集合中count个元素并且去除重复的
-	 * 
-	 * @param key
-	 * @param count
-	 * @return
-	 */
-	public Set<String> sDistinctRandomMembers(String key, long count) {
-		return redisTemplate.opsForSet().distinctRandomMembers(key, count);
-	}
-
-	/**
-	 * 
-	 * @param key
-	 * @param options
-	 * @return
-	 */
-	public Cursor<String> sScan(String key, ScanOptions options) {
-		return redisTemplate.opsForSet().scan(key, options);
-	}
-
-	/**------------------zSet相关操作--------------------------------*/
-	
-	/**
-	 * 添加元素,有序集合是按照元素的score值由小到大排列
-	 * 
-	 * @param key
-	 * @param value
-	 * @param score
-	 * @return
-	 */
-	public Boolean zAdd(String key, String value, double score) {
-		return redisTemplate.opsForZSet().add(key, value, score);
-	}
-
-	/**
-	 * 
-	 * @param key
-	 * @param values
-	 * @return
-	 */
-	public Long zAdd(String key, Set<TypedTuple<String>> values) {
-		return redisTemplate.opsForZSet().add(key, values);
-	}
-
-	/**
-	 * 
-	 * @param key
-	 * @param values
-	 * @return
-	 */
-	public Long zRemove(String key, Object... values) {
-		return redisTemplate.opsForZSet().remove(key, values);
-	}
-
-	/**
-	 * 增加元素的score值，并返回增加后的值
-	 * 
-	 * @param key
-	 * @param value
-	 * @param delta
-	 * @return
-	 */
-	public Double zIncrementScore(String key, String value, double delta) {
-		return redisTemplate.opsForZSet().incrementScore(key, value, delta);
-	}
-
-	/**
-	 * 返回元素在集合的排名,有序集合是按照元素的score值由小到大排列
-	 * 
-	 * @param key
-	 * @param value
-	 * @return 0表示第一位
-	 */
-	public Long zRank(String key, Object value) {
-		return redisTemplate.opsForZSet().rank(key, value);
-	}
-
-	/**
-	 * 返回元素在集合的排名,按元素的score值由大到小排列
-	 * 
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Long zReverseRank(String key, Object value) {
-		return redisTemplate.opsForZSet().reverseRank(key, value);
-	}
-
-	/**
-	 * 获取集合的元素, 从小到大排序
-	 * 
-	 * @param key
-	 * @param start
-	 *            开始位置
-	 * @param end
-	 *            结束位置, -1查询所有
-	 * @return
-	 */
-	public Set<String> zRange(String key, long start, long end) {
-		return redisTemplate.opsForZSet().range(key, start, end);
-	}
-
-	/**
-	 * 获取集合元素, 并且把score值也获取
-	 * 
-	 * @param key
-	 * @param start
-	 * @param end
-	 * @return
-	 */
-	public Set<TypedTuple<String>> zRangeWithScores(String key, long start,
-			long end) {
-		return redisTemplate.opsForZSet().rangeWithScores(key, start, end);
-	}
-
-	/**
-	 * 根据Score值查询集合元素
-	 * 
-	 * @param key
-	 * @param min
-	 *            最小值
-	 * @param max
-	 *            最大值
-	 * @return
-	 */
-	public Set<String> zRangeByScore(String key, double min, double max) {
-		return redisTemplate.opsForZSet().rangeByScore(key, min, max);
-	}
-
-	/**
-	 * 根据Score值查询集合元素, 从小到大排序
-	 * 
-	 * @param key
-	 * @param min
-	 *            最小值
-	 * @param max
-	 *            最大值
-	 * @return
-	 */
-	public Set<TypedTuple<String>> zRangeByScoreWithScores(String key,
-			double min, double max) {
-		return redisTemplate.opsForZSet().rangeByScoreWithScores(key, min, max);
-	}
-
-	/**
-	 * 
-	 * @param key
-	 * @param min
-	 * @param max
-	 * @param start
-	 * @param end
-	 * @return
-	 */
-	public Set<TypedTuple<String>> zRangeByScoreWithScores(String key,
-			double min, double max, long start, long end) {
-		return redisTemplate.opsForZSet().rangeByScoreWithScores(key, min, max,
-				start, end);
-	}
-
-	/**
-	 * 获取集合的元素, 从大到小排序
-	 * 
-	 * @param key
-	 * @param start
-	 * @param end
-	 * @return
-	 */
-	public Set<String> zReverseRange(String key, long start, long end) {
-		return redisTemplate.opsForZSet().reverseRange(key, start, end);
-	}
-
-	/**
-	 * 获取集合的元素, 从大到小排序, 并返回score值
-	 * 
-	 * @param key
-	 * @param start
-	 * @param end
-	 * @return
-	 */
-	public Set<TypedTuple<String>> zReverseRangeWithScores(String key,
-			long start, long end) {
-		return redisTemplate.opsForZSet().reverseRangeWithScores(key, start,
-				end);
-	}
-
-	/**
-	 * 根据Score值查询集合元素, 从大到小排序
-	 * 
-	 * @param key
-	 * @param min
-	 * @param max
-	 * @return
-	 */
-	public Set<String> zReverseRangeByScore(String key, double min,
-			double max) {
-		return redisTemplate.opsForZSet().reverseRangeByScore(key, min, max);
-	}
-
-	/**
-	 * 根据Score值查询集合元素, 从大到小排序
-	 * 
-	 * @param key
-	 * @param min
-	 * @param max
-	 * @return
-	 */
-	public Set<TypedTuple<String>> zReverseRangeByScoreWithScores(
-			String key, double min, double max) {
-		return redisTemplate.opsForZSet().reverseRangeByScoreWithScores(key,
-				min, max);
-	}
-
-	/**
-	 * 
-	 * @param key
-	 * @param min
-	 * @param max
-	 * @param start
-	 * @param end
-	 * @return
-	 */
-	public Set<String> zReverseRangeByScore(String key, double min,
-			double max, long start, long end) {
-		return redisTemplate.opsForZSet().reverseRangeByScore(key, min, max,
-				start, end);
-	}
-
-	/**
-	 * 根据score值获取集合元素数量
-	 * 
-	 * @param key
-	 * @param min
-	 * @param max
-	 * @return
-	 */
-	public Long zCount(String key, double min, double max) {
-		return redisTemplate.opsForZSet().count(key, min, max);
-	}
-
-	/**
-	 * 获取集合大小
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public Long zSize(String key) {
-		return redisTemplate.opsForZSet().size(key);
-	}
-
-	/**
-	 * 获取集合大小
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public Long zZCard(String key) {
-		return redisTemplate.opsForZSet().zCard(key);
-	}
-
-	/**
-	 * 获取集合中value元素的score值
-	 * 
-	 * @param key
-	 * @param value
-	 * @return
-	 */
-	public Double zScore(String key, Object value) {
-		return redisTemplate.opsForZSet().score(key, value);
-	}
-
-	/**
-	 * 移除指定索引位置的成员
-	 * 
-	 * @param key
-	 * @param start
-	 * @param end
-	 * @return
-	 */
-	public Long zRemoveRange(String key, long start, long end) {
-		return redisTemplate.opsForZSet().removeRange(key, start, end);
-	}
-
-	/**
-	 * 根据指定的score值的范围来移除成员
-	 * 
-	 * @param key
-	 * @param min
-	 * @param max
-	 * @return
-	 */
-	public Long zRemoveRangeByScore(String key, double min, double max) {
-		return redisTemplate.opsForZSet().removeRangeByScore(key, min, max);
-	}
-
-	/**
-	 * 获取key和otherKey的并集并存储在destKey中
-	 * 
-	 * @param key
-	 * @param otherKey
-	 * @param destKey
-	 * @return
-	 */
-	public Long zUnionAndStore(String key, String otherKey, String destKey) {
-		return redisTemplate.opsForZSet().unionAndStore(key, otherKey, destKey);
-	}
-
-	/**
-	 * 
-	 * @param key
-	 * @param otherKeys
-	 * @param destKey
-	 * @return
-	 */
-	public Long zUnionAndStore(String key, Collection<String> otherKeys,
-			String destKey) {
-		return redisTemplate.opsForZSet()
-				.unionAndStore(key, otherKeys, destKey);
-	}
-
-	/**
-	 * 交集
-	 * 
-	 * @param key
-	 * @param otherKey
-	 * @param destKey
-	 * @return
-	 */
-	public Long zIntersectAndStore(String key, String otherKey,
-			String destKey) {
-		return redisTemplate.opsForZSet().intersectAndStore(key, otherKey,
-				destKey);
-	}
-
-	/**
-	 * 交集
-	 * 
-	 * @param key
-	 * @param otherKeys
-	 * @param destKey
-	 * @return
-	 */
-	public Long zIntersectAndStore(String key, Collection<String> otherKeys,
-			String destKey) {
-		return redisTemplate.opsForZSet().intersectAndStore(key, otherKeys,
-				destKey);
-	}
-
-	/**
-	 * 
-	 * @param key
-	 * @param options
-	 * @return
-	 */
-	public Cursor<TypedTuple<String>> zScan(String key, ScanOptions options) {
-		return redisTemplate.opsForZSet().scan(key, options);
-	}
-}
\ No newline at end of file
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+
+
+    /** -------------------key相关操作--------------------- */
+
+    /**
+     * 删除key
+     *
+     * @param key
+     */
+    public void delete(String key) {
+        redisTemplate.delete(key);
+    }
+
+    /**
+     * 批量删除key
+     *
+     * @param keys
+     */
+    public void delete(Collection<String> keys) {
+        redisTemplate.delete(keys);
+    }
+
+    /**
+     * 序列化key
+     *
+     * @param key
+     * @return
+     */
+    public byte[] dump(String key) {
+        return redisTemplate.dump(key);
+    }
+
+    /**
+     * 是否存在key
+     *
+     * @param key
+     * @return
+     */
+    public Boolean hasKey(String key) {
+        return redisTemplate.hasKey(key);
+    }
+
+    /**
+     * 设置过期时间
+     *
+     * @param key
+     * @param timeout
+     * @param unit
+     * @return
+     */
+    public Boolean expire(String key, long timeout, TimeUnit unit) {
+        return redisTemplate.expire(key, timeout, unit);
+    }
+
+    /**
+     * 设置过期时间
+     *
+     * @param key
+     * @param date
+     * @return
+     */
+    public Boolean expireAt(String key, Date date) {
+        return redisTemplate.expireAt(key, date);
+    }
+
+    /**
+     * 查找匹配的key
+     *
+     * @param pattern
+     * @return
+     */
+    public Set<String> keys(String pattern) {
+        return redisTemplate.keys(pattern);
+    }
+
+    /**
+     * 将当前数据库的 key 移动到给定的数据库 db 当中
+     *
+     * @param key
+     * @param dbIndex
+     * @return
+     */
+    public Boolean move(String key, int dbIndex) {
+        return redisTemplate.move(key, dbIndex);
+    }
+
+    /**
+     * 移除 key 的过期时间，key 将持久保持
+     *
+     * @param key
+     * @return
+     */
+    public Boolean persist(String key) {
+        return redisTemplate.persist(key);
+    }
+
+    /**
+     * 返回 key 的剩余的过期时间
+     *
+     * @param key
+     * @param unit
+     * @return
+     */
+    public Long getExpire(String key, TimeUnit unit) {
+        return redisTemplate.getExpire(key, unit);
+    }
+
+    /**
+     * 返回 key 的剩余的过期时间
+     *
+     * @param key
+     * @return
+     */
+    public Long getExpire(String key) {
+        return redisTemplate.getExpire(key);
+    }
+
+    /**
+     * 从当前数据库中随机返回一个 key
+     *
+     * @return
+     */
+    public String randomKey() {
+        return redisTemplate.randomKey();
+    }
+
+    /**
+     * 修改 key 的名称
+     *
+     * @param oldKey
+     * @param newKey
+     */
+    public void rename(String oldKey, String newKey) {
+        redisTemplate.rename(oldKey, newKey);
+    }
+
+    /**
+     * 仅当 newkey 不存在时，将 oldKey 改名为 newkey
+     *
+     * @param oldKey
+     * @param newKey
+     * @return
+     */
+    public Boolean renameIfAbsent(String oldKey, String newKey) {
+        return redisTemplate.renameIfAbsent(oldKey, newKey);
+    }
+
+    /**
+     * 返回 key 所储存的值的类型
+     *
+     * @param key
+     * @return
+     */
+    public DataType type(String key) {
+        return redisTemplate.type(key);
+    }
+
+    /** -------------------string相关操作--------------------- */
+
+    /**
+     * 设置指定 key 的值
+     *
+     * @param key
+     * @param value
+     */
+    public void set(String key, String value) {
+        redisTemplate.opsForValue().set(key, value);
+    }
+
+    /**
+     * 获取指定 key 的值
+     *
+     * @param key
+     * @return
+     */
+    public String get(String key) {
+        return redisTemplate.opsForValue().get(key);
+    }
+
+    /**
+     * 返回 key 中字符串值的子字符
+     *
+     * @param key
+     * @param start
+     * @param end
+     * @return
+     */
+    public String getRange(String key, long start, long end) {
+        return redisTemplate.opsForValue().get(key, start, end);
+    }
+
+    /**
+     * 将给定 key 的值设为 value ，并返回 key 的旧值(old value)
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public String getAndSet(String key, String value) {
+        return redisTemplate.opsForValue().getAndSet(key, value);
+    }
+
+    /**
+     * 对 key 所储存的字符串值，获取指定偏移量上的位(bit)
+     *
+     * @param key
+     * @param offset
+     * @return
+     */
+    public Boolean getBit(String key, long offset) {
+        return redisTemplate.opsForValue().getBit(key, offset);
+    }
+
+    /**
+     * 批量获取
+     *
+     * @param keys
+     * @return
+     */
+    public List<String> multiGet(Collection<String> keys) {
+        return redisTemplate.opsForValue().multiGet(keys);
+    }
+
+    /**
+     * 设置ASCII码, 字符串'a'的ASCII码是97, 转为二进制是'01100001', 此方法是将二进制第offset位值变为value
+     *
+     * @param key
+     * @param postion 位置
+     * @param value   值,true为1, false为0
+     * @return
+     */
+    public boolean setBit(String key, long offset, boolean value) {
+        return redisTemplate.opsForValue().setBit(key, offset, value);
+    }
+
+    /**
+     * 将值 value 关联到 key ，并将 key 的过期时间设为 timeout
+     *
+     * @param key
+     * @param value
+     * @param timeout 过期时间
+     * @param unit    时间单位, 天:TimeUnit.DAYS 小时:TimeUnit.HOURS 分钟:TimeUnit.MINUTES
+     *                秒:TimeUnit.SECONDS 毫秒:TimeUnit.MILLISECONDS
+     */
+    public void setEx(String key, String value, long timeout, TimeUnit unit) {
+        redisTemplate.opsForValue().set(key, value, timeout, unit);
+    }
+
+    /**
+     * 只有在 key 不存在时设置 key 的值
+     *
+     * @param key
+     * @param value
+     * @return 之前已经存在返回false, 不存在返回true
+     */
+    public boolean setIfAbsent(String key, String value) {
+        return redisTemplate.opsForValue().setIfAbsent(key, value);
+    }
+
+    /**
+     * 用 value 参数覆写给定 key 所储存的字符串值，从偏移量 offset 开始
+     *
+     * @param key
+     * @param value
+     * @param offset 从指定位置开始覆写
+     */
+    public void setRange(String key, String value, long offset) {
+        redisTemplate.opsForValue().set(key, value, offset);
+    }
+
+    /**
+     * 获取字符串的长度
+     *
+     * @param key
+     * @return
+     */
+    public Long size(String key) {
+        return redisTemplate.opsForValue().size(key);
+    }
+
+    /**
+     * 批量添加
+     *
+     * @param maps
+     */
+    public void multiSet(Map<String, String> maps) {
+        redisTemplate.opsForValue().multiSet(maps);
+    }
+
+    /**
+     * 同时设置一个或多个 key-value 对，当且仅当所有给定 key 都不存在
+     *
+     * @param maps
+     * @return 之前已经存在返回false, 不存在返回true
+     */
+    public boolean multiSetIfAbsent(Map<String, String> maps) {
+        return redisTemplate.opsForValue().multiSetIfAbsent(maps);
+    }
+
+    /**
+     * 增加(自增长), 负数则为自减
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long incrBy(String key, long increment) {
+        return redisTemplate.opsForValue().increment(key, increment);
+    }
+
+    /**
+     * @param key
+     * @param value
+     * @return
+     */
+    public Double incrByFloat(String key, double increment) {
+        return redisTemplate.opsForValue().increment(key, increment);
+    }
+
+    /**
+     * 追加到末尾
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Integer append(String key, String value) {
+        return redisTemplate.opsForValue().append(key, value);
+    }
+
+    /** -------------------hash相关操作------------------------- */
+
+    /**
+     * 获取存储在哈希表中指定字段的值
+     *
+     * @param key
+     * @param field
+     * @return
+     */
+    public Object hGet(String key, String field) {
+        return redisTemplate.opsForHash().get(key, field);
+    }
+
+    /**
+     * 获取所有给定字段的值
+     *
+     * @param key
+     * @return
+     */
+    public Map<Object, Object> hGetAll(String key) {
+        return redisTemplate.opsForHash().entries(key);
+    }
+
+    /**
+     * 获取所有给定字段的值
+     *
+     * @param key
+     * @param fields
+     * @return
+     */
+    public List<Object> hMultiGet(String key, Collection<Object> fields) {
+        return redisTemplate.opsForHash().multiGet(key, fields);
+    }
+
+    public void hPut(String key, String hashKey, String value) {
+        redisTemplate.opsForHash().put(key, hashKey, value);
+    }
+
+    public void hPutAll(String key, Map<String, String> maps) {
+        redisTemplate.opsForHash().putAll(key, maps);
+    }
+
+    /**
+     * 仅当hashKey不存在时才设置
+     *
+     * @param key
+     * @param hashKey
+     * @param value
+     * @return
+     */
+    public Boolean hPutIfAbsent(String key, String hashKey, String value) {
+        return redisTemplate.opsForHash().putIfAbsent(key, hashKey, value);
+    }
+
+    /**
+     * 删除一个或多个哈希表字段
+     *
+     * @param key
+     * @param fields
+     * @return
+     */
+    public Long hDelete(String key, Object... fields) {
+        return redisTemplate.opsForHash().delete(key, fields);
+    }
+
+    /**
+     * 查看哈希表 key 中，指定的字段是否存在
+     *
+     * @param key
+     * @param field
+     * @return
+     */
+    public boolean hExists(String key, String field) {
+        return redisTemplate.opsForHash().hasKey(key, field);
+    }
+
+    /**
+     * 为哈希表 key 中的指定字段的整数值加上增量 increment
+     *
+     * @param key
+     * @param field
+     * @param increment
+     * @return
+     */
+    public Long hIncrBy(String key, Object field, long increment) {
+        return redisTemplate.opsForHash().increment(key, field, increment);
+    }
+
+    /**
+     * 为哈希表 key 中的指定字段的整数值加上增量 increment
+     *
+     * @param key
+     * @param field
+     * @param delta
+     * @return
+     */
+    public Double hIncrByFloat(String key, Object field, double delta) {
+        return redisTemplate.opsForHash().increment(key, field, delta);
+    }
+
+    /**
+     * 获取所有哈希表中的字段
+     *
+     * @param key
+     * @return
+     */
+    public Set<Object> hKeys(String key) {
+        return redisTemplate.opsForHash().keys(key);
+    }
+
+    /**
+     * 获取哈希表中字段的数量
+     *
+     * @param key
+     * @return
+     */
+    public Long hSize(String key) {
+        return redisTemplate.opsForHash().size(key);
+    }
+
+    /**
+     * 获取哈希表中所有值
+     *
+     * @param key
+     * @return
+     */
+    public List<Object> hValues(String key) {
+        return redisTemplate.opsForHash().values(key);
+    }
+
+    /**
+     * 迭代哈希表中的键值对
+     *
+     * @param key
+     * @param options
+     * @return
+     */
+    public Cursor<Entry<Object, Object>> hScan(String key, ScanOptions options) {
+        return redisTemplate.opsForHash().scan(key, options);
+    }
+
+    /** ------------------------list相关操作---------------------------- */
+
+    /**
+     * 通过索引获取列表中的元素
+     *
+     * @param key
+     * @param index
+     * @return
+     */
+    public String lIndex(String key, long index) {
+        return redisTemplate.opsForList().index(key, index);
+    }
+
+    /**
+     * 获取列表指定范围内的元素
+     *
+     * @param key
+     * @param start 开始位置, 0是开始位置
+     * @param end   结束位置, -1返回所有
+     * @return
+     */
+    public List<String> lRange(String key, long start, long end) {
+        return redisTemplate.opsForList().range(key, start, end);
+    }
+
+    /**
+     * 存储在list头部
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lLeftPush(String key, String value) {
+        return redisTemplate.opsForList().leftPush(key, value);
+    }
+
+    /**
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lLeftPushAll(String key, String... value) {
+        return redisTemplate.opsForList().leftPushAll(key, value);
+    }
+
+    /**
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lLeftPushAll(String key, Collection<String> value) {
+        return redisTemplate.opsForList().leftPushAll(key, value);
+    }
+
+    /**
+     * 当list存在的时候才加入
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lLeftPushIfPresent(String key, String value) {
+        return redisTemplate.opsForList().leftPushIfPresent(key, value);
+    }
+
+    /**
+     * 如果pivot存在,再pivot前面添加
+     *
+     * @param key
+     * @param pivot
+     * @param value
+     * @return
+     */
+    public Long lLeftPush(String key, String pivot, String value) {
+        return redisTemplate.opsForList().leftPush(key, pivot, value);
+    }
+
+    /**
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lRightPush(String key, String value) {
+        return redisTemplate.opsForList().rightPush(key, value);
+    }
+
+    /**
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lRightPushAll(String key, String... value) {
+        return redisTemplate.opsForList().rightPushAll(key, value);
+    }
+
+    /**
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lRightPushAll(String key, Collection<String> value) {
+        return redisTemplate.opsForList().rightPushAll(key, value);
+    }
+
+    /**
+     * 为已存在的列表添加值
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lRightPushIfPresent(String key, String value) {
+        return redisTemplate.opsForList().rightPushIfPresent(key, value);
+    }
+
+    /**
+     * 在pivot元素的右边添加值
+     *
+     * @param key
+     * @param pivot
+     * @param value
+     * @return
+     */
+    public Long lRightPush(String key, String pivot, String value) {
+        return redisTemplate.opsForList().rightPush(key, pivot, value);
+    }
+
+    /**
+     * 通过索引设置列表元素的值
+     *
+     * @param key
+     * @param index 位置
+     * @param value
+     */
+    public void lSet(String key, long index, String value) {
+        redisTemplate.opsForList().set(key, index, value);
+    }
+
+    /**
+     * 移出并获取列表的第一个元素
+     *
+     * @param key
+     * @return 删除的元素
+     */
+    public String lLeftPop(String key) {
+        return redisTemplate.opsForList().leftPop(key);
+    }
+
+    /**
+     * 移出并获取列表的第一个元素， 如果列表没有元素会阻塞列表直到等待超时或发现可弹出元素为止
+     *
+     * @param key
+     * @param timeout 等待时间
+     * @param unit    时间单位
+     * @return
+     */
+    public String lBLeftPop(String key, long timeout, TimeUnit unit) {
+        return redisTemplate.opsForList().leftPop(key, timeout, unit);
+    }
+
+    /**
+     * 移除并获取列表最后一个元素
+     *
+     * @param key
+     * @return 删除的元素
+     */
+    public String lRightPop(String key) {
+        return redisTemplate.opsForList().rightPop(key);
+    }
+
+    /**
+     * 移出并获取列表的最后一个元素， 如果列表没有元素会阻塞列表直到等待超时或发现可弹出元素为止
+     *
+     * @param key
+     * @param timeout 等待时间
+     * @param unit    时间单位
+     * @return
+     */
+    public String lBRightPop(String key, long timeout, TimeUnit unit) {
+        return redisTemplate.opsForList().rightPop(key, timeout, unit);
+    }
+
+    /**
+     * 移除列表的最后一个元素，并将该元素添加到另一个列表并返回
+     *
+     * @param sourceKey
+     * @param destinationKey
+     * @return
+     */
+    public String lRightPopAndLeftPush(String sourceKey, String destinationKey) {
+        return redisTemplate.opsForList().rightPopAndLeftPush(sourceKey,
+                destinationKey);
+    }
+
+    /**
+     * 从列表中弹出一个值，将弹出的元素插入到另外一个列表中并返回它； 如果列表没有元素会阻塞列表直到等待超时或发现可弹出元素为止
+     *
+     * @param sourceKey
+     * @param destinationKey
+     * @param timeout
+     * @param unit
+     * @return
+     */
+    public String lBRightPopAndLeftPush(String sourceKey, String destinationKey,
+                                        long timeout, TimeUnit unit) {
+        return redisTemplate.opsForList().rightPopAndLeftPush(sourceKey,
+                destinationKey, timeout, unit);
+    }
+
+    /**
+     * 删除集合中值等于value得元素
+     *
+     * @param key
+     * @param index index=0, 删除所有值等于value的元素; index>0, 从头部开始删除第一个值等于value的元素;
+     *              index<0, 从尾部开始删除第一个值等于value的元素;
+     * @param value
+     * @return
+     */
+    public Long lRemove(String key, long index, String value) {
+        return redisTemplate.opsForList().remove(key, index, value);
+    }
+
+    /**
+     * 裁剪list
+     *
+     * @param key
+     * @param start
+     * @param end
+     */
+    public void lTrim(String key, long start, long end) {
+        redisTemplate.opsForList().trim(key, start, end);
+    }
+
+    /**
+     * 获取列表长度
+     *
+     * @param key
+     * @return
+     */
+    public Long lLen(String key) {
+        return redisTemplate.opsForList().size(key);
+    }
+
+    /** --------------------set相关操作-------------------------- */
+
+    /**
+     * set添加元素
+     *
+     * @param key
+     * @param values
+     * @return
+     */
+    public Long sAdd(String key, String... values) {
+        return redisTemplate.opsForSet().add(key, values);
+    }
+
+    /**
+     * set移除元素
+     *
+     * @param key
+     * @param values
+     * @return
+     */
+    public Long sRemove(String key, Object... values) {
+        return redisTemplate.opsForSet().remove(key, values);
+    }
+
+    /**
+     * 移除并返回集合的一个随机元素
+     *
+     * @param key
+     * @return
+     */
+    public String sPop(String key) {
+        return redisTemplate.opsForSet().pop(key);
+    }
+
+    /**
+     * 将元素value从一个集合移到另一个集合
+     *
+     * @param key
+     * @param value
+     * @param destKey
+     * @return
+     */
+    public Boolean sMove(String key, String value, String destKey) {
+        return redisTemplate.opsForSet().move(key, value, destKey);
+    }
+
+    /**
+     * 获取集合的大小
+     *
+     * @param key
+     * @return
+     */
+    public Long sSize(String key) {
+        return redisTemplate.opsForSet().size(key);
+    }
+
+    /**
+     * 判断集合是否包含value
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Boolean sIsMember(String key, Object value) {
+        return redisTemplate.opsForSet().isMember(key, value);
+    }
+
+    /**
+     * 获取两个集合的交集
+     *
+     * @param key
+     * @param otherKey
+     * @return
+     */
+    public Set<String> sIntersect(String key, String otherKey) {
+        return redisTemplate.opsForSet().intersect(key, otherKey);
+    }
+
+    /**
+     * 获取key集合与多个集合的交集
+     *
+     * @param key
+     * @param otherKeys
+     * @return
+     */
+    public Set<String> sIntersect(String key, Collection<String> otherKeys) {
+        return redisTemplate.opsForSet().intersect(key, otherKeys);
+    }
+
+    /**
+     * key集合与otherKey集合的交集存储到destKey集合中
+     *
+     * @param key
+     * @param otherKey
+     * @param destKey
+     * @return
+     */
+    public Long sIntersectAndStore(String key, String otherKey, String destKey) {
+        return redisTemplate.opsForSet().intersectAndStore(key, otherKey,
+                destKey);
+    }
+
+    /**
+     * key集合与多个集合的交集存储到destKey集合中
+     *
+     * @param key
+     * @param otherKeys
+     * @param destKey
+     * @return
+     */
+    public Long sIntersectAndStore(String key, Collection<String> otherKeys,
+                                   String destKey) {
+        return redisTemplate.opsForSet().intersectAndStore(key, otherKeys,
+                destKey);
+    }
+
+    /**
+     * 获取两个集合的并集
+     *
+     * @param key
+     * @param otherKeys
+     * @return
+     */
+    public Set<String> sUnion(String key, String otherKeys) {
+        return redisTemplate.opsForSet().union(key, otherKeys);
+    }
+
+    /**
+     * 获取key集合与多个集合的并集
+     *
+     * @param key
+     * @param otherKeys
+     * @return
+     */
+    public Set<String> sUnion(String key, Collection<String> otherKeys) {
+        return redisTemplate.opsForSet().union(key, otherKeys);
+    }
+
+    /**
+     * key集合与otherKey集合的并集存储到destKey中
+     *
+     * @param key
+     * @param otherKey
+     * @param destKey
+     * @return
+     */
+    public Long sUnionAndStore(String key, String otherKey, String destKey) {
+        return redisTemplate.opsForSet().unionAndStore(key, otherKey, destKey);
+    }
+
+    /**
+     * key集合与多个集合的并集存储到destKey中
+     *
+     * @param key
+     * @param otherKeys
+     * @param destKey
+     * @return
+     */
+    public Long sUnionAndStore(String key, Collection<String> otherKeys,
+                               String destKey) {
+        return redisTemplate.opsForSet().unionAndStore(key, otherKeys, destKey);
+    }
+
+    /**
+     * 获取两个集合的差集
+     *
+     * @param key
+     * @param otherKey
+     * @return
+     */
+    public Set<String> sDifference(String key, String otherKey) {
+        return redisTemplate.opsForSet().difference(key, otherKey);
+    }
+
+    /**
+     * 获取key集合与多个集合的差集
+     *
+     * @param key
+     * @param otherKeys
+     * @return
+     */
+    public Set<String> sDifference(String key, Collection<String> otherKeys) {
+        return redisTemplate.opsForSet().difference(key, otherKeys);
+    }
+
+    /**
+     * key集合与otherKey集合的差集存储到destKey中
+     *
+     * @param key
+     * @param otherKey
+     * @param destKey
+     * @return
+     */
+    public Long sDifference(String key, String otherKey, String destKey) {
+        return redisTemplate.opsForSet().differenceAndStore(key, otherKey,
+                destKey);
+    }
+
+    /**
+     * key集合与多个集合的差集存储到destKey中
+     *
+     * @param key
+     * @param otherKeys
+     * @param destKey
+     * @return
+     */
+    public Long sDifference(String key, Collection<String> otherKeys,
+                            String destKey) {
+        return redisTemplate.opsForSet().differenceAndStore(key, otherKeys,
+                destKey);
+    }
+
+    /**
+     * 获取集合所有元素
+     *
+     * @param key
+     * @param otherKeys
+     * @param destKey
+     * @return
+     */
+    public Set<String> setMembers(String key) {
+        return redisTemplate.opsForSet().members(key);
+    }
+
+    /**
+     * 随机获取集合中的一个元素
+     *
+     * @param key
+     * @return
+     */
+    public String sRandomMember(String key) {
+        return redisTemplate.opsForSet().randomMember(key);
+    }
+
+    /**
+     * 随机获取集合中count个元素
+     *
+     * @param key
+     * @param count
+     * @return
+     */
+    public List<String> sRandomMembers(String key, long count) {
+        return redisTemplate.opsForSet().randomMembers(key, count);
+    }
+
+    /**
+     * 随机获取集合中count个元素并且去除重复的
+     *
+     * @param key
+     * @param count
+     * @return
+     */
+    public Set<String> sDistinctRandomMembers(String key, long count) {
+        return redisTemplate.opsForSet().distinctRandomMembers(key, count);
+    }
+
+    /**
+     * @param key
+     * @param options
+     * @return
+     */
+    public Cursor<String> sScan(String key, ScanOptions options) {
+        return redisTemplate.opsForSet().scan(key, options);
+    }
+
+    /**------------------zSet相关操作--------------------------------*/
+
+    /**
+     * 添加元素,有序集合是按照元素的score值由小到大排列
+     *
+     * @param key
+     * @param value
+     * @param score
+     * @return
+     */
+    public Boolean zAdd(String key, String value, double score) {
+        return redisTemplate.opsForZSet().add(key, value, score);
+    }
+
+    /**
+     * @param key
+     * @param values
+     * @return
+     */
+    public Long zAdd(String key, Set<TypedTuple<String>> values) {
+        return redisTemplate.opsForZSet().add(key, values);
+    }
+
+    /**
+     * @param key
+     * @param values
+     * @return
+     */
+    public Long zRemove(String key, Object... values) {
+        return redisTemplate.opsForZSet().remove(key, values);
+    }
+
+    /**
+     * 增加元素的score值，并返回增加后的值
+     *
+     * @param key
+     * @param value
+     * @param delta
+     * @return
+     */
+    public Double zIncrementScore(String key, String value, double delta) {
+        return redisTemplate.opsForZSet().incrementScore(key, value, delta);
+    }
+
+    /**
+     * 返回元素在集合的排名,有序集合是按照元素的score值由小到大排列
+     *
+     * @param key
+     * @param value
+     * @return 0表示第一位
+     */
+    public Long zRank(String key, Object value) {
+        return redisTemplate.opsForZSet().rank(key, value);
+    }
+
+    /**
+     * 返回元素在集合的排名,按元素的score值由大到小排列
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long zReverseRank(String key, Object value) {
+        return redisTemplate.opsForZSet().reverseRank(key, value);
+    }
+
+    /**
+     * 获取集合的元素, 从小到大排序
+     *
+     * @param key
+     * @param start 开始位置
+     * @param end   结束位置, -1查询所有
+     * @return
+     */
+    public Set<String> zRange(String key, long start, long end) {
+        return redisTemplate.opsForZSet().range(key, start, end);
+    }
+
+    /**
+     * 获取集合元素, 并且把score值也获取
+     *
+     * @param key
+     * @param start
+     * @param end
+     * @return
+     */
+    public Set<TypedTuple<String>> zRangeWithScores(String key, long start,
+                                                    long end) {
+        return redisTemplate.opsForZSet().rangeWithScores(key, start, end);
+    }
+
+    /**
+     * 根据Score值查询集合元素
+     *
+     * @param key
+     * @param min 最小值
+     * @param max 最大值
+     * @return
+     */
+    public Set<String> zRangeByScore(String key, double min, double max) {
+        return redisTemplate.opsForZSet().rangeByScore(key, min, max);
+    }
+
+    /**
+     * 根据Score值查询集合元素, 从小到大排序
+     *
+     * @param key
+     * @param min 最小值
+     * @param max 最大值
+     * @return
+     */
+    public Set<TypedTuple<String>> zRangeByScoreWithScores(String key,
+                                                           double min, double max) {
+        return redisTemplate.opsForZSet().rangeByScoreWithScores(key, min, max);
+    }
+
+    /**
+     * @param key
+     * @param min
+     * @param max
+     * @param start
+     * @param end
+     * @return
+     */
+    public Set<TypedTuple<String>> zRangeByScoreWithScores(String key,
+                                                           double min, double max, long start, long end) {
+        return redisTemplate.opsForZSet().rangeByScoreWithScores(key, min, max,
+                start, end);
+    }
+
+    /**
+     * 获取集合的元素, 从大到小排序
+     *
+     * @param key
+     * @param start
+     * @param end
+     * @return
+     */
+    public Set<String> zReverseRange(String key, long start, long end) {
+        return redisTemplate.opsForZSet().reverseRange(key, start, end);
+    }
+
+    /**
+     * 获取集合的元素, 从大到小排序, 并返回score值
+     *
+     * @param key
+     * @param start
+     * @param end
+     * @return
+     */
+    public Set<TypedTuple<String>> zReverseRangeWithScores(String key,
+                                                           long start, long end) {
+        return redisTemplate.opsForZSet().reverseRangeWithScores(key, start,
+                end);
+    }
+
+    /**
+     * 根据Score值查询集合元素, 从大到小排序
+     *
+     * @param key
+     * @param min
+     * @param max
+     * @return
+     */
+    public Set<String> zReverseRangeByScore(String key, double min,
+                                            double max) {
+        return redisTemplate.opsForZSet().reverseRangeByScore(key, min, max);
+    }
+
+    /**
+     * 根据Score值查询集合元素, 从大到小排序
+     *
+     * @param key
+     * @param min
+     * @param max
+     * @return
+     */
+    public Set<TypedTuple<String>> zReverseRangeByScoreWithScores(
+            String key, double min, double max) {
+        return redisTemplate.opsForZSet().reverseRangeByScoreWithScores(key,
+                min, max);
+    }
+
+    /**
+     * @param key
+     * @param min
+     * @param max
+     * @param start
+     * @param end
+     * @return
+     */
+    public Set<String> zReverseRangeByScore(String key, double min,
+                                            double max, long start, long end) {
+        return redisTemplate.opsForZSet().reverseRangeByScore(key, min, max,
+                start, end);
+    }
+
+    /**
+     * 根据score值获取集合元素数量
+     *
+     * @param key
+     * @param min
+     * @param max
+     * @return
+     */
+    public Long zCount(String key, double min, double max) {
+        return redisTemplate.opsForZSet().count(key, min, max);
+    }
+
+    /**
+     * 获取集合大小
+     *
+     * @param key
+     * @return
+     */
+    public Long zSize(String key) {
+        return redisTemplate.opsForZSet().size(key);
+    }
+
+    /**
+     * 获取集合大小
+     *
+     * @param key
+     * @return
+     */
+    public Long zZCard(String key) {
+        return redisTemplate.opsForZSet().zCard(key);
+    }
+
+    /**
+     * 获取集合中value元素的score值
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Double zScore(String key, Object value) {
+        return redisTemplate.opsForZSet().score(key, value);
+    }
+
+    /**
+     * 移除指定索引位置的成员
+     *
+     * @param key
+     * @param start
+     * @param end
+     * @return
+     */
+    public Long zRemoveRange(String key, long start, long end) {
+        return redisTemplate.opsForZSet().removeRange(key, start, end);
+    }
+
+    /**
+     * 根据指定的score值的范围来移除成员
+     *
+     * @param key
+     * @param min
+     * @param max
+     * @return
+     */
+    public Long zRemoveRangeByScore(String key, double min, double max) {
+        return redisTemplate.opsForZSet().removeRangeByScore(key, min, max);
+    }
+
+    /**
+     * 获取key和otherKey的并集并存储在destKey中
+     *
+     * @param key
+     * @param otherKey
+     * @param destKey
+     * @return
+     */
+    public Long zUnionAndStore(String key, String otherKey, String destKey) {
+        return redisTemplate.opsForZSet().unionAndStore(key, otherKey, destKey);
+    }
+
+    /**
+     * @param key
+     * @param otherKeys
+     * @param destKey
+     * @return
+     */
+    public Long zUnionAndStore(String key, Collection<String> otherKeys,
+                               String destKey) {
+        return redisTemplate.opsForZSet()
+                .unionAndStore(key, otherKeys, destKey);
+    }
+
+    /**
+     * 交集
+     *
+     * @param key
+     * @param otherKey
+     * @param destKey
+     * @return
+     */
+    public Long zIntersectAndStore(String key, String otherKey,
+                                   String destKey) {
+        return redisTemplate.opsForZSet().intersectAndStore(key, otherKey,
+                destKey);
+    }
+
+    /**
+     * 交集
+     *
+     * @param key
+     * @param otherKeys
+     * @param destKey
+     * @return
+     */
+    public Long zIntersectAndStore(String key, Collection<String> otherKeys,
+                                   String destKey) {
+        return redisTemplate.opsForZSet().intersectAndStore(key, otherKeys,
+                destKey);
+    }
+
+    /**
+     * @param key
+     * @param options
+     * @return
+     */
+    public Cursor<TypedTuple<String>> zScan(String key, ScanOptions options) {
+        return redisTemplate.opsForZSet().scan(key, options);
+    }
+}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/SmsServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/SmsServiceImpl.java
index 163a967cf02c72879e03f0019ec9d8b034fc6eff..20658c5b60173ee0c689e658d44ec09f23091536 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/SmsServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/SmsServiceImpl.java
@@ -36,82 +36,81 @@ import java.util.Map;
 @Service
 public class SmsServiceImpl implements SmsService {
 
-	@Resource
-	private IAcsClient acsClient;
-	//@Value("${aliyun.sms.sign.name:京怡君商贸}")
-	private String signName="京怡君商贸";
-	@Value("${aliyun.sms.template.code:xxxxx}")
-	private String templateCode;
-
-	@Resource
-	private SmsDao smsDao;
-
-	@Override
-	public SendSmsResponse sendSmsMsg(Sms sms) {
-		if (sms.getSignName() == null) {
-			sms.setSignName(this.signName);
-		}
-
-		if (sms.getTemplateCode() == null) {
-			sms.setTemplateCode(this.templateCode);
-		}
-
-		// 阿里云短信官网demo代码
-		SendSmsRequest request = new SendSmsRequest();
-		request.setMethod(MethodType.POST);
-		request.setPhoneNumbers(sms.getPhone());
-		request.setSignName(sms.getSignName());
-		request.setTemplateCode(sms.getTemplateCode());
-		request.setTemplateParam(sms.getParams());
-		request.setOutId(sms.getId().toString());
-
-		SendSmsResponse response = null;
+    @Resource
+    private IAcsClient acsClient;
+    //@Value("${aliyun.sms.sign.name:京怡君商贸}")
+    private String signName = "京怡君商贸";
+    @Value("${aliyun.sms.template.code:xxxxx}")
+    private String templateCode;
+
+    @Resource
+    private SmsDao smsDao;
+
+    @Override
+    public SendSmsResponse sendSmsMsg(Sms sms) {
+        if (sms.getSignName() == null) {
+            sms.setSignName(this.signName);
+        }
+
+        if (sms.getTemplateCode() == null) {
+            sms.setTemplateCode(this.templateCode);
+        }
+
+        // 阿里云短信官网demo代码
+        SendSmsRequest request = new SendSmsRequest();
+        request.setMethod(MethodType.POST);
+        request.setPhoneNumbers(sms.getPhone());
+        request.setSignName(sms.getSignName());
+        request.setTemplateCode(sms.getTemplateCode());
+        request.setTemplateParam(sms.getParams());
+        request.setOutId(sms.getId().toString());
+
+        SendSmsResponse response = null;
 //		测试时不需要开此 add by someday begin
-		try {
-			response = acsClient.getAcsResponse(request);
-			if (response != null) {
-				log.info("发送短信结果：code:{}，message:{}，requestId:{}，bizId:{}", response.getCode(), response.getMessage(),
-						response.getRequestId(), response.getBizId());
-
-				sms.setCode(response.getCode());
-				sms.setMessage(response.getMessage());
-				sms.setBizId(response.getBizId());
-			}
-		} catch (ClientException e) {
-			e.printStackTrace();
-		}
+        try {
+            response = acsClient.getAcsResponse(request);
+            if (response != null) {
+                log.info("发送短信结果：code:{}，message:{}，requestId:{}，bizId:{}", response.getCode(), response.getMessage(),
+                        response.getRequestId(), response.getBizId());
+
+                sms.setCode(response.getCode());
+                sms.setMessage(response.getMessage());
+                sms.setBizId(response.getBizId());
+            }
+        } catch (ClientException e) {
+            e.printStackTrace();
+        }
 //		测试时不需要开此 add by someday end
-		update(sms);
-
-		return response;
-	}
-
-	@Transactional
-	@Override
-	public void save(Sms sms, Map<String, String> params) {
-		if (!CollectionUtils.isEmpty(params)) {
-			sms.setParams(JsonUtils.objectToJson(params));
-		}
-
-		sms.setCreateTime(new Date());
-		sms.setUpdateTime(sms.getCreateTime());
-		sms.setDay(sms.getCreateTime());
-
-		smsDao.save(sms);
-	}
-
-	@Transactional
-	@Override
-	public void update(Sms sms) {
-		sms.setUpdateTime(new Date());
-		smsDao.update(sms);
-	}
-
-	@Override
-	public Sms findById(Long id) {
-		return smsDao.findById(id);
-	}
-
+        update(sms);
+
+        return response;
+    }
+
+    @Transactional
+    @Override
+    public void save(Sms sms, Map<String, String> params) {
+        if (!CollectionUtils.isEmpty(params)) {
+            sms.setParams(JsonUtils.objectToJson(params));
+        }
+
+        sms.setCreateTime(new Date());
+        sms.setUpdateTime(sms.getCreateTime());
+        sms.setDay(sms.getCreateTime());
+
+        smsDao.save(sms);
+    }
+
+    @Transactional
+    @Override
+    public void update(Sms sms) {
+        sms.setUpdateTime(new Date());
+        smsDao.update(sms);
+    }
+
+    @Override
+    public Sms findById(Long id) {
+        return smsDao.findById(id);
+    }
 
 
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsEmployInfoServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsEmployInfoServiceImpl.java
index ebe890ca3bd5da9fb3e59394d7354ecf499095f3..548bcecf563acadcbac2707342004006303f9b77 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsEmployInfoServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsEmployInfoServiceImpl.java
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberLocationServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberLocationServiceImpl.java
index bcece303e08693ff576eb93968d70ef75c6a9ccf..c0aa51553df6a664d22f50244d53d7491a852856 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberLocationServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberLocationServiceImpl.java
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberReceiveAddressServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberReceiveAddressServiceImpl.java
index 9de9867ddf084b1c1ed7f1bd84265384e895eaed..9434666466658d727081c80ea99dacb11f4f3bef 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberReceiveAddressServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberReceiveAddressServiceImpl.java
@@ -28,6 +28,7 @@ public class UmsMemberReceiveAddressServiceImpl extends ServiceImpl<UmsMemberRec
     private UmsMemberReceiveAddressMapper addressMapper;
     @Autowired
     private IUmsMemberService memberService;
+
     @Override
     public UmsMemberReceiveAddress getDefaultItem() {
 
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java
index 0f491604e793df545e21d0d3c5daac30aa94b38c..967a89adc8109749752ef3c2c05b9b2282beebca 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java
@@ -2,12 +2,13 @@ package com.zscat.mallplus.ums.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zscat.mallplus.config.WxAppletProperties;
+import com.google.gson.Gson;
+import com.zscat.mallplus.ApiContext;
+import com.zscat.mallplus.component.UserUtils;
 import com.zscat.mallplus.enums.AllEnum;
 import com.zscat.mallplus.exception.ApiMallPlusException;
 import com.zscat.mallplus.oms.mapper.OmsOrderMapper;
 import com.zscat.mallplus.oms.vo.OrderStstic;
-import com.zscat.mallplus.single.ApiBaseAction;
 import com.zscat.mallplus.sys.mapper.SysAreaMapper;
 import com.zscat.mallplus.ums.entity.*;
 import com.zscat.mallplus.ums.mapper.SysAppletSetMapper;
@@ -18,12 +19,11 @@ import com.zscat.mallplus.util.*;
 import com.zscat.mallplus.utils.CommonResult;
 import com.zscat.mallplus.utils.MatrixToImageWriter;
 import com.zscat.mallplus.utils.ValidatorUtils;
-
-import com.zscat.mallplus.vo.AppletLoginParam;
-import com.zscat.mallplus.vo.Rediskey;
-import com.zscat.mallplus.vo.SmsCode;
+import com.zscat.mallplus.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONObject;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -68,7 +68,10 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
 
     @Autowired
     OssAliyunUtil aliyunOSSUtil;
-
+    Integer regJifen = 100;
+    Integer logginJifen = 5;
+    @Resource
+    private SysAppletSetMapper appletSetMapper;
     @Resource
     private UmsMemberMapper memberMapper;
     @Resource
@@ -97,10 +100,6 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
     private Integer dayCount;
     @Resource
     private UmsMemberMemberTagRelationMapper umsMemberMemberTagRelationMapper;
-
-    @Resource
-    private WxAppletProperties wxAppletProperties;
-
     @Resource
     private IUmsMemberLevelService memberLevelService;
     @Resource
@@ -109,41 +108,130 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
     private IUmsMemberBlanceLogService blanceLogService;
     @Resource
     private IUmsIntegrationChangeHistoryService umsIntegrationChangeHistoryService;
+    @Autowired
+    private ApiContext apiContext;
+    private OkHttpClient okHttpClient = new OkHttpClient();
+    @Override
+    public UmsMember getNewCurrentMember() {
+        return (UmsMember) this.getCurrentMember();
+    }
 
+    @Override
+    public String getWxPhone(String openid, String keyStr, String ivStr, String encDataStr) {
+        //解析手机号
+        WxPhoneInfo wxPhoneInfo = null;
+        System.err.println("encDataStr=" + encDataStr + ",keyStr=" + keyStr + ",ivStr=" + ivStr);
+        try {
+            String result = AES.wxDecrypt(encDataStr, keyStr, ivStr);
+            Gson gson = new Gson();
+            wxPhoneInfo = gson.fromJson(result, WxPhoneInfo.class);
+            if (wxPhoneInfo!=null){
+                return wxPhoneInfo.getPhoneNumber();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+    @Override
+    public Object webLogin(String wxH5Appid,String wxH5Secret, String code) {
+        //H5 微信公众号网页登录
+        try {
+            log.info("https://api.weixin.qq.com/sns/oauth2/access_token?appid="
+                    + wxH5Appid + "&secret=" + wxH5Secret + "&code=" + code + "&grant_type=authorization_code");
+        String json = okHttpClient.newCall(
+                new Request.Builder().url("https://api.weixin.qq.com/sns/oauth2/access_token?appid="
+                        + wxH5Appid + "&secret=" + wxH5Secret + "&code=" + code + "&grant_type=authorization_code").build()).execute().body().string();
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(json);
+        log.info(jsonObject.toJSONString());
+        Integer errcode = jsonObject.getInteger("errcode");
+        if (errcode == null || errcode == 0) {
+            String openid = jsonObject.getString("openid");
+                Map<String, Object> resultObj = new HashMap<String, Object>();
+                UmsMember userVo = this.queryByOpenId(openid);
+                String token = null;
+                if (null == userVo) {
+                    UmsMember umsMember = new UmsMember();
+                    umsMember.setUsername("wxapplet" + CharUtil.getRandomString(12));
+                    umsMember.setSourceType(2);
+                    umsMember.setPassword(passwordEncoder.encode("123456"));
+                    umsMember.setCreateTime(new Date());
+                    umsMember.setStatus(1);
+                    umsMember.setBlance(new BigDecimal(10000));
+                    umsMember.setIntegration(0);
+                    umsMember.setMemberLevelId(4L);
+                    umsMember.setWeixinOpenid(openid);
+                    memberMapper.insert(umsMember);
+                    token = jwtTokenUtil.generateToken(umsMember.getUsername());
+                    resultObj.put("userId" , umsMember.getId());
+                    resultObj.put("userInfo" , umsMember);
+                    addIntegration(umsMember.getId(), regJifen, 1, "注册添加积分" , AllEnum.ChangeSource.register.code(), umsMember.getUsername());
+
+                } else {
+                    addIntegration(userVo.getId(), logginJifen, 1, "登录添加积分" , AllEnum.ChangeSource.login.code(), userVo.getUsername());
 
+                    token = jwtTokenUtil.generateToken(userVo.getUsername());
+                    resultObj.put("userId" , userVo.getId());
+                    resultObj.put("userInfo" , userVo);
+                }
 
-    Integer regJifen = 100;
-    Integer logginJifen = 5;
 
-    @Override
-    public UmsMember getNewCurrentMember(){
-      return (UmsMember) this.getCurrentMember();
+                if (StringUtils.isEmpty(token)) {
+                    throw new ApiMallPlusException("登录失败");
+
+                }
+                resultObj.put("tokenHead" , tokenHead);
+                resultObj.put("token" , token);
+
+
+                return new CommonResult().success(resultObj);
+        }else {
+            throw new ApiMallPlusException(jsonObject.toJSONString());
+        }
+            } catch (ApiMallPlusException e) {
+                e.printStackTrace();
+                throw new ApiMallPlusException(e.getMessage());
+            } catch (Exception e) {
+                e.printStackTrace();
+                throw new ApiMallPlusException(e.getMessage());
+            }
+
     }
+
     @Override
-    public  Object getCurrentMember() {
+    public Object getCurrentMember() {
         try {
             RequestAttributes requestAttributes = RequestContextHolder.currentRequestAttributes();
-            HttpServletRequest request = ((ServletRequestAttributes)requestAttributes).getRequest();
+            HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest();
             String requestType = ((HttpServletRequest) request).getMethod();
             if ("OPTIONS".equals(requestType)) {
                 return null;
             }
-
-            String tokenPre = "authorization" ;
+            UmsMember member = UserUtils.getCurrentMember();
+            if (member!=null && member.getId()!=null){
+                return member;
+            }
+            String storeId = request.getParameter("storeid");
+            if (ValidatorUtils.empty(storeId)) {
+                storeId = request.getHeader("storeid");
+            }
+            String tokenPre = "authorization" + storeId;
             String authHeader = request.getParameter(tokenPre);
-            if (ValidatorUtils.empty(authHeader)){
+            if (ValidatorUtils.empty(authHeader)) {
                 authHeader = request.getHeader(tokenPre);
             }
             if (authHeader != null && authHeader.startsWith("Bearer")) {
                 String authToken = authHeader.substring("Bearer".length());
                 String username = jwtTokenUtil.getUserNameFromToken(authToken);
-                if (ValidatorUtils.notEmpty(username)){
-                    UmsMember member = JsonUtils.jsonToPojo(redisService.get(String.format(Rediskey.MEMBER, username)),UmsMember.class);
-                    if (member==null || member.getId()==null){
-                        member=getByUsername(username);
+                if (ValidatorUtils.notEmpty(username)) {
+                     member = JsonUtils.jsonToPojo(redisService.get(apiContext.getCurrentProviderId() + ":" + String.format(Rediskey.MEMBER, username)), UmsMember.class);
+                    if (member == null || member.getId() == null) {
+                        member = getByUsername(username);
                     }
                     return member;
                 }
+            }else {
+                return new UmsMember();
             }
             return new CommonResult().fail(100);
         } catch (Exception e) {
@@ -151,6 +239,7 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
             return new UmsMember();
         }
     }
+
     @Override
     public void updataMemberOrderInfo() {
         List<OrderStstic> orders = omsOrderMapper.listOrderGroupByMemberId();
@@ -203,7 +292,7 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
      */
     @Override
     public void addIntegration(Long id, Integer integration, int changeType, String note, int sourceType, String operateMan) {
-        UmsIntegrationChangeHistory history = new UmsIntegrationChangeHistory();
+       /* UmsIntegrationChangeHistory history = new UmsIntegrationChangeHistory();
         history.setMemberId(id);
         history.setChangeCount(integration);
         history.setCreateTime(new Date());
@@ -213,9 +302,13 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
         history.setOperateMan(operateMan);
         umsIntegrationChangeHistoryService.save(history);
         UmsMember member = memberMapper.selectById(id);
+        if (ValidatorUtils.empty(member.getIntegration())) {
+            member.setIntegration(0);
+        }
         member.setIntegration(member.getIntegration() + integration);
         memberMapper.updateById(member);
-        redisService.set(String.format(Rediskey.MEMBER, member.getUsername()), JsonUtils.objectToJson(member));
+        redisService.set(apiContext.getCurrentProviderId() + ":" + String.format(Rediskey.MEMBER, member.getUsername()), JsonUtils.objectToJson(member));
+    */
     }
 
     @Override
@@ -376,7 +469,7 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
         umsMember.setAvatar(aliyunOSSUtil.upload("png", inputStream));
         memberMapper.insert(umsMember);
 
-        redisService.set(String.format(Rediskey.MEMBER, umsMember.getUsername()), JsonUtils.objectToJson(umsMember));
+        redisService.set(apiContext.getCurrentProviderId() + ":" + String.format(Rediskey.MEMBER, umsMember.getUsername()), JsonUtils.objectToJson(umsMember));
 
         addIntegration(umsMember.getId(), regJifen, 1, "注册添加积分", AllEnum.ChangeSource.register.code(), umsMember.getUsername());
         umsMember.setPassword(null);
@@ -494,32 +587,169 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
             resultObj.put("userInfo", userVo);
         }
         if (StringUtils.isEmpty(token)) {
-            return ApiBaseAction.toResponsFail("登录失败");
+            throw new ApiMallPlusException("登录失败");
         }
         resultObj.put("tokenHead", tokenHead);
         resultObj.put("token", token);
         return resultObj;
     }
+    @Override
+    public Object getAppletOpenId(AppletLoginParam req){
+    SysAppletSet appletSet = appletSetMapper.selectOne(new QueryWrapper<>());
+    if (null == appletSet) {
+        throw new ApiMallPlusException("没有设置支付配置");
+    }
+    String webAccessTokenhttps = "https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code";
+    String code = req.getCode();
+    if (StringUtils.isEmpty(code)) {
+        log.error("code ie empty");
+        throw new ApiMallPlusException("code ie empty");
+    }
+    //获取openid
+    String requestUrl = String.format(webAccessTokenhttps,
+            appletSet.getAppid(),
+            appletSet.getAppsecret(),
+            code);
 
 
+        JSONObject sessionData = CommonUtil.httpsRequest(requestUrl, "GET", null);
+        String userInfos = req.getUserInfo();
+
+        String signature = req.getSignature();
+        if (null == sessionData || StringUtils.isEmpty(sessionData.getString("openid"))) {
+            throw new ApiMallPlusException("登录失败openid is empty");
+        }
+        //验证用户信息完整性
+        String sha1 = CommonUtil.getSha1(userInfos + sessionData.getString("session_key"));
+        if (!signature.equals(sha1)) {
+            throw new ApiMallPlusException("登录失败,验证用户信息完整性 签名验证失败" + sha1 + "，" + signature);
+
+        }
+        return new CommonResult().success(sessionData.getString("openid"));
+}
     @Override
     public Object loginByWeixin(AppletLoginParam req) {
         try {
+            String userInfos = req.getUserInfo();
+            Map<String, Object> me = JsonUtils.readJsonToMap(userInfos);
+            if (null == me) {
+                throw new ApiMallPlusException("登录失败 userInfos is null");
+            }
+            Map<String, Object> resultObj = new HashMap<String, Object>();
+            UmsMember userVo = new UmsMember();
+            // 判断是否绑定了手机号
+            if (ValidatorUtils.notEmpty(req.getPhone())){
+                UmsMember queryO = new UmsMember();
+                queryO.setPhone(req.getPhone());
+                userVo= memberMapper.selectOne(new QueryWrapper<>(queryO));
+            }else {
+                throw new ApiMallPlusException("登录失败 请先绑定手机号");
+            }
 
-            String codeH = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=%s&state=STAT#wechat_redirect";
+            String token = null;
+            if (null == userVo) {
+                UmsMember umsMember = new UmsMember();
+                umsMember.setUsername("wxapplet" + CharUtil.getRandomString(8));
+                umsMember.setSourceType(2);
+                umsMember.setPassword(passwordEncoder.encode("123456"));
+                umsMember.setCreateTime(new Date());
+                umsMember.setStatus(1);
+                umsMember.setBlance(new BigDecimal(10000));
+                umsMember.setIntegration(0);
+                umsMember.setMemberLevelId(4L);
+                umsMember.setAvatar(req.getCloudID());
+                umsMember.setCity(me.get("country").toString() + "-" + me.get("province").toString() + "-" + me.get("city").toString());
 
+                umsMember.setGender((Integer) me.get("gender"));
+                umsMember.setHistoryIntegration(0);
+                umsMember.setWeixinOpenid(req.getOpenid());
+                if (StringUtils.isEmpty(me.get("avatarUrl").toString())) {
+                    //会员头像(默认头像)
+                    umsMember.setIcon("/upload/img/avatar/01.jpg");
+                } else {
+                    umsMember.setIcon(me.get("avatarUrl").toString());
+                }
+                // umsMember.setGender(Integer.parseInt(me.get("gender")));
+                umsMember.setNickname(me.get("nickName").toString());
+
+                memberMapper.insert(umsMember);
+                token = jwtTokenUtil.generateToken(umsMember.getUsername());
+                resultObj.put("userId", umsMember.getId());
+                resultObj.put("userInfo", umsMember);
+                addIntegration(umsMember.getId(), logginJifen, 1, "登录添加积分", AllEnum.ChangeSource.login.code(), umsMember.getUsername());
+
+            } else {
+              //  userVo = this.queryByOpenId(sessionData.getString("openid"));
+                if (ValidatorUtils.notEmpty(userVo.getWeixinOpenid())){
+                    addIntegration(userVo.getId(), regJifen, 1, "注册添加积分", AllEnum.ChangeSource.register.code(), userVo.getUsername());
+                    token = jwtTokenUtil.generateToken(userVo.getUsername());
+                    resultObj.put("userId", userVo.getId());
+                    resultObj.put("userInfo", userVo);
+                }else {
+                    userVo.setPassword(passwordEncoder.encode("123456"));
+                    userVo.setCreateTime(new Date());
+                    userVo.setStatus(1);
+                    userVo.setBlance(new BigDecimal(10000));
+                    userVo.setIntegration(0);
+                    userVo.setMemberLevelId(4L);
+                    userVo.setAvatar(req.getCloudID());
+                    userVo.setCity(me.get("country").toString() + "-" + me.get("province").toString() + "-" + me.get("city").toString());
+
+                    userVo.setGender((Integer) me.get("gender"));
+                    userVo.setHistoryIntegration(0);
+                    userVo.setWeixinOpenid(req.getOpenid());
+                    if (StringUtils.isEmpty(me.get("avatarUrl").toString())) {
+                        //会员头像(默认头像)
+                        userVo.setIcon("/upload/img/avatar/01.jpg");
+                    } else {
+                        userVo.setIcon(me.get("avatarUrl").toString());
+                    }
+                    // umsMember.setGender(Integer.parseInt(me.get("gender")));
+                    userVo.setNickname(me.get("nickName").toString());
+
+                    memberMapper.updateById(userVo);
+                }
+
+            }
+
+
+            if (StringUtils.isEmpty(token)) {
+                throw new ApiMallPlusException("登录失败");
+            }
+            resultObj.put("tokenHead", tokenHead);
+            resultObj.put("token", token);
+
+
+            return new CommonResult().success(resultObj);
+        } catch (ApiMallPlusException e) {
+            e.printStackTrace();
+            throw new ApiMallPlusException(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new ApiMallPlusException(e.getMessage());
+        }
+
+    }
+    @Override
+    public Object loginByWeixin1(AppletLoginParam req) {
+        try {
+
+            SysAppletSet appletSet = appletSetMapper.selectOne(new QueryWrapper<>());
+            if (null == appletSet) {
+                throw new ApiMallPlusException("没有设置支付配置");
+            }
             String code = req.getCode();
             if (StringUtils.isEmpty(code)) {
                 log.error("code ie empty");
-                return ApiBaseAction.toResponsFail("code ie empty");
+                throw new ApiMallPlusException("code ie empty");
             }
             String userInfos = req.getUserInfo();
 
             String signature = req.getSignature();
-            System.out.println(com.alibaba.fastjson.JSONObject.toJSON(userInfos));
+
             Map<String, Object> me = JsonUtils.readJsonToMap(userInfos);
             if (null == me) {
-                return ApiBaseAction.toResponsFail("登录失败 userInfos is null");
+                throw new ApiMallPlusException("登录失败 userInfos is null");
             }
 
             Map<String, Object> resultObj = new HashMap<String, Object>();
@@ -528,19 +758,20 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
 
             //获取openid
             String requestUrl = String.format(webAccessTokenhttps,
-                    wxAppletProperties.getAppId(),
-                    wxAppletProperties.getSecret(),
+                    appletSet.getAppid(),
+                    appletSet.getAppsecret(),
                     code);
 
             JSONObject sessionData = CommonUtil.httpsRequest(requestUrl, "GET", null);
 
             if (null == sessionData || StringUtils.isEmpty(sessionData.getString("openid"))) {
-                return ApiBaseAction.toResponsFail("登录失败openid is empty");
+                throw new ApiMallPlusException("登录失败openid is empty");
             }
             //验证用户信息完整性
             String sha1 = CommonUtil.getSha1(userInfos + sessionData.getString("session_key"));
             if (!signature.equals(sha1)) {
-                return ApiBaseAction.toResponsFail("登录失败,验证用户信息完整性");
+                throw new ApiMallPlusException("登录失败,验证用户信息完整性 签名验证失败" + sha1 + "，" + signature);
+
             }
             UmsMember userVo = this.queryByOpenId(sessionData.getString("openid"));
             String token = null;
@@ -584,19 +815,19 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
 
 
             if (StringUtils.isEmpty(token)) {
-                return ApiBaseAction.toResponsFail("登录失败");
+                throw new ApiMallPlusException("登录失败");
             }
             resultObj.put("tokenHead", tokenHead);
             resultObj.put("token", token);
 
 
-            return ApiBaseAction.toResponsSuccess(resultObj);
+            return new CommonResult().success(resultObj);
         } catch (ApiMallPlusException e) {
             e.printStackTrace();
-            return ApiBaseAction.toResponsFail(e.getMessage());
+            throw new ApiMallPlusException(e.getMessage());
         } catch (Exception e) {
             e.printStackTrace();
-            return ApiBaseAction.toResponsFail(e.getMessage());
+            throw new ApiMallPlusException(e.getMessage());
         }
 
     }
@@ -647,7 +878,7 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
         Map<String, Object> tokenMap = new HashMap<>();
         String token = null;
         try {
-            UserDetails userDetails = userDetailsService.loadUserByUsername(username);
+            MemberDetails userDetails = (MemberDetails) userDetailsService.loadUserByUsername(username);
             if (!passwordEncoder.matches(password, userDetails.getPassword())) {
                 throw new BadCredentialsException("密码不正确");
             }
@@ -664,7 +895,7 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
             SecurityContextHolder.getContext().setAuthentication(authentication);
             token = jwtTokenUtil.generateToken(userDetails);
             tokenMap.put("userInfo", member);
-        } catch (AuthenticationException e) {
+        } catch (Exception e) {
             LOGGER.warn("登录异常:{}", e.getMessage());
 
         }
@@ -680,7 +911,7 @@ public class UmsMemberServiceImpl extends ServiceImpl<UmsMemberMapper, UmsMember
     public Object initMemberRedis() {
         List<UmsMember> list = memberMapper.selectList(new QueryWrapper<>());
         for (UmsMember member : list) {
-            redisService.set(String.format(Rediskey.MEMBER, member.getUsername()), JsonUtils.objectToJson(member));
+            redisService.set(apiContext.getCurrentProviderId() + ":" + String.format(Rediskey.MEMBER, member.getUsername()), JsonUtils.objectToJson(member));
         }
         return 1;
     }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsRewardLogServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsRewardLogServiceImpl.java
index d2200661555eb16bcfa23c49c450c981e8eef16c..874d55f61bd8f46d5f2d9cbde8aa594a2d892c83 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsRewardLogServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsRewardLogServiceImpl.java
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UserBankcardsServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UserBankcardsServiceImpl.java
index 36d0ad3dacf4801db24c17d812c5e6b4ea119f52..a2f38fc1886d2c3c04d2244adc2d9bd1e05537a1 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UserBankcardsServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UserBankcardsServiceImpl.java
@@ -15,7 +15,7 @@ import javax.annotation.Resource;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
@@ -28,13 +28,14 @@ public class UserBankcardsServiceImpl extends ServiceImpl<UserBankcardsMapper, U
     UserBankcardsMapper bankcardsMapper;
     @Autowired
     private IUmsMemberService memberService;
+
     @Transactional
     @Override
     public int setDefault(Long id) {
         UmsMember currentMember = memberService.getNewCurrentMember();
-        UserBankcards query =new UserBankcards();
+        UserBankcards query = new UserBankcards();
         query.setIsDefault(2);
-        bankcardsMapper.update(query,new QueryWrapper<UserBankcards>().eq("user_id",currentMember.getId()));
+        bankcardsMapper.update(query, new QueryWrapper<UserBankcards>().eq("user_id", currentMember.getId()));
 
         UserBankcards def = new UserBankcards();
         def.setId(id);
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UserTocashServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UserTocashServiceImpl.java
index 33fd3aac5e88bc42566d424123e9c56ab72e3045..bf9a973f85f8c4d28298573723d88e9cf6db2cb4 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UserTocashServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UserTocashServiceImpl.java
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zscat
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/util/AES.java b/mallplus-portal/src/main/java/com/zscat/mallplus/util/AES.java
new file mode 100755
index 0000000000000000000000000000000000000000..46eaea38d0611603dd4885bc6184c2dc932cf148
--- /dev/null
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/util/AES.java
@@ -0,0 +1,79 @@
+package com.zscat.mallplus.util;
+
+
+import org.apache.commons.codec.binary.Base64;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.AlgorithmParameters;
+import java.security.Key;
+import java.security.Security;
+
+public class AES {
+    // 算法名
+    public static final String KEY_NAME = "AES";
+    // 加解密算法/模式/填充方式
+    // ECB模式只用密钥即可对数据进行加密解密，CBC模式需要添加一个iv
+    public static final String CIPHER_ALGORITHM = "AES/CBC/PKCS7Padding";
+
+    /**
+     * 微信 数据解密<br/>
+     * 对称解密使用的算法为 AES-128-CBC，数据采用PKCS#7填充<br/>
+     * 对称解密的目标密文:encrypted=Base64_Decode(encryptData)<br/>
+     * 对称解密秘钥:key = Base64_Decode(session_key),aeskey是16字节<br/>
+     * 对称解密算法初始向量:iv = Base64_Decode(iv),同样是16字节<br/>
+     *
+     * @param encrypted 目标密文
+     * @param session_key 会话ID
+     * @param iv 加密算法的初始向量
+     */
+    public static String wxDecrypt(String encrypted, String session_key, String iv) {
+        String json = null;
+        byte[] encrypted64 = Base64.decodeBase64(encrypted);
+        byte[] key64 = Base64.decodeBase64(session_key);
+        byte[] iv64 = Base64.decodeBase64(iv);
+        byte[] data;
+        try {
+            init();
+            json = new String(decrypt(encrypted64, key64, generateIV(iv64)));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return json;
+    }
+
+    /**
+     * 初始化密钥
+     */
+    public static void init() throws Exception {
+        Security.addProvider(new BouncyCastleProvider());
+        KeyGenerator.getInstance(KEY_NAME).init(128);
+    }
+
+    /**
+     * 生成iv
+     */
+    public static AlgorithmParameters generateIV(byte[] iv) throws Exception {
+        // iv 为一个 16 字节的数组，这里采用和 iOS 端一样的构造方法，数据全为0
+        // Arrays.fill(iv, (byte) 0x00);
+        AlgorithmParameters params = AlgorithmParameters.getInstance(KEY_NAME);
+        params.init(new IvParameterSpec(iv));
+        return params;
+    }
+
+    /**
+     * 生成解密
+     */
+    public static byte[] decrypt(byte[] encryptedData, byte[] keyBytes, AlgorithmParameters iv)
+            throws Exception {
+        Key key = new SecretKeySpec(keyBytes, KEY_NAME);
+        Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
+        // 设置为解密模式
+        cipher.init(Cipher.DECRYPT_MODE, key, iv);
+        return cipher.doFinal(encryptedData);
+    }
+
+}
\ No newline at end of file
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/util/DateUtils.java b/mallplus-portal/src/main/java/com/zscat/mallplus/util/DateUtils.java
index 9dba242088e208ae36031d597c6b918528f564bd..6e9b77d3a314e5fea9051980beebebda79115953 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/util/DateUtils.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/util/DateUtils.java
@@ -171,6 +171,7 @@ public class DateUtils {
         return format.format(date);
 
     }
+
     /**
      * 添加分钟
      *
@@ -190,7 +191,7 @@ public class DateUtils {
     }
 
     public static void main(String[] args) throws ParseException {
-        System.out.println(DateUtils.addMins(new Date(),10));
+        System.out.println(DateUtils.addMins(new Date(), 10));
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         // 获取当前时间
         Date date = new Date();
@@ -207,9 +208,9 @@ public class DateUtils {
 
         long hours = (diff - days * (1000 * 60 * 60 * 24))
                 / (1000 * 60 * 60);    //小时
-        long mins = (diff - days * (1000 * 60 * 60 * 24)-hours * (1000 * 60 * 60))/(1000 * 60 );    //小时
+        long mins = (diff - days * (1000 * 60 * 60 * 24) - hours * (1000 * 60 * 60)) / (1000 * 60);    //小时
         long sc = (diff - days * (1000 * 60 * 60 * 24) - hours
-                * (1000 * 60 * 60)-mins*(1000*60)) / (1000); // 秒
+                * (1000 * 60 * 60) - mins * (1000 * 60)) / (1000); // 秒
 
         System.out.println(days);
         System.out.println(hours);
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/util/FileTypeMap.java b/mallplus-portal/src/main/java/com/zscat/mallplus/util/FileTypeMap.java
index 84a9265d98e4396e47f07815a79cb430472b3235..5aa4f4f36255f0a98c48f09a8f4ff77a22b37a86 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/util/FileTypeMap.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/util/FileTypeMap.java
@@ -5,20 +5,22 @@ import java.util.Map;
 
 /**
  * 文件类型<p>允许上传的类型<p/>
+ *
  * @author Peter
  * @date 2018-4-11
  */
 public class FileTypeMap {
 
     public static final Map<String, String> map = new HashMap<String, String>(9);
+
     static {
-        map.put("jpeg","FFD8FF");
-        map.put("jpg","FFD8FFE0");
-        map.put("png","89504E47");
-        map.put("wav","57415645");
-        map.put("avi","41564920");
-        map.put("mp4","00000020667479706D70");
-        map.put("mp3","49443303000000002176");
+        map.put("jpeg", "FFD8FF");
+        map.put("jpg", "FFD8FFE0");
+        map.put("png", "89504E47");
+        map.put("wav", "57415645");
+        map.put("avi", "41564920");
+        map.put("mp4", "00000020667479706D70");
+        map.put("mp3", "49443303000000002176");
     }
 
 
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/util/FileUtils.java b/mallplus-portal/src/main/java/com/zscat/mallplus/util/FileUtils.java
index 7db35c12041ade996aa0785322beb2eb9b7f8def..e20a004359b1669c6d52f85ae203414425db0797 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/util/FileUtils.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/util/FileUtils.java
@@ -5,27 +5,30 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.io.InputStream;
 
-/** 文件工具类
+/**
+ * 文件工具类
+ *
  * @author Peter
  * @date 2018-4-11
  */
 public class FileUtils {
     /**
      * 判断文件类型是否合法<>通过魔数判断</>
+     *
      * @param file
      * @return
      */
     public static boolean checkFileMagicNum(final MultipartFile file) {
-        if(file == null){
+        if (file == null) {
             return false;
         }
         // 获取文件上传时带的后缀
         String fileName = file.getOriginalFilename();
-        String suffix = fileName.substring(fileName.lastIndexOf(".")+1);
+        String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
         // 由文件后缀得到的魔数，由于后缀可以伪造，所以该魔数不一定是文件的真实魔数
-        String magicNum =  FileTypeMap.map.get(suffix.toLowerCase());
+        String magicNum = FileTypeMap.map.get(suffix.toLowerCase());
         // 取不到魔数，说明该文件类型不能上传
-        if(magicNum == null){
+        if (magicNum == null) {
             return false;
         }
         // 取到魔数之后，判断与文件的是否相同
@@ -33,14 +36,14 @@ public class FileUtils {
         try {
             InputStream in = file.getInputStream();
             // 读取上传文件的前30个字节
-            in.read(b,0,30);
+            in.read(b, 0, 30);
             in.close();
         } catch (IOException e) {
             e.printStackTrace();
         }
         String realMagicNum = bytesToHex(b);
         // 判断文件开始的一段内容是否是匹配的魔数
-        if(realMagicNum.toUpperCase().startsWith(magicNum)){
+        if (realMagicNum.toUpperCase().startsWith(magicNum)) {
             return true;
         }
         return false;
@@ -48,10 +51,11 @@ public class FileUtils {
 
     /**
      * 将字节数组转换成16进制字符串
+     *
      * @param src
      * @return
      */
-    public static String bytesToHex(final byte[] src){
+    public static String bytesToHex(final byte[] src) {
         StringBuilder stringBuilder = new StringBuilder("");
         if (src == null || src.length <= 0) {
             return null;
@@ -67,12 +71,12 @@ public class FileUtils {
         return stringBuilder.toString();
     }
 
-    public static String getSuffix(final MultipartFile file){
-        if(file == null || file.getSize() == 0){
+    public static String getSuffix(final MultipartFile file) {
+        if (file == null || file.getSize() == 0) {
             return null;
         }
         String fileName = file.getOriginalFilename();
-        return fileName.substring(fileName.lastIndexOf(".")+1);
+        return fileName.substring(fileName.lastIndexOf(".") + 1);
     }
 
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/util/JsonUtils.java b/mallplus-portal/src/main/java/com/zscat/mallplus/util/JsonUtils.java
index 00f968f6b3071299645ddab3186396684daf2afa..89d12e570cb9346c31f53b1da04c9490ea3429be 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/util/JsonUtils.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/util/JsonUtils.java
@@ -294,7 +294,7 @@ public class JsonUtils {
      *
      * @param @param  jsondata
      * @param @return 设定文件
-     * @return Map<String                               ,                               Map                               <                               String                               ,                               Object>>    返回类型
+     * @return Map<String, Map < String, Object>>    返回类型
      * @throws
      * @Title: readJsonMap
      * @Description: TODO(这里用一句话描述这个方法的作用)
@@ -344,6 +344,7 @@ public class JsonUtils {
 
         return jsonConfig;
     }
+
     /**
      * 将对象转换成json字符串。
      */
@@ -365,7 +366,7 @@ public class JsonUtils {
      */
     public static <T> T jsonToPojo(String jsonData, Class<T> beanType) {
         try {
-            if (ValidatorUtils.notEmpty(jsonData)){
+            if (ValidatorUtils.notEmpty(jsonData)) {
                 T t = objectMapper.readValue(jsonData, beanType);
                 return t;
             }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/util/JwtTokenUtil.java b/mallplus-portal/src/main/java/com/zscat/mallplus/util/JwtTokenUtil.java
index 2191671b987d27d628f0c88b2b6d3d03b6f3e0fa..b3c6d4a2a08e3cc00397520762445ceb078c6d29 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/util/JwtTokenUtil.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/util/JwtTokenUtil.java
@@ -90,11 +90,11 @@ public class JwtTokenUtil {
      * @param userDetails 从数据库中查询出来的用户信息
      */
     public boolean validateToken(String token, UserDetails userDetails) {
-        if (userDetails!=null && ValidatorUtils.notEmpty(userDetails.getUsername())){
+        if (userDetails != null && ValidatorUtils.notEmpty(userDetails.getUsername())) {
             String username = getUserNameFromToken(token);
             return username.equals(userDetails.getUsername()) && !isTokenExpired(token);
         }
-       return false;
+        return false;
     }
 
     /**
@@ -122,6 +122,7 @@ public class JwtTokenUtil {
         claims.put(CLAIM_KEY_CREATED, new Date());
         return generateToken(claims);
     }
+
     public String generateToken(String username) {
         Map<String, Object> claims = new HashMap<>();
         claims.put(CLAIM_KEY_USERNAME, username);
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/util/OssAliyunUtil.java b/mallplus-portal/src/main/java/com/zscat/mallplus/util/OssAliyunUtil.java
index 701be45d20ad8afd7c97525382b5324c9ab87850..d7338582b53543e5ef85bbdeb6b3268ef84da0d7 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/util/OssAliyunUtil.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/util/OssAliyunUtil.java
@@ -25,8 +25,9 @@ import java.util.UUID;
 @Component
 public class OssAliyunUtil {
 
-    @Resource(name="defaultOssAliyunField")
+    @Resource(name = "defaultOssAliyunField")
     private OssAliyunField defaultOssAliyunField;
+
     /**
      * 上传文件（选择默认的OSS配置）
      *
@@ -46,6 +47,7 @@ public class OssAliyunUtil {
 
     /**
      * 上传文件
+     *
      * @param suffix
      * @param inputStream
      * @return
@@ -53,6 +55,7 @@ public class OssAliyunUtil {
     public String upload(String suffix, InputStream inputStream) {
         return upload(defaultOssAliyunField, getKey(defaultOssAliyunField.getPrefix(), suffix), inputStream);
     }
+
     /**
      * 上传文件
      *
@@ -140,7 +143,7 @@ public class OssAliyunUtil {
      * @param key             文件名
      */
     public void delete(final String accessKeyId, final String accessKeySecret, final String bucketName,
-                              final String endpoint, final String key) {
+                       final String endpoint, final String key) {
         // 创建OSSClient实例
         OSSClient ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret);
         // 删除Object
@@ -170,7 +173,7 @@ public class OssAliyunUtil {
      * @param keys            多个文件名的集合
      */
     public void delete(final String accessKeyId, final String accessKeySecret, final String bucketName,
-                              final String endpoint, final List<String> keys) {
+                       final String endpoint, final List<String> keys) {
         // 创建OSSClient实例
         OSSClient ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret);
         // 删除Objects
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/util/WeixinCheckoutUtil.java b/mallplus-portal/src/main/java/com/zscat/mallplus/util/WeixinCheckoutUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..35fccaddee4a0575b21f36ce4e979b224628227a
--- /dev/null
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/util/WeixinCheckoutUtil.java
@@ -0,0 +1,96 @@
+package com.zscat.mallplus.util;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * 签名认证工具类
+ * @ClassName:  WeixinCheckoutUtil
+ * @Description:TODO
+ * @author: jp
+ * @date:   2019年6月13日 下午4:56:12
+ *
+ * @Copyright: 2019 www.tydic.com Inc. All rights reserved.
+ *
+ */
+public class WeixinCheckoutUtil {
+
+	   // 与接口配置信息中的Token要一致
+    private static String token = "mallplus";
+
+    /**
+     * 验证签名
+     *
+     * @param signature
+     * @param timestamp
+     * @param nonce
+     * @return
+     */
+    public static boolean checkSignature(String signature, String timestamp, String nonce) {
+        String[] arr = new String[] { token, timestamp, nonce };
+        // 将token、timestamp、nonce三个参数进行字典序排序
+        // Arrays.sort(arr);
+        sort(arr);
+        StringBuilder content = new StringBuilder();
+        for (int i = 0; i < arr.length; i++) {
+            content.append(arr[i]);
+        }
+        MessageDigest md = null;
+        String tmpStr = null;
+
+        try {
+            md = MessageDigest.getInstance("SHA-1");
+            // 将三个参数字符串拼接成一个字符串进行sha1加密
+            byte[] digest = md.digest(content.toString().getBytes());
+            tmpStr = byteToStr(digest);
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+        content = null;
+        // 将sha1加密后的字符串可与signature对比，标识该请求来源于微信
+
+        return tmpStr != null ? tmpStr.equals(signature.toUpperCase()) : false;
+    }
+
+    /**
+     * 将字节数组转换为十六进制字符串
+     *
+     * @param byteArray
+     * @return
+     */
+    private static String byteToStr(byte[] byteArray) {
+        String strDigest = "";
+        for (int i = 0; i < byteArray.length; i++) {
+            strDigest += byteToHexStr(byteArray[i]);
+        }
+        return strDigest;
+    }
+
+    /**
+     * 将字节转换为十六进制字符串
+     *
+     * @param mByte
+     * @return
+     */
+    private static String byteToHexStr(byte mByte) {
+        char[] Digit = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+        char[] tempArr = new char[2];
+        tempArr[0] = Digit[(mByte >>> 4) & 0X0F];
+        tempArr[1] = Digit[mByte & 0X0F];
+        String s = new String(tempArr);
+        return s;
+    }
+    public static void sort(String a[]) {
+        for (int i = 0; i < a.length - 1; i++) {
+            for (int j = i + 1; j < a.length; j++) {
+                if (a[j].compareTo(a[i]) < 0) {
+                    String temp = a[i];
+                    a[i] = a[j];
+                    a[j] = temp;
+                }
+            }
+        }
+    }
+
+}
+
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/vo/AppletLoginParam.java b/mallplus-portal/src/main/java/com/zscat/mallplus/vo/AppletLoginParam.java
index e635a5012eebe6085bf6fa977a0b0bf1dbcd4d47..36e054898a2a1bbd70e578f71dd98877d07838e6 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/vo/AppletLoginParam.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/vo/AppletLoginParam.java
@@ -20,5 +20,6 @@ public class AppletLoginParam {
     private String userInfo;
     private String cloudID;
 
-
+    private String phone;
+    private String openid;
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/vo/MemberDetails.java b/mallplus-portal/src/main/java/com/zscat/mallplus/vo/MemberDetails.java
index c6d47f2bab8d19c3ef59c04b1c29ab7f5b941d97..42581583d7aa05b284ba34c8d5a1b9f98342a347 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/vo/MemberDetails.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/vo/MemberDetails.java
@@ -23,7 +23,7 @@ public class MemberDetails implements UserDetails {
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
         //返回当前用户的权限
-        return Arrays.asList(new SimpleGrantedAuthority("ROLE_ADMIN"),new SimpleGrantedAuthority("ADMIN"));
+        return Arrays.asList(new SimpleGrantedAuthority("ROLE_ADMIN"), new SimpleGrantedAuthority("ADMIN"));
     }
 
     @Override
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/vo/TArticleDO.java b/mallplus-portal/src/main/java/com/zscat/mallplus/vo/TArticleDO.java
index dd787563e95873b081f60cb4e991cbef7cd082f2..d7adaf9df6b362b8f2c66fa407f21f5c40852806 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/vo/TArticleDO.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/vo/TArticleDO.java
@@ -9,7 +9,7 @@ import java.util.Date;
  * @email 951449465@qq.com
  * @date 2017-10-15 15:07:36
  */
-public class TArticleDO  implements Serializable {
+public class TArticleDO implements Serializable {
     private static final long serialVersionUID = 1L;
     //
     private Long id;
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/vo/WxPhoneInfo.java b/mallplus-portal/src/main/java/com/zscat/mallplus/vo/WxPhoneInfo.java
new file mode 100755
index 0000000000000000000000000000000000000000..55fa15688e0f742a34d87556fa02e14efc980de4
--- /dev/null
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/vo/WxPhoneInfo.java
@@ -0,0 +1,83 @@
+package com.zscat.mallplus.vo;
+
+/**
+ * 解析微信授权获取手机号信息，解密后内容
+ */
+public class WxPhoneInfo {
+    private String phoneNumber;
+    private String purePhoneNumber;
+    private String countryCode;
+    private WaterMark watermark;
+
+
+    class WaterMark{
+        private long timestamp;
+        private String appid;
+
+        public long getTimestamp() {
+            return timestamp;
+        }
+
+        public void setTimestamp(long timestamp) {
+            this.timestamp = timestamp;
+        }
+
+        public String getAppid() {
+            return appid;
+        }
+
+        public void setAppid(String appid) {
+            this.appid = appid;
+        }
+
+        @Override
+        public String toString() {
+            return "WaterMark{" +
+                    "timestamp=" + timestamp +
+                    ", appid='" + appid + '\'' +
+                    '}';
+        }
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
+    public String getPurePhoneNumber() {
+        return purePhoneNumber;
+    }
+
+    public void setPurePhoneNumber(String purePhoneNumber) {
+        this.purePhoneNumber = purePhoneNumber;
+    }
+
+    public String getCountryCode() {
+        return countryCode;
+    }
+
+    public void setCountryCode(String countryCode) {
+        this.countryCode = countryCode;
+    }
+
+    public WaterMark getWatermark() {
+        return watermark;
+    }
+
+    public void setWatermark(WaterMark watermark) {
+        this.watermark = watermark;
+    }
+
+    @Override
+    public String toString() {
+        return "WxPhoneInfo{" +
+                "phoneNumber='" + phoneNumber + '\'' +
+                ", purePhoneNumber='" + purePhoneNumber + '\'' +
+                ", countryCode='" + countryCode + '\'' +
+                ", watermark=" + watermark +
+                '}';
+    }
+}
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/vo/sms/SmsFlashPromotionProducts.java b/mallplus-portal/src/main/java/com/zscat/mallplus/vo/sms/SmsFlashPromotionProducts.java
index f87570386c492ce63cf7b9e5d4f3dfb761d00319..837b4f7ffedd9abe3f9339c37649d46e891608ed 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/vo/sms/SmsFlashPromotionProducts.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/vo/sms/SmsFlashPromotionProducts.java
@@ -11,7 +11,7 @@ import java.math.BigDecimal;
  * 秒杀场次信息和商品
  */
 @Data
-public class SmsFlashPromotionProducts  implements Serializable {
+public class SmsFlashPromotionProducts implements Serializable {
     private BigDecimal flashPromotionPrice;
     private Integer flashPromotionCount;
     private Integer flashPromotionLimit;
diff --git a/mallplus-portal/src/main/resources/acp_sdk.properties b/mallplus-portal/src/main/resources/acp_sdk.properties
index 0b35a286d7bb07cc074befc38f84b1e1e4400c84..ec7bbdd4352e776296d79a223988a5d36fa50728 100644
--- a/mallplus-portal/src/main/resources/acp_sdk.properties
+++ b/mallplus-portal/src/main/resources/acp_sdk.properties
@@ -1,13 +1,11 @@
-##############SDK\u914d\u7f6e\u6587\u4ef6\uff08\u8bc1\u4e66\u65b9\u5f0f\u7b7e\u540d\uff09################
-# \u8bf4\u660e\uff1a
-# 1. \u4f7f\u7528\u65f6\u8bf7\u5220\u9664\u540e\u7f00\u7684\u201c.\u8bc1\u4e66\u201d\uff0c\u5e76\u5c06\u6b64\u6587\u4ef6\u590d\u5236\u5230src\u6587\u4ef6\u5939\u4e0b\u66ff\u6362\u539f\u6765\u7684acp_sdk.properties\u3002
-# 2. \u5177\u4f53\u914d\u7f6e\u9879\u8bf7\u6839\u636e\u6ce8\u91ca\u4fee\u6539\u3002
+##############SDK配置文件（证书方式签名）################
+# 说明：
+# 1. 使用时请删除后缀的“.证书”，并将此文件复制到src文件夹下替换原来的acp_sdk.properties。
+# 2. 具体配置项请根据注释修改。
 #
 ################################################
-
-##########################\u5165\u7f51\u6d4b\u8bd5\u73af\u5883\u4ea4\u6613\u53d1\u9001\u5730\u5740\uff08\u7ebf\u4e0a\u6d4b\u8bd5\u9700\u8981\u4f7f\u7528\u751f\u4ea7\u73af\u5883\u4ea4\u6613\u8bf7\u6c42\u5730\u5740\uff09#############################
-
-##\u4ea4\u6613\u8bf7\u6c42\u5730\u5740 
+##########################入网测试环境交易发送地址（线上测试需要使用生产环境交易请求地址）#############################
+##交易请求地址
 acpsdk.frontTransUrl=https://gateway.test.95516.com/gateway/api/frontTransReq.do
 acpsdk.backTransUrl=https://gateway.test.95516.com/gateway/api/backTransReq.do
 acpsdk.singleQueryUrl=https://gateway.test.95516.com/gateway/api/queryTrans.do
@@ -15,54 +13,41 @@ acpsdk.batchTransUrl=https://gateway.test.95516.com/gateway/api/batchTrans.do
 acpsdk.fileTransUrl=https://filedownload.test.95516.com/
 acpsdk.appTransUrl=https://gateway.test.95516.com/gateway/api/appTransReq.do
 acpsdk.cardTransUrl=https://gateway.test.95516.com/gateway/api/cardTransReq.do
-
-#\u4ee5\u4e0b\u7f34\u8d39\u4ea7\u54c1\u4f7f\u7528\uff0c\u5176\u4f59\u4ea7\u54c1\u7528\u4e0d\u5230
+#以下缴费产品使用，其余产品用不到
 acpsdk.jfFrontTransUrl=https://gateway.test.95516.com/jiaofei/api/frontTransReq.do
 acpsdk.jfBackTransUrl=https://gateway.test.95516.com/jiaofei/api/backTransReq.do
 acpsdk.jfSingleQueryUrl=https://gateway.test.95516.com/jiaofei/api/queryTrans.do
 acpsdk.jfCardTransUrl=https://gateway.test.95516.com/jiaofei/api/cardTransReq.do
 acpsdk.jfAppTransUrl=https://gateway.test.95516.com/jiaofei/api/appTransReq.do
-
 ########################################################################
-
-# \u62a5\u6587\u7248\u672c\u53f7\uff0c\u56fa\u5b9a5.1.0\uff0c\u8bf7\u52ff\u6539\u52a8
+# 报文版本号，固定5.1.0，请勿改动
 acpsdk.version=5.1.0
-
-# \u7b7e\u540d\u65b9\u5f0f\uff0c\u8bc1\u4e66\u65b9\u5f0f\u56fa\u5b9a01\uff0c\u8bf7\u52ff\u6539\u52a8
+# 签名方式，证书方式固定01，请勿改动
 acpsdk.signMethod=01
-
-# \u662f\u5426\u9a8c\u8bc1\u9a8c\u7b7e\u8bc1\u4e66\u7684CN\uff0c\u6d4b\u8bd5\u73af\u5883\u8bf7\u8bbe\u7f6efalse\uff0c\u751f\u4ea7\u73af\u5883\u8bf7\u8bbe\u7f6etrue\u3002\u975efalse\u7684\u503c\u9ed8\u8ba4\u90fd\u5f53true\u5904\u7406\u3002
+# 是否验证验签证书的CN，测试环境请设置false，生产环境请设置true。非false的值默认都当true处理。
 acpsdk.ifValidateCNName=false
-
-# \u662f\u5426\u9a8c\u8bc1https\u8bc1\u4e66\uff0c\u6d4b\u8bd5\u73af\u5883\u8bf7\u8bbe\u7f6efalse\uff0c\u751f\u4ea7\u73af\u5883\u5efa\u8bae\u4f18\u5148\u5c1d\u8bd5true\uff0c\u4e0d\u884c\u518dfalse\u3002\u975etrue\u7684\u503c\u9ed8\u8ba4\u90fd\u5f53false\u5904\u7406\u3002
+# 是否验证https证书，测试环境请设置false，生产环境建议优先尝试true，不行再false。非true的值默认都当false处理。
 acpsdk.ifValidateRemoteCert=false
-
-
-#\u540e\u53f0\u901a\u77e5\u5730\u5740\uff0c\u586b\u5199\u63a5\u6536\u94f6\u8054\u540e\u53f0\u901a\u77e5\u7684\u5730\u5740\uff0c\u5fc5\u987b\u5916\u7f51\u80fd\u8bbf\u95ee
+#后台通知地址，填写接收银联后台通知的地址，必须外网能访问
 acpsdk.backUrl=http://qy.javen.1mfy.cn/unionpay/backRcvResponse
-
-#\u524d\u53f0\u901a\u77e5\u5730\u5740\uff0c\u586b\u5199\u5904\u7406\u94f6\u8054\u524d\u53f0\u901a\u77e5\u7684\u5730\u5740\uff0c\u5fc5\u987b\u5916\u7f51\u80fd\u8bbf\u95ee
+#前台通知地址，填写处理银联前台通知的地址，必须外网能访问
 acpsdk.frontUrl=http://qy.javen.1mfy.cn/unionpay/frontRcvResponse
-
-#########################\u5165\u7f51\u6d4b\u8bd5\u73af\u5883\u7b7e\u540d\u8bc1\u4e66\u914d\u7f6e ################################
-# \u591a\u8bc1\u4e66\u7684\u60c5\u51b5\u8bc1\u4e66\u8def\u5f84\u4e3a\u4ee3\u7801\u6307\u5b9a\uff0c\u53ef\u4e0d\u5bf9\u6b64\u5757\u505a\u914d\u7f6e\u3002
-# \u7b7e\u540d\u8bc1\u4e66\u8def\u5f84\uff0c\u5fc5\u987b\u4f7f\u7528\u7edd\u5bf9\u8def\u5f84\uff0c\u5982\u679c\u4e0d\u60f3\u4f7f\u7528\u7edd\u5bf9\u8def\u5f84\uff0c\u53ef\u4ee5\u81ea\u884c\u5b9e\u73b0\u76f8\u5bf9\u8def\u5f84\u83b7\u53d6\u8bc1\u4e66\u7684\u65b9\u6cd5\uff1b\u6d4b\u8bd5\u8bc1\u4e66\u6240\u6709\u5546\u6237\u5171\u7528\u5f00\u53d1\u5305\u4e2d\u7684\u6d4b\u8bd5\u7b7e\u540d\u8bc1\u4e66\uff0c\u751f\u4ea7\u73af\u5883\u8bf7\u4ececfca\u4e0b\u8f7d\u5f97\u5230\u3002
-# windows\u6837\u4f8b\uff1a
+#########################入网测试环境签名证书配置 ################################
+# 多证书的情况证书路径为代码指定，可不对此块做配置。
+# 签名证书路径，必须使用绝对路径，如果不想使用绝对路径，可以自行实现相对路径获取证书的方法；测试证书所有商户共用开发包中的测试签名证书，生产环境请从cfca下载得到。
+# windows样例：
 acpsdk.signCert.path=D:/certs/acp_test_sign.pfx
-
-# \u7b7e\u540d\u8bc1\u4e66\u5bc6\u7801\uff0c\u6d4b\u8bd5\u73af\u5883\u56fa\u5b9a000000\uff0c\u751f\u4ea7\u73af\u5883\u8bf7\u4fee\u6539\u4e3a\u4ececfca\u4e0b\u8f7d\u7684\u6b63\u5f0f\u8bc1\u4e66\u7684\u5bc6\u7801\uff0c\u6b63\u5f0f\u73af\u5883\u8bc1\u4e66\u5bc6\u7801\u4f4d\u6570\u9700\u5c0f\u4e8e\u7b49\u4e8e6\u4f4d\uff0c\u5426\u5219\u4e0a\u4f20\u5230\u5546\u6237\u670d\u52a1\u7f51\u7ad9\u4f1a\u5931\u8d25
+# 签名证书密码，测试环境固定000000，生产环境请修改为从cfca下载的正式证书的密码，正式环境证书密码位数需小于等于6位，否则上传到商户服务网站会失败
 acpsdk.signCert.pwd=000000
-# \u7b7e\u540d\u8bc1\u4e66\u7c7b\u578b\uff0c\u56fa\u5b9a\u4e0d\u9700\u8981\u4fee\u6539
+# 签名证书类型，固定不需要修改
 acpsdk.signCert.type=PKCS12
-
-##########################\u52a0\u5bc6\u8bc1\u4e66\u914d\u7f6e################################
-# \u654f\u611f\u4fe1\u606f\u52a0\u5bc6\u8bc1\u4e66\u8def\u5f84(\u5546\u6237\u53f7\u5f00\u901a\u4e86\u5546\u6237\u5bf9\u654f\u611f\u4fe1\u606f\u52a0\u5bc6\u7684\u6743\u9650\uff0c\u9700\u8981\u5bf9 \u5361\u53f7accNo\uff0cpin\u548cphoneNo\uff0ccvn2\uff0cexpired\u52a0\u5bc6\uff08\u5982\u679c\u8fd9\u4e9b\u4e0a\u9001\u7684\u8bdd\uff09\uff0c\u5bf9\u654f\u611f\u4fe1\u606f\u52a0\u5bc6\u4f7f\u7528)
+##########################加密证书配置################################
+# 敏感信息加密证书路径(商户号开通了商户对敏感信息加密的权限，需要对 卡号accNo，pin和phoneNo，cvn2，expired加密（如果这些上送的话），对敏感信息加密使用)
 acpsdk.encryptCert.path=D:/certs/acp_test_enc.cer
-
-##########################\u9a8c\u7b7e\u8bc1\u4e66\u914d\u7f6e################################
-# \u9a8c\u7b7e\u4e2d\u7ea7\u8bc1\u4e66\u8def\u5f84(\u94f6\u8054\u63d0\u4f9b)
+##########################验签证书配置################################
+# 验签中级证书路径(银联提供)
 acpsdk.middleCert.path=D:/certs/acp_test_middle.cer
-# \u9a8c\u7b7e\u6839\u8bc1\u4e66\u8def\u5f84(\u94f6\u8054\u63d0\u4f9b)
+# 验签根证书路径(银联提供)
 acpsdk.rootCert.path=D:/certs/acp_test_root.cer
 
 
diff --git a/mallplus-portal/src/main/resources/application-dev.properties b/mallplus-portal/src/main/resources/application-dev.properties
index 9e4b0d359ddb21a41ae1e6c8846bc64b0a0f162e..94fb478a7d7fe563ba5c335cb029765584ad0718 100644
--- a/mallplus-portal/src/main/resources/application-dev.properties
+++ b/mallplus-portal/src/main/resources/application-dev.properties
@@ -1,4 +1,4 @@
-spring.datasource.url=jdbc:mysql://localhost:3306/mallplus?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
+spring.datasource.url=jdbc:mysql://localhost:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=UTC
 spring.datasource.username=test
 spring.datasource.password=test@123
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
@@ -72,8 +72,6 @@ wx.uniformorder=https://api.mch.weixin.qq.com/pay/unifiedorder
 wx.userMessage=https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s&lang=zh_CN
 wx.webAccessTokenhttps=https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
 wx.templateId=nAt_DYLLwYXkIhtDb5nyEm0ynrt98OK3Z3MmeUooPz4
-
-
 dream.weixin.dev-mode=true
 dream.weixin.wx-configs[0].appId=wx614c453e0d1dcd12
 dream.weixin.wx-configs[0].appSecret=19a02e4927d346484fc70327970457f9
@@ -81,8 +79,6 @@ dream.weixin.wx-configs[0].token=Javen
 dream.weixin.wx-configs[1].appId=wxc03edcd008ad1e70
 dream.weixin.wx-configs[1].appSecret=11ed9e2b8e3e3c131e7be320a42b2b5a
 dream.weixin.wx-configs[1].token=123456
-
-
 logging.level.root=info
 #\u5355\u72EC\u914D\u7F6E\u65E5\u5FD7\u7EA7\u522B
 logging.level.com.zscat.mallplus=debug
diff --git a/mallplus-portal/src/main/resources/application-prod.properties b/mallplus-portal/src/main/resources/application-prod.properties
index 9c9f5381929db0e8ebd8fd63301df9fb98383826..d190dcf222be67821f9cf966aadb24f3a963e5eb 100644
--- a/mallplus-portal/src/main/resources/application-prod.properties
+++ b/mallplus-portal/src/main/resources/application-prod.properties
@@ -1,4 +1,4 @@
-spring.datasource.url=jdbc:mysql://39.106.212.32:3306/test123?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
+spring.datasource.url=jdbc:mysql://39.106.212.32:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=UTC
 spring.datasource.username=root
 spring.datasource.password=root@123
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
@@ -38,13 +38,13 @@ mybatis-plus.configuration.cache-enabled=false
 #===mongodb end===
 #===redis start===
 # Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
-spring.redis.database=3
+spring.redis.database=5
 # Redis\u670D\u52A1\u5668\u5730\u5740
 spring.redis.host=39.106.212.32
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
 spring.redis.port=6379
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
-spring.redis.password=password
+spring.redis.password=
 # \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 spring.redis.pool.max-active=8
 # \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
@@ -72,8 +72,6 @@ wx.uniformorder=https://api.mch.weixin.qq.com/pay/unifiedorder
 wx.userMessage=https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s&lang=zh_CN
 wx.webAccessTokenhttps=https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
 wx.templateId=nAt_DYLLwYXkIhtDb5nyEm0ynrt98OK3Z3MmeUooPz4
-
-
 logging.level.root=info
 #\u5355\u72EC\u914D\u7F6E\u65E5\u5FD7\u7EA7\u522B
 logging.level.com.zscat.mallplus=debug
diff --git a/mallplus-portal/src/main/resources/application-test.properties b/mallplus-portal/src/main/resources/application-test.properties
index b83b456185f0612f36478dd139a152d8f2734a20..ab2c044081c2f946ab639446131572f6a29cc24b 100644
--- a/mallplus-portal/src/main/resources/application-test.properties
+++ b/mallplus-portal/src/main/resources/application-test.properties
@@ -1,4 +1,4 @@
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/mallplus?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
+spring.datasource.url=jdbc:mysql://39.106.212.32:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=UTC
 spring.datasource.username=root
 spring.datasource.password=root@123
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
diff --git a/mallplus-portal/src/main/resources/application.properties b/mallplus-portal/src/main/resources/application.properties
index 84f0aad9434236ffc828f85e053cf95572e6c0aa..2bb9516df2635e3fadcaf92e3713f96e58c8ee47 100644
--- a/mallplus-portal/src/main/resources/application.properties
+++ b/mallplus-portal/src/main/resources/application.properties
@@ -1,3 +1,5 @@
+spring.jackson.time-zone=GMT+8
+
 #\u9ED8\u8BA4\u4E3A\u5F00\u53D1\u73AF\u5883
 spring.profiles.active=prod
 #===server start===
@@ -32,21 +34,14 @@ aliyun.oss.maxSize=10
 aliyun.oss.callback=http://localhost:8080/aliyun/oss/callback
 aliyun.oss.dir.prefix=mall/images/
 #===OSS end===
-aliyun.sms.accessKeyId=5Jii89BFukxmun5j
+aliyun.sms.accessKeyId=LTAI4FhoMuUqdigjDnFT1bY6
 aliyun.sms.accessKeySecret=JvE9FcILlHu5gClmAJr89ZkEv00l9s
 aliyun.sms.sign.name=\u4EAC\u6021\u541B\u5546\u8D38
 aliyun.sms.template.code=SMS_164240312
 aliyun.sms.expire-minute=2
 aliyun.sms.day-count=45
-
-
-
-
-
-
-
 oss.type=1
-oss.aliyun.first.accessKeyId=5Jii89BFukxmun5j
+oss.aliyun.first.accessKeyId=LTAI4FhoMuUqdigjDnFT1bY6
 oss.aliyun.first.accessKeySecret=JvE9FcILlHu5gClmAJr89ZkEv00l9s
 oss.aliyun.first.bucketName=yjlive160322
 oss.aliyun.first.endPoint=oss-cn-beijing.aliyuncs.com
@@ -59,71 +54,54 @@ oss.aliyun.second.endPoint=oss-cn-beijing.aliyuncs.com
 oss.aliyun.second.styleName=
 oss.aliyun.second.prefix=user
 oss.aliyun.domain=http://yjlive160322.oss-cn-beijing.aliyuncs.com/
-oss.aliyun.defalut.accessKeyId=5Jii89BFukxmun5j
+oss.aliyun.defalut.accessKeyId=LTAI4FhoMuUqdigjDnFT1bY6
 oss.aliyun.defalut.accessKeySecret=JvE9FcILlHu5gClmAJr89ZkEv00l9s
 oss.aliyun.defalut.bucketName=yjlive160322
 oss.aliyun.defalut.endPoint=oss-cn-beijing.aliyuncs.com
 oss.aliyun.defalut.styleName=
 oss.aliyun.defalut.prefix=web
-
-
-
 ##############################
 #         \u516C\u4F17\u53F7\u53C2\u6570\u914D\u7F6E       #
 ##############################
-wechat.mp.appId = xxxx
-wechat.mp.secret = xxxx
-wechat.mp.token = xxxx
-wechat.mp.aesKey = xxxx
-
+wechat.mp.appId=xxxx
+wechat.mp.secret=xxxx
+wechat.mp.token=xxxx
+wechat.mp.aesKey=xxxx
 ###################################################################################################
-
 # \u652F\u4ED8\u5B9D\u76F8\u5173\u7684\u914D\u7F6E
 #\u4E70\u5BB6\u8D26\u53F7abpkvd0206@sandbox.com
 #\u767B\u5F55\u5BC6\u7801111111
 #\u652F\u4ED8\u5BC6\u7801111111
-
 #==================================================================================================
-alipay.appId=2016102000727659
-alipay.privateKey=MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCkejVpiLJlece9KLb8gG/+WODkpe5SRfr65n3aUAvRPoouDUp/URBAtt24mzHFdGkaU/Il7ZxG7KUjLaFNTfq8t/bHEF7HBt7MZidpEjVaDxeG/hkA+xc+X2ePAJXVhy7v1tH+XRrxuggTj+d4q7vVGD7r1mtgX4d5hK9TTKnyhO6IUcthPOUSn07wx+5wlbv4/51ggj4Ku4AWCGaCWiebDFy4VZ/FmOMP5u3O7TocCGSy5UtaFZaVMM1nH603DG6NJ8fG+zKum9IvrdQMMmBWPT8rpy0U9ztchcd+0gTNrTfE/NOCgl/RF6z7Qic7NiTKjLxkGRq73XPzfJx0hyfpAgMBAAECggEAa2/sndAN/90JjNUgmlVnUnRKCvEceJ9/rw6KXOV2oqrAZg6GgB26iRsqP6EYZMuCsBDvlrjcITQJNq5is/Vg+I8OYr+duVISjN+ZlLexI+/BxYsLWCmr6DE3myCdvwn7rezb5NR6ejWzetvALoG3Qx4AU9sO7rfX7ZevUrE8Pc5pa/rTCHOIec9P7Hfm4xrXd0DPmbAwFvUQ4spcC9xjcBhLJ3tfmkoEU11jC6Y/J7N0/TZZxqNC+HcYftSNEmbO3vxYfz/9mbabx7Uzp8xs4qHPJACmaP5tcWOCf1qJVOwP53Cd3H9J9Be9cAvlxKfT48s1ghoxLn7QB27p0UwntQKBgQDzTpCCFDoUH328B3iGTkwZq24DOUh5ZwhMG6VIFPLHwJYK6HVM473SX0nJWkbiBYFG4WiQWUZnOhz/qjTH1vvE/nzJwQ79zZahren2b8XulXKM6S/mafiBAHKl/FArcr14iAWkh+scZKWFKrNf6Hp8rQ6zu0fWdwzUOlaQFaSnTwKBgQCtDtpIagRPyNj0J39uMRJqsaY0TdJ53TD4bflf5UiFhNFH2Dikgw/uX8Pom2qtIvf3xnO2bzmJW2+OSkF7U0fL+UXkAaBHW+7YVcs8pWARSd5LWBXGWysV2wUALwynZSdwtgpgrzMQnuzklQ3hNR9LBSEGN7yJwkU83ZRWPzbvRwKBgQDU3E8g/oExSbu+3Opc1fNOIeTFfUAitjlUHHulbG5aw+qA8I5vDm/rtOHg/tI0u4w2bs4EO5aUiQsFwesbSsJJvjt+ZyCue0blfDnMGE2aRbVKAlidxOhcNAAZp3ycBm4tHROStjbDSGpm7syvg7xlhyHtrFNVFiJrKf7BX64FkQKBgCA8lAzJMuRp1YAlm2c7XOLjFMLJfFuXCHg+hCWI4Gl+xD1N2b9LarxMuoGp8cUurmJJZWSmc2FS1wT6cBg4+zbTyGEgrGqehW9nC+TQKYUO7Ym7btL0SKJZmiTenszP2vjz8Bryh+CguiAaY+t/qcSfv/cYitZeiec8n1UxkVohAoGAa8YwnzkEGBgz0TpdrGFxVBCqMIriMH4PQs2tWZ1nEBk6A7GrODRcRL0FQnRpHyf3mY5N/iEiNQ5GhQ5p1lifTvolTkVkdHpTGFhVfnYegaEAOznigi7dWJPoYlloN36AROxirGJKRIm+Od2bsybM/dNPJfoTDBDPFWGBH/klEBs=
-alipay.publicKey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuPkP2VJMR6vWCX8RwSFqNIa3klCdvRFJbuS1PN1anzQeeL9eOwtU7kGdI85yxb0dcdPzOYlG+jf9go8W9hBlgjxSRoXxLx03Yfl7cLmzJO9l9vIM1+HmNF0Ctm+el4Yi9dGs/P6q7lcHPUqs/RXGfeLrg33GMVwJbLmRcDZYeIcqPAA1OVF/4SHYr+f+O7glDOd60z+veOOexyoHmvUzYWlEz5+R4kOCNM/Z0w7KGgEYvHbZopexuTuFgUWy/9tYlNrnX+cZUWXVTskLUgD1UGWM1dS5+qfriqY9MPEwJjetcPJkoCK7A4IReE4q1DffUY9KS50/1ML+7na3R/p/UQIDAQAB
-alipay.serverUrl=https://openapi.alipaydev.com/gateway.do
-alipay.domain = http://qy.javen.1m
-
-
+alipay.appId=2017010804923732
+alipay.privateKey=MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDNCxJayBck7sdNYt3/xj117qQ8GUaq+cEJ0vo3yluD1NnksNA6k/F5/3jSdj90dCIHDrVtVlBQtKmzaaE6zvGN5uEQl+FeIZX5pkGNpzGv6ongSkz+mMfcyt8DwgHkykH04UR45MaizcUzN5Ac+Kp54MAgMQWzh87XXb/c5Z8IPqssjzwfQWgOpnihKwCSeIVkBbUiPBb1aGCJyCji/ciNxZX6Th4UJII5Gmc0qMtuxyjSomJzUVoepuRxyelbz/jSP9Wj9lkb+oIPJn8u3v44oOA7x3N6UV8b8igC4QwayBvbq0IBkxXKMzFdSAuuqdMRIDHrXbWmrLV+LDIwLpxHAgMBAAECggEACYIM7NbAc/76kPUXtEeeC/zv8rV9WGpScEEvRy0EB130aK1mSoEXvn+BO8kt8hl8hnVBJnvNJ6DpCZ/JUS/NdbYSE7HnSnUmPjhea9In9K9ci2EGpvuwsOVbaBI0Akb6vf9ALJb3Ow9tqI1YCm/hf9tTLWr4h7Wxer0nK3geYsRn6O92AKFYjxvImR/qj9sr2DNHg83lX/2YkdDuxhLWF8oTZzunhqvEWo17mEcCrFpx/vY3bME+ZMG/IAtp89PFXXsNHii4nI0buR8mx4z6CgIetgL0qFJUeMUir1ZKn+uAyy9Jv1V9Bu7R07LXsjlZlA/xnew5ie/42iyGcusYiQKBgQDvRiPWCX0eEe4rVcPHAZJ1d/jsOGwvhzmE4TUQdnjVU0bKdgY4hHS9BrvjCTAWmzEE0siS85inzQj26DGGNr5U+D0HYfTEymNQNBMLin/ApLvNPL7xzFdpA19sVvatVV+c5Vl9JaVGuBraK69Q7Cz/6OQwXU1NGQWohZhOyMX6MwKBgQDbYF2BM7npaXFQVbigGmXgdvLHeWdZag7M4dB0lHsqGWAdtQzIIn05q9rBWNMusEfal/eZKuvmoXaDquh/g0VDCmmxxIE4OS9j37g64/4QbWJxwM8rDzA6Z58peng7CUse9Pb3Q/F8JQ/EvniEa6JT1qXWGWhQcpGsACCZEYYpnQKBgGQPAsFo6md+vAhnLx2zbJmu9+tglO0zMTx+KQCfalxbHMlhnaxYx7Ccdkm09+UcNN19f97j+zyAo3UNGFi139YMkQjbT85TjEBn5mb3HgFjYh2rf3YCK7OAc5EMtM87WmZ0Cn4pFfqC1sfRaNkASrkhnPsUqVTKV/FnHJAlqZS9AoGBAJgAKCmajolEzwerrXX5dHdX05YU72AL1V9uY0IzkzczR96tkMKm6v9nrPXktsaVy+ORAjS1gahWXciTRe78JKRz9ZH/ps0vCj/4Ri0/xczaDajlwGWEa5U8MRLLUb0ODmfPscLX591tzIQ0uUp/TYUrp9I13opHJ9n2aJ/GfaAdAoGARUzil6jIO3mASNaH7MPR4MqvxMO0LuBwaVxR1mvM7GtDDDYWU3fTJ6lFpyr340cYgEmHAVnLezbLmP75Jqo42j7H5V3BplPITSSik9ti3WOHFlPRYsZBewL7cJb4VX5oRrbfOX8to9wfw2TvofHE82NDtQn9fQUoFpqKlkIraL4=
+alipay.publicKey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzQsSWsgXJO7HTWLd/8Y9de6kPBlGqvnBCdL6N8pbg9TZ5LDQOpPxef940nY/dHQiBw61bVZQULSps2mhOs7xjebhEJfhXiGV+aZBjacxr+qJ4EpM/pjH3MrfA8IB5MpB9OFEeOTGos3FMzeQHPiqeeDAIDEFs4fO112/3OWfCD6rLI88H0FoDqZ4oSsAkniFZAW1IjwW9Whgicgo4v3IjcWV+k4eFCSCORpnNKjLbsco0qJic1FaHqbkccnpW8/40j/Vo/ZZG/qCDyZ/Lt7+OKDgO8dzelFfG/IoAuEMGsgb26tCAZMVyjMxXUgLrqnTESAx6121pqy1fiwyMC6cRwIDAQAB
+alipay.serverUrl=https://openapi.alipay.com/gateway.do
+alipay.domain=http://www.yjlive.cn/api
 ##############################
 #         \u5546\u6237\u6A21\u5F0F\u4E0B\u53C2\u6570\u914D\u7F6E                           #
 ##############################
-#\u5546\u6237\u7684appId
-wxpay.appId = wxpay.appId
-#\u5546\u6237\u7684appSecret
-wxpay.appSecret = xxxx
-#\u5546\u6237\u7684
-wxpay.mchId = xxxx
-#\u5546\u6237\u7684API\u5B89\u5168
-wxpay.partnerKey = xxxx
-#\u8BC1\u4E66\u8DEF\u5F84
-wxpay.certPath = xxxx
-#\u57DF\u540D
-wxpay.domain = xxxx
-
-
+wxpay.appId=wx8321531c6046c924
+wxpay.appSecret=190de4546dedd3e511caecccdf4a394e
+wxpay.mchId=1533901051
+wxpay.partnerKey=shen9136shen9136shen9136shen9136
+wxpay.certPath=apiclient_cert.p1 \u8BC1\u4E66\u8DEF\u5F84\uFF0C\u5728\u5FAE\u4FE1\u5546\u6237\u540E\u53F0\u4E0B\u8F7D
+wxpay.domain=http://www.yjlive.cn
 ##############################
 #         \u670D\u52A1\u5546\u5546\u6237\u6A21\u5F0F\u4E0B\u53C2\u6570\u914D\u7F6E               #
 ##############################
 #\u670D\u52A1\u5546\u7684appId
-wxsubpay.appId = wxsubpay.appId
+wxsubpay.appId=wxsubpay.appId
 #\u670D\u52A1\u5546\u7684appSecret
-wxsubpay.appSecret = xxxx
+wxsubpay.appSecret=xxxx
 #\u5B50\u5546\u6237\u7684AppId
-wxsubpay.subAppid = xxxx
+wxsubpay.subAppid=xxxx
 #\u670D\u52A1\u5546\u5546\u6237\u53F7
-wxsubpay.mchId = xxxx
+wxsubpay.mchId=xxxx
 #\u5B50\u5546\u6237\u7684\u5546\u6237\u53F7
-wxsubpay.subMchId = xxxx
+wxsubpay.subMchId=xxxx
 #\u670D\u52A1\u5546API\u5B89\u5168
-wxsubpay.partnerKey = xxxx
+wxsubpay.partnerKey=xxxx
 #\u8BC1\u4E66\u8DEF\u5F84
-wxsubpay.certPath = xxxx
-
-wxsubpay.domain = xxxx
+wxsubpay.certPath=xxxx
+wxsubpay.domain=xxxx
diff --git a/mallplus-portal/src/main/resources/production/acp_sdk.properties b/mallplus-portal/src/main/resources/production/acp_sdk.properties
new file mode 100644
index 0000000000000000000000000000000000000000..7605ed60bb79300ad9ddbf08ba5e25960b299d54
--- /dev/null
+++ b/mallplus-portal/src/main/resources/production/acp_sdk.properties
@@ -0,0 +1,53 @@
+##############SDK配置文件（证书方式签名）################
+#
+# 说明：具体配置项请根据注释修改。
+#
+################################################
+##########################入网测试环境交易发送地址（线上测试需要使用生产环境交易请求地址）#############################
+##交易请求地址
+acpsdk.frontTransUrl=https://gateway.test.95516.com/gateway/api/frontTransReq.do
+acpsdk.backTransUrl=https://gateway.test.95516.com/gateway/api/backTransReq.do
+acpsdk.singleQueryUrl=https://gateway.test.95516.com/gateway/api/queryTrans.do
+acpsdk.batchTransUrl=https://gateway.test.95516.com/gateway/api/batchTrans.do
+acpsdk.fileTransUrl=https://filedownload.test.95516.com/
+acpsdk.appTransUrl=https://gateway.test.95516.com/gateway/api/appTransReq.do
+acpsdk.cardTransUrl=https://gateway.test.95516.com/gateway/api/cardTransReq.do
+#以下缴费产品使用，其余产品用不到
+acpsdk.jfFrontTransUrl=https://gateway.test.95516.com/jiaofei/api/frontTransReq.do
+acpsdk.jfBackTransUrl=https://gateway.test.95516.com/jiaofei/api/backTransReq.do
+acpsdk.jfSingleQueryUrl=https://gateway.test.95516.com/jiaofei/api/queryTrans.do
+acpsdk.jfCardTransUrl=https://gateway.test.95516.com/jiaofei/api/cardTransReq.do
+acpsdk.jfAppTransUrl=https://gateway.test.95516.com/jiaofei/api/appTransReq.do
+########################################################################
+# 报文版本号，固定5.1.0，请勿改动
+acpsdk.version=5.1.0
+# 签名方式，证书方式固定01，请勿改动
+acpsdk.signMethod=01
+# 是否验证验签证书的CN，测试环境请设置false，生产环境请设置true。非false的值默认都当true处理。
+acpsdk.ifValidateCNName=false
+# 是否验证https证书，测试环境请设置false，生产环境建议优先尝试true，不行再false。非true的值默认都当false处理。
+acpsdk.ifValidateRemoteCert=false
+#后台通知地址，填写接收银联后台通知的地址，必须外网能访问
+acpsdk.backUrl=http://ijpay.frp.javen.dev:9988/unionPay/backRcvResponse
+#前台通知地址，填写银联前台通知的地址，必须外网能访问
+acpsdk.frontUrl=http://ijpay.frp.javen.dev:9988/unionPay/frontRcvResponse
+#########################入网测试环境签名证书配置 ################################
+# 多证书的情况证书路径为代码指定，可不对此块做配置。
+# 签名证书路径，必须使用绝对路径，如果不想使用绝对路径，可以自行实现相对路径获取证书的方法；测试证书所有商户共用开发包中的测试签名证书，生产环境请从cfca下载得到。
+# windows样例：
+acpsdk.signCert.path=/Users/Javen/Documents/dev/IJPay/unionPay/certs/acp_test_sign.pfx
+# linux样例（注意：在linux下读取证书需要保证证书有被应用读的权限）（后续其他路径配置也同此条说明）
+#acpsdk.signCert.path=/SERVICE01/usr/ac_frnas/conf/ACPtest/acp700000000000001.pfx
+# 签名证书密码，测试环境固定000000，生产环境请修改为从cfca下载的正式证书的密码，正式环境证书密码位数需小于等于6位，否则上传到商户服务网站会失败
+acpsdk.signCert.pwd=000000
+# 签名证书类型，固定不需要修改
+acpsdk.signCert.type=PKCS12
+##########################加密证书配置################################
+# 敏感信息加密证书路径(商户号开通了商户对敏感信息加密的权限，需要对 卡号accNo，pin和phoneNo，cvn2，expired加密（如果这些上送的话），对敏感信息加密使用)
+acpsdk.encryptCert.path=/Users/Javen/Documents/dev/IJPay/unionPay/certs/acp_test_enc.cer
+##########################验签证书配置################################
+# 验签中级证书路径(银联提供)
+acpsdk.middleCert.path=/Users/Javen/Documents/dev/IJPay/unionPay/certs/acp_test_middle.cer
+# 验签根证书路径(银联提供)
+acpsdk.rootCert.path=/Users/Javen/Documents/dev/IJPay/unionPay/certs/acp_test_root.cer
+
diff --git a/mallplus-portal/src/main/resources/production/alipay.properties b/mallplus-portal/src/main/resources/production/alipay.properties
index 554713fe9aee7d3a9887aa53882a5ee4bd6b7131..ebec542e8bdf73939b97fe3e95290f070eac85c3 100644
--- a/mallplus-portal/src/main/resources/production/alipay.properties
+++ b/mallplus-portal/src/main/resources/production/alipay.properties
@@ -1,13 +1,5 @@
-###################################################################################################
-
-# \u652f\u4ed8\u5b9d\u76f8\u5173\u7684\u914d\u7f6e
-#\u4e70\u5bb6\u8d26\u53f7abpkvd0206@sandbox.com
-#\u767b\u5f55\u5bc6\u7801111111
-#\u652f\u4ed8\u5bc6\u7801111111
-
-#==================================================================================================
-alipay.appId=2016102000727659
-alipay.privateKey=MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCkejVpiLJlece9KLb8gG/+WODkpe5SRfr65n3aUAvRPoouDUp/URBAtt24mzHFdGkaU/Il7ZxG7KUjLaFNTfq8t/bHEF7HBt7MZidpEjVaDxeG/hkA+xc+X2ePAJXVhy7v1tH+XRrxuggTj+d4q7vVGD7r1mtgX4d5hK9TTKnyhO6IUcthPOUSn07wx+5wlbv4/51ggj4Ku4AWCGaCWiebDFy4VZ/FmOMP5u3O7TocCGSy5UtaFZaVMM1nH603DG6NJ8fG+zKum9IvrdQMMmBWPT8rpy0U9ztchcd+0gTNrTfE/NOCgl/RF6z7Qic7NiTKjLxkGRq73XPzfJx0hyfpAgMBAAECggEAa2/sndAN/90JjNUgmlVnUnRKCvEceJ9/rw6KXOV2oqrAZg6GgB26iRsqP6EYZMuCsBDvlrjcITQJNq5is/Vg+I8OYr+duVISjN+ZlLexI+/BxYsLWCmr6DE3myCdvwn7rezb5NR6ejWzetvALoG3Qx4AU9sO7rfX7ZevUrE8Pc5pa/rTCHOIec9P7Hfm4xrXd0DPmbAwFvUQ4spcC9xjcBhLJ3tfmkoEU11jC6Y/J7N0/TZZxqNC+HcYftSNEmbO3vxYfz/9mbabx7Uzp8xs4qHPJACmaP5tcWOCf1qJVOwP53Cd3H9J9Be9cAvlxKfT48s1ghoxLn7QB27p0UwntQKBgQDzTpCCFDoUH328B3iGTkwZq24DOUh5ZwhMG6VIFPLHwJYK6HVM473SX0nJWkbiBYFG4WiQWUZnOhz/qjTH1vvE/nzJwQ79zZahren2b8XulXKM6S/mafiBAHKl/FArcr14iAWkh+scZKWFKrNf6Hp8rQ6zu0fWdwzUOlaQFaSnTwKBgQCtDtpIagRPyNj0J39uMRJqsaY0TdJ53TD4bflf5UiFhNFH2Dikgw/uX8Pom2qtIvf3xnO2bzmJW2+OSkF7U0fL+UXkAaBHW+7YVcs8pWARSd5LWBXGWysV2wUALwynZSdwtgpgrzMQnuzklQ3hNR9LBSEGN7yJwkU83ZRWPzbvRwKBgQDU3E8g/oExSbu+3Opc1fNOIeTFfUAitjlUHHulbG5aw+qA8I5vDm/rtOHg/tI0u4w2bs4EO5aUiQsFwesbSsJJvjt+ZyCue0blfDnMGE2aRbVKAlidxOhcNAAZp3ycBm4tHROStjbDSGpm7syvg7xlhyHtrFNVFiJrKf7BX64FkQKBgCA8lAzJMuRp1YAlm2c7XOLjFMLJfFuXCHg+hCWI4Gl+xD1N2b9LarxMuoGp8cUurmJJZWSmc2FS1wT6cBg4+zbTyGEgrGqehW9nC+TQKYUO7Ym7btL0SKJZmiTenszP2vjz8Bryh+CguiAaY+t/qcSfv/cYitZeiec8n1UxkVohAoGAa8YwnzkEGBgz0TpdrGFxVBCqMIriMH4PQs2tWZ1nEBk6A7GrODRcRL0FQnRpHyf3mY5N/iEiNQ5GhQ5p1lifTvolTkVkdHpTGFhVfnYegaEAOznigi7dWJPoYlloN36AROxirGJKRIm+Od2bsybM/dNPJfoTDBDPFWGBH/klEBs=
-alipay.publicKey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuPkP2VJMR6vWCX8RwSFqNIa3klCdvRFJbuS1PN1anzQeeL9eOwtU7kGdI85yxb0dcdPzOYlG+jf9go8W9hBlgjxSRoXxLx03Yfl7cLmzJO9l9vIM1+HmNF0Ctm+el4Yi9dGs/P6q7lcHPUqs/RXGfeLrg33GMVwJbLmRcDZYeIcqPAA1OVF/4SHYr+f+O7glDOd60z+veOOexyoHmvUzYWlEz5+R4kOCNM/Z0w7KGgEYvHbZopexuTuFgUWy/9tYlNrnX+cZUWXVTskLUgD1UGWM1dS5+qfriqY9MPEwJjetcPJkoCK7A4IReE4q1DffUY9KS50/1ML+7na3R/p/UQIDAQAB
-alipay.serverUrl=https://openapi.alipaydev.com/gateway.do
-alipay.domain = http://qy.javen.1mfy.cn
\ No newline at end of file
+alipay.appId=\u5E94\u7528\u7F16\u53F7
+alipay.privateKey=\u5E94\u7528\u79C1\u94A5
+alipay.publicKey=\u652F\u4ED8\u5B9D\u516C\u94A5\uFF0C\u901A\u8FC7\u5E94\u7528\u516C\u94A5\u4E0A\u4F20\u5230\u652F\u4ED8\u5B9D\u5F00\u653E\u5E73\u53F0\u6362\u53D6\u652F\u4ED8\u5B9D\u516C\u94A5\u3002
+alipay.serverUrl=\u652F\u4ED8\u5B9D\u652F\u4ED8\u7F51\u5173\uFF0C\u6C99\u7BB1\u73AF\u5883\u65F6\u8BBE\u7F6E\u4E3A https://openapi.alipaydev.com/gateway.do \u4F7F\u7528\u6B63\u5F0F\u73AF\u5883\u65F6\u8BBE\u7F6E\u4E3A https://openapi.alipay.com/gateway.do
+alipay.domain=\u5916\u7F51\u8BBF\u95EE\u9879\u76EE\u7684\u57DF\u540D\uFF0C\u652F\u4ED8\u901A\u77E5\u4E2D\u4F1A\u4F7F\u7528
\ No newline at end of file
diff --git a/mallplus-portal/src/main/resources/production/jdpay.properties b/mallplus-portal/src/main/resources/production/jdpay.properties
new file mode 100644
index 0000000000000000000000000000000000000000..b486fbe82f2b71947641f2b8ad6ef71faa5552ec
--- /dev/null
+++ b/mallplus-portal/src/main/resources/production/jdpay.properties
@@ -0,0 +1,5 @@
+jdpay.mchId=xx
+jdpay.rsaPrivateKey=xx
+jdpay.desKey=xx
+jdpay.rsaPublicKey=xx
+jdpay.certPath=xx
\ No newline at end of file
diff --git a/mallplus-portal/src/main/resources/production/sub_wxpay.properties b/mallplus-portal/src/main/resources/production/sub_wxpay.properties
new file mode 100644
index 0000000000000000000000000000000000000000..2da0a1ef24388ebc1173e3966d22f55ca975b111
--- /dev/null
+++ b/mallplus-portal/src/main/resources/production/sub_wxpay.properties
@@ -0,0 +1,9 @@
+subwxpay.appId=\u670D\u52A1\u5546\u7684\u5E94\u7528\u7F16\u53F7
+subwxpay.subAppId=\u5B50\u5546\u6237\u53F7\u7684\u5E94\u7528\u7F16\u53F7
+subwxpay.appSecret=\u670D\u52A1\u5546\u7684 appSecret
+subwxpay.subAppSecret=\u5B50\u5546\u6237\u7684appSecret
+subwxpay.mchId=\u5FAE\u4FE1\u652F\u4ED8\u5546\u6237\u53F7
+subwxpay.subMchId=\u5B50\u5546\u6237\u53F7
+subwxpay.partnerKey=API \u5BC6\u94A5
+subwxpay.certPath=apiclient_cert.p1 \u8BC1\u4E66\u8DEF\u5F84\uFF0C\u5728\u670D\u52A1\u5546\u5FAE\u4FE1\u5546\u6237\u540E\u53F0\u4E0B\u8F7D
+subwxpay.domain=\u5916\u7F51\u8BBF\u95EE\u9879\u76EE\u7684\u57DF\u540D\uFF0C\u652F\u4ED8\u901A\u77E5\u4E2D\u4F1A\u4F7F\u7528
\ No newline at end of file
diff --git a/mallplus-portal/src/main/resources/production/wechat.properties b/mallplus-portal/src/main/resources/production/wechat.properties
deleted file mode 100644
index 04454df09835fe005c24d78a8f6b5596ceb624f1..0000000000000000000000000000000000000000
--- a/mallplus-portal/src/main/resources/production/wechat.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-##############################
-#         \u516c\u4f17\u53f7\u53c2\u6570\u914d\u7f6e       #
-##############################
-wechat.mp.appId = xxxx
-wechat.mp.secret = xxxx
-wechat.mp.token = xxxx
-wechat.mp.aesKey = xxxx
\ No newline at end of file
diff --git a/mallplus-portal/src/main/resources/production/wxpay.properties b/mallplus-portal/src/main/resources/production/wxpay.properties
index 8c6695b4c7584ca63efddc1f3567cc13691447ea..ad9639ac4d12647b838437342da35e7863234e76 100644
--- a/mallplus-portal/src/main/resources/production/wxpay.properties
+++ b/mallplus-portal/src/main/resources/production/wxpay.properties
@@ -1,15 +1,6 @@
-##############################
-#         \u5546\u6237\u6a21\u5f0f\u4e0b\u53c2\u6570\u914d\u7f6e                           #
-##############################
-#\u5546\u6237\u7684appId
-wxpay.appId = wxpay.appId
-#\u5546\u6237\u7684appSecret
-wxpay.appSecret = xxxx
-#\u5546\u6237\u7684
-wxpay.mchId = xxxx
-#\u5546\u6237\u7684API\u5b89\u5168
-wxpay.partnerKey = xxxx
-#\u8bc1\u4e66\u8def\u5f84
-wxpay.certPath = xxxx
-#\u57df\u540d
-wxpay.domain = xxxx
\ No newline at end of file
+wxpay.appId=wx8321531c6046c924
+wxpay.appSecret=190de4546dedd3e511caecccdf4a394e
+wxpay.mchId=1533901051
+wxpay.partnerKey=shen9136shen9136shen9136shen9136
+wxpay.certPath=apiclient_cert.p1 \u8BC1\u4E66\u8DEF\u5F84\uFF0C\u5728\u5FAE\u4FE1\u5546\u6237\u540E\u53F0\u4E0B\u8F7D
+wxpay.domain=http://www.yjlive.cn/
diff --git a/mallplus-portal/src/main/resources/production/wxsubpay.properties b/mallplus-portal/src/main/resources/production/wxsubpay.properties
deleted file mode 100644
index 584d9cd6c09d2c76406d8c5fa557beaf76da20c1..0000000000000000000000000000000000000000
--- a/mallplus-portal/src/main/resources/production/wxsubpay.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-##############################
-#         \u670d\u52a1\u5546\u5546\u6237\u6a21\u5f0f\u4e0b\u53c2\u6570\u914d\u7f6e               #
-##############################
-#\u670d\u52a1\u5546\u7684appId
-wxsubpay.appId = wxsubpay.appId
-#\u670d\u52a1\u5546\u7684appSecret
-wxsubpay.appSecret = xxxx
-#\u5b50\u5546\u6237\u7684AppId
-wxsubpay.subAppid = xxxx
-#\u670d\u52a1\u5546\u5546\u6237\u53f7
-wxsubpay.mchId = xxxx
-#\u5b50\u5546\u6237\u7684\u5546\u6237\u53f7
-wxsubpay.subMchId = xxxx
-#\u670d\u52a1\u5546API\u5b89\u5168
-wxsubpay.partnerKey = xxxx
-#\u8bc1\u4e66\u8def\u5f84
-wxsubpay.certPath = xxxx
-
-wxsubpay.domain = xxxx
\ No newline at end of file
diff --git a/mallplus-portal/src/main/resources/templates/test b/mallplus-portal/src/main/resources/templates/test
index c653e734d87034e03f2bcc37cdcbd05a92659166..0f15e2fef55417700d0998878b154dc2b09f75a5 100644
--- a/mallplus-portal/src/main/resources/templates/test
+++ b/mallplus-portal/src/main/resources/templates/test
@@ -1,4 +1,6 @@
+netstat -ntlp //查看当前所有tcp端口·
 
+netstat -ntulp |grep 80 //查看所有80端口使用情况·
 
 
 39.106.212.32
@@ -10,6 +12,9 @@ nohup java -jar /root/jm/mallplus-admin-0.0.1-SNAPSHOT.jar >admin.log 2>&1 &
 
 nohup java -jar /root/jm/RuoYi.jar >rrr.log 2>&1 &
 
+
+nohup java -jar /root/jm/bootdo-1.5.0.jar >blog.log 2>&1 &
+
 ps -ef|grep java
 
 
@@ -28,10 +33,17 @@ put -r /Users/shenzhuan/Documents/tools/apache-tomcat-8.0.52 /root/jm
 
 put -r /Users/java/test/git/RuoYi-fast/target/RuoYi.jar  /root/jm
 
+nohup java -jar /root/jm/meizhuang-admin-0.0.1-SNAPSHOT.jar >meizhuang.log 2>&1 &
+
 put -r /Users/java/test/git/mallplus/mallplus-admin/target/mallplus-admin-0.0.1-SNAPSHOT.jar  /root/jm
 
 put -r /Users/java/test/git/mallplus/mallplus-portal/target/mallplus-portal-0.0.1-SNAPSHOT.jar  /root/jm
 
+put -r /Users/java/test/git/bootdo/bootdo/target/bootdo-1.5.0.jar  /root/jm
+
+put -r /Users/java/test/git/mallplus/mallplus-portal/MP_verify_8U0gHxfvQWhdo4DS.txt /root/jm/h5
+
+
 put -r /Users/java/test/git/mall-admin-web/dist  /root/jm
 
 put -r /Users/java/test/git/uniapp/unpackage/dist/build/h5 /root/jm
@@ -260,7 +272,7 @@ h5演示  http://yjlive.cn:8082/
 前端vue 项目路径下有一个zip包
 部署地址 https://gitee.com/catshen/zscat_sw/wikis/pages?sort_id=1551918&doc_id=364094
 
-
+https://admin.it120.cc/#/user/apiExtOrderEvaluate/list
 https://pub.alimama.com/?spm=a2321.7393627.1998051820.1.98f118e2koGcdA
 
 单机版项目地址 https://gitee.com/zscat/mallplus
@@ -283,3 +295,40 @@ delete from sys_admin_log  ;
 1938186471@qq.com
 wx1d852ffdcbedd005
 
+server {
+        listen 80;
+        server_name www.yjlive.cn;
+
+        error_page 500 502 503 504 /50x.html;
+            location = /50x.html {
+            root html;
+        }
+
+		location / {
+            alias /root/jm/h5/;
+            index index.html;
+        }
+
+        location /h5 {
+            alias  /root/jm/mall/;
+			try_files $uri $uri/ @router;
+			index index.html;
+        }
+        location /api {
+            rewrite  ^/api/(.*)$ /$1 break;
+            include  uwsgi_params;
+            proxy_pass   http://39.106.212.32:8081 ;
+        }
+        location @router {
+        rewrite ^.*$ /index.html last;
+        }
+    }
+
+
+3392805238@qq.com
+wxeca56e2ff8f277d9
+4c8df450d885fff986b8d42048a90052
+
+2681196506@qq.com
+wx0c1055c6158f7851
+baa79ed796ec18e932c547fe009d9af0
diff --git a/mallplus-portal/src/test/java/com/GetTrueStudent.java b/mallplus-portal/src/test/java/com/GetTrueStudent.java
index 33361ea2dee307d8ace5e09644c78213e02ae2f2..3da85dee76cb6adbdced76ca882aa6b576bf866a 100644
--- a/mallplus-portal/src/test/java/com/GetTrueStudent.java
+++ b/mallplus-portal/src/test/java/com/GetTrueStudent.java
@@ -39,9 +39,8 @@ public class GetTrueStudent {
         Map<Long, List<Student>> groupBy = allList.stream().collect(Collectors.groupingBy(Student::getIwantStudent));
 
 
-
         // 遍历获取对象信息
-        for (Map.Entry<Long,List<Student>> entry: groupBy.entrySet()) {
+        for (Map.Entry<Long, List<Student>> entry : groupBy.entrySet()) {
             List<Student> student = entry.getValue();
             System.out.println(student.toString());
         }
diff --git a/mallplus-portal/src/test/java/com/MallPortalApplicationTests.java b/mallplus-portal/src/test/java/com/MallPortalApplicationTests.java
index 4d6ad5d1a6be71cf1674ea227cfb84415e1d1780..515bc89adb00ab5c4c2f7e0522e4942aa7c9ee25 100644
--- a/mallplus-portal/src/test/java/com/MallPortalApplicationTests.java
+++ b/mallplus-portal/src/test/java/com/MallPortalApplicationTests.java
@@ -30,24 +30,25 @@ public class MallPortalApplicationTests {
     SysSchoolMapper schoolMapper;
     @Resource
     SysAreaMapper sysAreaMapper;
+
+    public static void main(String[] args) {
+        String a = "102087102114";
+        String b = "101829";
+        System.out.println(a.replaceAll("[^" + b + "]", "").length());
+    }
+
     @Test
     public void contextLoads() {
         List<CmsSubject> list = subjectMapper.selectList(new QueryWrapper<>());
-        for (CmsSubject subject : list){
+        for (CmsSubject subject : list) {
             Random r = new Random();
             Long a = r.nextLong();
             System.out.println(a);
             Long b = r.nextLong();
             subject.setAreaId(a);
             subject.setSchoolId(b);
-          //  subjectMapper.updateById(subject);
+            //  subjectMapper.updateById(subject);
         }
-      // List<UmsMember> log =  sysAdminLogMapper.selectList(new QueryWrapper<UmsMember>().between("create_time","2018-03-03","2018-09-03"));
-    }
-
-    public static void main(String[] args) {
-        String a= "102087102114";
-        String b="101829";
-        System.out.println( a.replaceAll("[^" + b + "]", "").length());
+        // List<UmsMember> log =  sysAdminLogMapper.selectList(new QueryWrapper<UmsMember>().between("create_time","2018-03-03","2018-09-03"));
     }
 }
diff --git a/mallplus-portal/src/test/java/com/Test02.java b/mallplus-portal/src/test/java/com/Test02.java
index e8be4fde997312793e66b03c2fa3c3d23a66c367..5a71f09213394923cb88acc37c2db429151f182e 100644
--- a/mallplus-portal/src/test/java/com/Test02.java
+++ b/mallplus-portal/src/test/java/com/Test02.java
@@ -22,6 +22,6 @@ public class Test02 {
                 s += str[i] + ",";
             }
         }
-      //  System.out.println(s.substring(0, s.length() - 1));
+        //  System.out.println(s.substring(0, s.length() - 1));
     }
 }
diff --git a/mallplus-portal/src/test/java/com/Tools.java b/mallplus-portal/src/test/java/com/Tools.java
index 88b450bb492d32ffd340d08548c8e54a268a5b01..bb61010ff95779b8394590e7d868b861f67a7a55 100644
--- a/mallplus-portal/src/test/java/com/Tools.java
+++ b/mallplus-portal/src/test/java/com/Tools.java
@@ -8,14 +8,14 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 
 public class Tools {
-    public static void main(String[] args) throws  Exception{
+    public static void main(String[] args) throws Exception {
         String host = "https://goexpress.market.alicloudapi.com";       //【1】请求地址  支持http 和 https 及 WEBSOCKET
         String path = "/goexpress";                                     //【2】后缀
         String appcode = "436e99b5b81044698cbaf100d164aa63";                             //【3】AppCode  你自己的AppCode 在买家中心查看
         String no = "780098068058";                                     //【4】参数，具体参照api接口参数
         String type = "zto";                                            //【5】参数，具体参照api接口参数
         String urlSend = host + path + "?no=" + no + "&type=" + type;   //【6】拼接请求链接
-		/*【1】 ~ 【6】 需要修改为对应的 可以参考产品详情 */
+        /*【1】 ~ 【6】 需要修改为对应的 可以参考产品详情 */
         URL url = new URL(urlSend);
         HttpURLConnection httpURLConnection = (HttpURLConnection) url.openConnection();
         httpURLConnection.setRequestProperty("Authorization", "APPCODE " + appcode);//格式Authorization:APPCODE (中间是英文空格)
@@ -26,6 +26,7 @@ public class Tools {
         System.out.println("/* 获取返回的json   */ ");
         System.out.print(json);
     }
+
     /*
         读取返回结果
      */
diff --git a/mallplus-portal/src/test/java/com/cin_txt.java b/mallplus-portal/src/test/java/com/cin_txt.java
index 2c85373e67e12003fe6caecf017b3c3212f597e5..2b28deb8db26406e4f241fd44751a894e3b56cba 100644
--- a/mallplus-portal/src/test/java/com/cin_txt.java
+++ b/mallplus-portal/src/test/java/com/cin_txt.java
@@ -9,7 +9,7 @@ public class cin_txt {
     public static void main(String[] args) {
         try { // 防止文件建立或读取失败，用catch捕捉错误并打印，也可以throw
 
-                /* 读入TXT文件 */
+            /* 读入TXT文件 */
             String pathname = "E:\\test\\test.txt"; // 绝对路径或相对路径都可以，这里是绝对路径，写入文件时演示相对路径
             File filename = new File(pathname); // 要读取以上路径的input。txt文件
             InputStreamReader reader = new InputStreamReader(
diff --git a/mallplus-search/pom.xml b/mallplus-search/pom.xml
index 427df3ad5ad02ad3484e922666ef05154648900b..c676e1fc510614b1ec08981aee1feb9f9a8d0e64 100644
--- a/mallplus-search/pom.xml
+++ b/mallplus-search/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -53,31 +53,31 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
             <!--<plugin>-->
-                <!--<groupId>com.spotify</groupId>-->
-                <!--<artifactId>docker-maven-plugin</artifactId>-->
-                <!--<version>1.1.0</version>-->
-                <!--<executions>-->
-                    <!--<execution>-->
-                        <!--<id>build-image</id>-->
-                        <!--<phase>package</phase>-->
-                        <!--<goals>-->
-                            <!--<goal>build</goal>-->
-                        <!--</goals>-->
-                    <!--</execution>-->
-                <!--</executions>-->
-                <!--<configuration>-->
-                    <!--<imageName>mall/${project.artifactId}:${project.version}</imageName>-->
-                    <!--<dockerHost>http://192.168.3.101:2375</dockerHost>-->
-                    <!--<baseImage>java:8</baseImage>-->
-                    <!--<entryPoint>["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"]</entryPoint>-->
-                    <!--<resources>-->
-                        <!--<resource>-->
-                            <!--<targetPath>/</targetPath>-->
-                            <!--<directory>${project.build.directory}</directory>-->
-                            <!--<include>${project.build.finalName}.jar</include>-->
-                        <!--</resource>-->
-                    <!--</resources>-->
-                <!--</configuration>-->
+            <!--<groupId>com.spotify</groupId>-->
+            <!--<artifactId>docker-maven-plugin</artifactId>-->
+            <!--<version>1.1.0</version>-->
+            <!--<executions>-->
+            <!--<execution>-->
+            <!--<id>build-image</id>-->
+            <!--<phase>package</phase>-->
+            <!--<goals>-->
+            <!--<goal>build</goal>-->
+            <!--</goals>-->
+            <!--</execution>-->
+            <!--</executions>-->
+            <!--<configuration>-->
+            <!--<imageName>mall/${project.artifactId}:${project.version}</imageName>-->
+            <!--<dockerHost>http://192.168.3.101:2375</dockerHost>-->
+            <!--<baseImage>java:8</baseImage>-->
+            <!--<entryPoint>["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"]</entryPoint>-->
+            <!--<resources>-->
+            <!--<resource>-->
+            <!--<targetPath>/</targetPath>-->
+            <!--<directory>${project.build.directory}</directory>-->
+            <!--<include>${project.build.finalName}.jar</include>-->
+            <!--</resource>-->
+            <!--</resources>-->
+            <!--</configuration>-->
             <!--</plugin>-->
         </plugins>
     </build>
diff --git a/mallplus-search/src/main/java/com/zscat/mallplus/search/config/MyBatisConfig.java b/mallplus-search/src/main/java/com/zscat/mallplus/search/config/MyBatisConfig.java
index cdfa9bcc5b34d11bd24cc82124845b0ecb04e80b..c2f167e7e5ea1673b3da99aeddc15855cc829485 100644
--- a/mallplus-search/src/main/java/com/zscat/mallplus/search/config/MyBatisConfig.java
+++ b/mallplus-search/src/main/java/com/zscat/mallplus/search/config/MyBatisConfig.java
@@ -8,6 +8,6 @@ import org.springframework.context.annotation.Configuration;
  * Created by mallplus on 2019/4/8.
  */
 @Configuration
-@MapperScan({"com.zscat.mallplus.search.mapper","com.zscat.mallplus.search.dao"})
+@MapperScan({"com.zscat.mallplus.search.mapper", "com.zscat.mallplus.search.dao"})
 public class MyBatisConfig {
 }
diff --git a/mallplus-search/src/main/java/com/zscat/mallplus/search/config/Swagger2Config.java b/mallplus-search/src/main/java/com/zscat/mallplus/search/config/Swagger2Config.java
index 3324a114ccd2f158b5587c5d54f09ebec1442d37..fd312aa79948eab796264677aa56741afda172e3 100644
--- a/mallplus-search/src/main/java/com/zscat/mallplus/search/config/Swagger2Config.java
+++ b/mallplus-search/src/main/java/com/zscat/mallplus/search/config/Swagger2Config.java
@@ -18,7 +18,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableSwagger2
 public class Swagger2Config {
     @Bean
-    public Docket createRestApi(){
+    public Docket createRestApi() {
         return new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(apiInfo())
                 .select()
diff --git a/mallplus-search/src/main/java/com/zscat/mallplus/search/controller/EsProductController.java b/mallplus-search/src/main/java/com/zscat/mallplus/search/controller/EsProductController.java
index 389c84051ce3647d4732146ebd796b5413bc877d..4e6572637f53d5c90df745020eec8bb690b3782e 100644
--- a/mallplus-search/src/main/java/com/zscat/mallplus/search/controller/EsProductController.java
+++ b/mallplus-search/src/main/java/com/zscat/mallplus/search/controller/EsProductController.java
@@ -65,8 +65,8 @@ public class EsProductController {
     @RequestMapping(value = "/search/simple", method = RequestMethod.GET)
     @ResponseBody
     public Object search(@RequestParam(required = false) String keyword,
-                                                      @RequestParam(required = false, defaultValue = "0") Integer pageNum,
-                                                      @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
+                         @RequestParam(required = false, defaultValue = "0") Integer pageNum,
+                         @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
         Page<EsProduct> esProductPage = esProductService.search(keyword, pageNum, pageSize);
         return new CommonResult().success(esProductPage);
     }
@@ -77,11 +77,11 @@ public class EsProductController {
     @RequestMapping(value = "/search", method = RequestMethod.GET)
     @ResponseBody
     public Object search(@RequestParam(required = false) String keyword,
-                                                      @RequestParam(required = false) Long brandId,
-                                                      @RequestParam(required = false) Long productCategoryId,
-                                                      @RequestParam(required = false, defaultValue = "0") Integer pageNum,
-                                                      @RequestParam(required = false, defaultValue = "10") Integer pageSize,
-                                                      @RequestParam(required = false, defaultValue = "0") Integer sort) {
+                         @RequestParam(required = false) Long brandId,
+                         @RequestParam(required = false) Long productCategoryId,
+                         @RequestParam(required = false, defaultValue = "0") Integer pageNum,
+                         @RequestParam(required = false, defaultValue = "10") Integer pageSize,
+                         @RequestParam(required = false, defaultValue = "0") Integer sort) {
         Page<EsProduct> esProductPage = esProductService.search(keyword, brandId, productCategoryId, pageNum, pageSize, sort);
         return new CommonResult().success(esProductPage);
     }
@@ -90,10 +90,10 @@ public class EsProductController {
     @RequestMapping(value = "/recommend/{id}", method = RequestMethod.GET)
     @ResponseBody
     public Object recommend(@PathVariable Long id,
-                                                         @RequestParam(required = false, defaultValue = "0") Integer pageNum,
-                                                         @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
+                            @RequestParam(required = false, defaultValue = "0") Integer pageNum,
+                            @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
         Page<EsProduct> esProductPage = esProductService.recommend(id, pageNum, pageSize);
-        return new  CommonResult().success(esProductPage);
+        return new CommonResult().success(esProductPage);
     }
 
     @ApiOperation(value = "获取搜索的相关品牌、分类及筛选属性")
diff --git a/mallplus-search/src/main/java/com/zscat/mallplus/search/domain/EsProduct.java b/mallplus-search/src/main/java/com/zscat/mallplus/search/domain/EsProduct.java
index 9b66054e7a5402b44b5b1ed559b7171c99e7027b..9af8e2ce067d87284d20eaa0d5193312f326b543 100644
--- a/mallplus-search/src/main/java/com/zscat/mallplus/search/domain/EsProduct.java
+++ b/mallplus-search/src/main/java/com/zscat/mallplus/search/domain/EsProduct.java
@@ -13,7 +13,7 @@ import java.util.List;
  * 搜索中的商品信息
  * Created by mallplus on 2018/6/19.
  */
-@Document(indexName = "pms", type = "product",shards = 1,replicas = 0)
+@Document(indexName = "pms", type = "product", shards = 1, replicas = 0)
 public class EsProduct implements Serializable {
     private static final long serialVersionUID = -1L;
     @Id
@@ -27,11 +27,11 @@ public class EsProduct implements Serializable {
     @Field(type = FieldType.Keyword)
     private String productCategoryName;
     private String pic;
-    @Field(analyzer = "ik_max_word",type = FieldType.Text)
+    @Field(analyzer = "ik_max_word", type = FieldType.Text)
     private String name;
-    @Field(analyzer = "ik_max_word",type = FieldType.Text)
+    @Field(analyzer = "ik_max_word", type = FieldType.Text)
     private String subTitle;
-    @Field(analyzer = "ik_max_word",type = FieldType.Text)
+    @Field(analyzer = "ik_max_word", type = FieldType.Text)
     private String keywords;
     private BigDecimal price;
     private Integer sale;
@@ -40,7 +40,7 @@ public class EsProduct implements Serializable {
     private Integer stock;
     private Integer promotionType;
     private Integer sort;
-    @Field(type =FieldType.Nested)
+    @Field(type = FieldType.Nested)
     private List<EsProductAttributeValue> attrValueList;
 
     public Long getId() {
diff --git a/mallplus-search/src/main/java/com/zscat/mallplus/search/domain/EsProductAttributeValue.java b/mallplus-search/src/main/java/com/zscat/mallplus/search/domain/EsProductAttributeValue.java
index 2c77166e68c5b8d438c4ce0598c2d5f7c6df8230..311d64cf53535659281e0c994d6b11cd347d362d 100644
--- a/mallplus-search/src/main/java/com/zscat/mallplus/search/domain/EsProductAttributeValue.java
+++ b/mallplus-search/src/main/java/com/zscat/mallplus/search/domain/EsProductAttributeValue.java
@@ -19,8 +19,9 @@ public class EsProductAttributeValue implements Serializable {
     //属性参数：0->规格；1->参数
     private Integer type;
     //属性名称
-    @Field(type=FieldType.Keyword)
+    @Field(type = FieldType.Keyword)
     private String name;
+
     public Long getId() {
         return id;
     }
diff --git a/mallplus-search/src/main/java/com/zscat/mallplus/search/domain/EsProductRelatedInfo.java b/mallplus-search/src/main/java/com/zscat/mallplus/search/domain/EsProductRelatedInfo.java
index 5349ae5ae253c044fcc1cb7e9fb2c623a89594ba..77952478d3295ae622b13b3c669dd42fdf358aae 100644
--- a/mallplus-search/src/main/java/com/zscat/mallplus/search/domain/EsProductRelatedInfo.java
+++ b/mallplus-search/src/main/java/com/zscat/mallplus/search/domain/EsProductRelatedInfo.java
@@ -9,7 +9,7 @@ import java.util.List;
 public class EsProductRelatedInfo {
     private List<String> brandNames;
     private List<String> productCategoryNames;
-    private List<ProductAttr>   productAttrs;
+    private List<ProductAttr> productAttrs;
 
     public List<String> getBrandNames() {
         return brandNames;
@@ -35,7 +35,7 @@ public class EsProductRelatedInfo {
         this.productAttrs = productAttrs;
     }
 
-    public static class ProductAttr{
+    public static class ProductAttr {
         private Long attrId;
         private String attrName;
         private List<String> attrValues;
diff --git a/mallplus-search/src/main/java/com/zscat/mallplus/search/repository/EsProductRepository.java b/mallplus-search/src/main/java/com/zscat/mallplus/search/repository/EsProductRepository.java
index c5fcc56767a3505800fef4976b4d90c9a52ec0ba..bef85ea7553d64d2e4cfab71e2c3fa058e362c1e 100644
--- a/mallplus-search/src/main/java/com/zscat/mallplus/search/repository/EsProductRepository.java
+++ b/mallplus-search/src/main/java/com/zscat/mallplus/search/repository/EsProductRepository.java
@@ -13,12 +13,12 @@ public interface EsProductRepository extends ElasticsearchRepository<EsProduct,
     /**
      * 搜索查询
      *
-     * @param name              商品名称
-     * @param subTitle          商品标题
-     * @param keywords          商品关键字
-     * @param page              分页信息
+     * @param name     商品名称
+     * @param subTitle 商品标题
+     * @param keywords 商品关键字
+     * @param page     分页信息
      * @return
      */
-    Page<EsProduct> findByNameOrSubTitleOrKeywords(String name, String subTitle, String keywords,Pageable page);
+    Page<EsProduct> findByNameOrSubTitleOrKeywords(String name, String subTitle, String keywords, Pageable page);
 
 }
diff --git a/mallplus-search/src/main/java/com/zscat/mallplus/search/service/EsProductService.java b/mallplus-search/src/main/java/com/zscat/mallplus/search/service/EsProductService.java
index ba89aa886c454bd9424e1087b46eee053463afb8..9eb9160b7d403ab5c0f82f9890f6d774511bf3c1 100644
--- a/mallplus-search/src/main/java/com/zscat/mallplus/search/service/EsProductService.java
+++ b/mallplus-search/src/main/java/com/zscat/mallplus/search/service/EsProductService.java
@@ -39,7 +39,7 @@ public interface EsProductService {
     /**
      * 根据关键字搜索名称或者副标题复合查询
      */
-    Page<EsProduct> search(String keyword, Long brandId, Long productCategoryId, Integer pageNum, Integer pageSize,Integer sort);
+    Page<EsProduct> search(String keyword, Long brandId, Long productCategoryId, Integer pageNum, Integer pageSize, Integer sort);
 
     /**
      * 根据商品id推荐相关商品
diff --git a/mallplus-search/src/main/java/com/zscat/mallplus/search/service/impl/EsProductServiceImpl.java b/mallplus-search/src/main/java/com/zscat/mallplus/search/service/impl/EsProductServiceImpl.java
index c4dbf661e01d166a1f00a983cab5c80151ca779c..93d419815997cd990594cead960568497fbfb073 100644
--- a/mallplus-search/src/main/java/com/zscat/mallplus/search/service/impl/EsProductServiceImpl.java
+++ b/mallplus-search/src/main/java/com/zscat/mallplus/search/service/impl/EsProductServiceImpl.java
@@ -54,6 +54,7 @@ public class EsProductServiceImpl implements EsProductService {
     private EsProductRepository productRepository;
     @Autowired
     private ElasticsearchTemplate elasticsearchTemplate;
+
     @Override
     public int importAll() {
         List<EsProduct> esProductList = productDao.getAllEsProductList(null);
@@ -103,7 +104,7 @@ public class EsProductServiceImpl implements EsProductService {
     }
 
     @Override
-    public Page<EsProduct> search(String keyword, Long brandId, Long productCategoryId, Integer pageNum, Integer pageSize,Integer sort) {
+    public Page<EsProduct> search(String keyword, Long brandId, Long productCategoryId, Integer pageNum, Integer pageSize, Integer sort) {
         Pageable pageable = PageRequest.of(pageNum, pageSize);
         NativeSearchQueryBuilder nativeSearchQueryBuilder = new NativeSearchQueryBuilder();
         //分页
@@ -138,19 +139,19 @@ public class EsProductServiceImpl implements EsProductService {
             nativeSearchQueryBuilder.withQuery(functionScoreQueryBuilder);
         }
         //排序
-        if(sort==1){
+        if (sort == 1) {
             //按新品从新到旧
             nativeSearchQueryBuilder.withSort(SortBuilders.fieldSort("id").order(SortOrder.DESC));
-        }else if(sort==2){
+        } else if (sort == 2) {
             //按销量从高到低
             nativeSearchQueryBuilder.withSort(SortBuilders.fieldSort("sale").order(SortOrder.DESC));
-        }else if(sort==3){
+        } else if (sort == 3) {
             //按价格从低到高
             nativeSearchQueryBuilder.withSort(SortBuilders.fieldSort("price").order(SortOrder.ASC));
-        }else if(sort==4){
+        } else if (sort == 4) {
             //按价格从高到低
             nativeSearchQueryBuilder.withSort(SortBuilders.fieldSort("price").order(SortOrder.DESC));
-        }else{
+        } else {
             //按相关度
             nativeSearchQueryBuilder.withSort(SortBuilders.scoreSort().order(SortOrder.DESC));
         }
@@ -200,28 +201,28 @@ public class EsProductServiceImpl implements EsProductService {
     public EsProductRelatedInfo searchRelatedInfo(String keyword) {
         NativeSearchQueryBuilder builder = new NativeSearchQueryBuilder();
         //搜索条件
-        if(StringUtils.isEmpty(keyword)){
+        if (StringUtils.isEmpty(keyword)) {
             builder.withQuery(QueryBuilders.matchAllQuery());
-        }else{
-            builder.withQuery(QueryBuilders.multiMatchQuery(keyword,"name","subTitle","keywords"));
+        } else {
+            builder.withQuery(QueryBuilders.multiMatchQuery(keyword, "name", "subTitle", "keywords"));
         }
         //聚合搜索品牌名称
         builder.addAggregation(AggregationBuilders.terms("brandNames").field("brandName"));
         //集合搜索分类名称
         builder.addAggregation(AggregationBuilders.terms("productCategoryNames").field("productCategoryName"));
         //聚合搜索商品属性，去除type=1的属性
-        AbstractAggregationBuilder aggregationBuilder = AggregationBuilders.nested("allAttrValues","attrValueList")
-                .subAggregation(AggregationBuilders.filter("productAttrs",QueryBuilders.termQuery("attrValueList.type",1))
-                .subAggregation(AggregationBuilders.terms("attrIds")
-                        .field("attrValueList.productAttributeId")
-                        .subAggregation(AggregationBuilders.terms("attrValues")
-                                .field("attrValueList.value"))
-                        .subAggregation(AggregationBuilders.terms("attrNames")
-                                .field("attrValueList.name"))));
+        AbstractAggregationBuilder aggregationBuilder = AggregationBuilders.nested("allAttrValues", "attrValueList")
+                .subAggregation(AggregationBuilders.filter("productAttrs", QueryBuilders.termQuery("attrValueList.type", 1))
+                        .subAggregation(AggregationBuilders.terms("attrIds")
+                                .field("attrValueList.productAttributeId")
+                                .subAggregation(AggregationBuilders.terms("attrValues")
+                                        .field("attrValueList.value"))
+                                .subAggregation(AggregationBuilders.terms("attrNames")
+                                        .field("attrValueList.name"))));
         builder.addAggregation(aggregationBuilder);
         NativeSearchQuery searchQuery = builder.build();
         return elasticsearchTemplate.query(searchQuery, response -> {
-            LOGGER.info("DSL:{}",searchQuery.getQuery().toString());
+            LOGGER.info("DSL:{}", searchQuery.getQuery().toString());
             return convertProductRelatedInfo(response);
         });
     }
@@ -235,14 +236,14 @@ public class EsProductServiceImpl implements EsProductService {
         //设置品牌
         Aggregation brandNames = aggregationMap.get("brandNames");
         List<String> brandNameList = new ArrayList<>();
-        for(int i = 0; i<((Terms) brandNames).getBuckets().size(); i++){
+        for (int i = 0; i < ((Terms) brandNames).getBuckets().size(); i++) {
             brandNameList.add(((Terms) brandNames).getBuckets().get(i).getKeyAsString());
         }
         productRelatedInfo.setBrandNames(brandNameList);
         //设置分类
         Aggregation productCategoryNames = aggregationMap.get("productCategoryNames");
         List<String> productCategoryNameList = new ArrayList<>();
-        for(int i=0;i<((Terms) productCategoryNames).getBuckets().size();i++){
+        for (int i = 0; i < ((Terms) productCategoryNames).getBuckets().size(); i++) {
             productCategoryNameList.add(((Terms) productCategoryNames).getBuckets().get(i).getKeyAsString());
         }
         productRelatedInfo.setProductCategoryNames(productCategoryNameList);
@@ -260,7 +261,7 @@ public class EsProductServiceImpl implements EsProductService {
                 attrValueList.add(attrValue.getKeyAsString());
             }
             attr.setAttrValues(attrValueList);
-            if(!CollectionUtils.isEmpty(attrNames)){
+            if (!CollectionUtils.isEmpty(attrNames)) {
                 String attrName = attrNames.get(0).getKeyAsString();
                 attr.setAttrName(attrName);
             }
diff --git a/mallplus-search/src/main/resources/application.yml b/mallplus-search/src/main/resources/application.yml
index 032f48da97248e3b630da4247fde912e4416ac47..3f0d2f7a84e54e74d498ef7313f69541edf2b4f0 100644
--- a/mallplus-search/src/main/resources/application.yml
+++ b/mallplus-search/src/main/resources/application.yml
@@ -5,20 +5,20 @@ spring:
 server:
   port: 8083
 mybatis-plus:
-    configuration:
-        cache-enabled: false
-        map-underscore-to-camel-case: true
-    global-config:
-        db-config:
-            column-underline: true
-            db-type: mysql
-            field-strategy: not_empty
-            id-type: id_worker
-            logic-delete-value: 0
-            logic-not-delete-value: 1
-        refresh: true
-    mapper-locations: classpath:dao/*.xml
-    typeAliasesPackage: com.zscat.mallplus.*.domain
+  configuration:
+    cache-enabled: false
+    map-underscore-to-camel-case: true
+  global-config:
+    db-config:
+      column-underline: true
+      db-type: mysql
+      field-strategy: not_empty
+      id-type: id_worker
+      logic-delete-value: 0
+      logic-not-delete-value: 1
+    refresh: true
+  mapper-locations: classpath:dao/*.xml
+  typeAliasesPackage: com.zscat.mallplus.*.domain
 
 logging:
   level:
diff --git a/mallplus-search/src/main/resources/dao/EsProductDao.xml b/mallplus-search/src/main/resources/dao/EsProductDao.xml
index c5d6a5beae6571cbe130bf0b68e09ccec1e9ab8e..5fd5b8737e26d2676d6ac2b141f3ba4014798247 100644
--- a/mallplus-search/src/main/resources/dao/EsProductDao.xml
+++ b/mallplus-search/src/main/resources/dao/EsProductDao.xml
@@ -2,8 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zscat.mallplus.search.dao.EsProductDao">
     <resultMap id="esProductListMap" type="com.zscat.mallplus.search.domain.EsProduct" autoMapping="true">
-        <id column="id" jdbcType="BIGINT" property="id" />
-        <collection property="attrValueList" columnPrefix="attr_" ofType="com.zscat.mallplus.search.domain.EsProductAttributeValue">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <collection property="attrValueList" columnPrefix="attr_"
+                    ofType="com.zscat.mallplus.search.domain.EsProductAttributeValue">
             <id column="id" property="id" jdbcType="BIGINT"/>
             <result column="product_attribute_id" property="productAttributeId" jdbcType="BIGINT"/>
             <result column="value" property="value" jdbcType="VARCHAR"/>
@@ -13,28 +14,28 @@
     </resultMap>
     <select id="getAllEsProductList" resultMap="esProductListMap">
         select
-            p.id id,
-            p.product_sn productSn,
-            p.brand_id brandId,
-            p.brand_name brandName,
-            p.product_category_id productCategoryId,
-            p.product_category_name productCategoryName,
-            p.pic pic,
-            p.name name,
-            p.sub_title subTitle,
-            p.price price,
-            p.sale sale,
-            p.new_status newStatus,
-            p.recommand_status recommandStatus,
-            p.stock stock,
-            p.promotion_type promotionType,
-            p.keywords keywords,
-            p.sort sort,
-            pav.id attr_id,
-            pav.value attr_value,
-            pav.product_attribute_id attr_product_attribute_id,
-            pa.type attr_type,
-            pa.name attr_name
+        p.id id,
+        p.product_sn productSn,
+        p.brand_id brandId,
+        p.brand_name brandName,
+        p.product_category_id productCategoryId,
+        p.product_category_name productCategoryName,
+        p.pic pic,
+        p.name name,
+        p.sub_title subTitle,
+        p.price price,
+        p.sale sale,
+        p.new_status newStatus,
+        p.recommand_status recommandStatus,
+        p.stock stock,
+        p.promotion_type promotionType,
+        p.keywords keywords,
+        p.sort sort,
+        pav.id attr_id,
+        pav.value attr_value,
+        pav.product_attribute_id attr_product_attribute_id,
+        pa.type attr_type,
+        pa.name attr_name
         from pms_product p
         left join pms_product_attribute_value pav on p.id = pav.product_id
         left join pms_product_attribute pa on pav.product_attribute_id= pa.id
@@ -43,4 +44,4 @@
             and p.id=#{id}
         </if>
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/mallplus-search/src/test/java/com/zscat/mallplus/search/MallSearchApplicationTests.java b/mallplus-search/src/test/java/com/zscat/mallplus/search/MallSearchApplicationTests.java
index 5c464db3aa596e7be4cc4a814405ebdff59f68ff..c0da654b63f5b9b175560a8de9582151d16ce50d 100644
--- a/mallplus-search/src/test/java/com/zscat/mallplus/search/MallSearchApplicationTests.java
+++ b/mallplus-search/src/test/java/com/zscat/mallplus/search/MallSearchApplicationTests.java
@@ -19,16 +19,19 @@ public class MallSearchApplicationTests {
     private EsProductDao productDao;
     @Autowired
     private ElasticsearchTemplate elasticsearchTemplate;
+
     @Test
     public void contextLoads() {
     }
+
     @Test
-    public void testGetAllEsProductList(){
+    public void testGetAllEsProductList() {
         List<EsProduct> esProductList = productDao.getAllEsProductList(null);
         System.out.print(esProductList);
     }
+
     @Test
-    public void testEsProductMapping(){
+    public void testEsProductMapping() {
         elasticsearchTemplate.putMapping(EsProduct.class);
         Map mapping = elasticsearchTemplate.getMapping(EsProduct.class);
         System.out.println(mapping);
diff --git a/mallplus-wechat/.gitignore b/mallplus-wechat/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..b00daed635f8aba6ffed7166123c73263a74aac8
--- /dev/null
+++ b/mallplus-wechat/.gitignore
@@ -0,0 +1,2 @@
+# MyBatis generate files #
+src\main\resources\com\zscat\mall\mapper
\ No newline at end of file
diff --git a/mallplus-wechat/libs/bcprov-jdk15on-1.54.jar b/mallplus-wechat/libs/bcprov-jdk15on-1.54.jar
new file mode 100644
index 0000000000000000000000000000000000000000..bd95185ae8129aa3781f43bc09a194c7bd4121b1
Binary files /dev/null and b/mallplus-wechat/libs/bcprov-jdk15on-1.54.jar differ
diff --git a/mallplus-wechat/pom.xml b/mallplus-wechat/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e2212dfecd81754a01cacd96a28fdc3012a92de7
--- /dev/null
+++ b/mallplus-wechat/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.zscat.mallplus</groupId>
+    <artifactId>mallplus-wechat</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>mallplus-wechat</name>
+    <description>mallplus-wechat project for mall</description>
+    <properties>
+        <alipay.version>4.8.10.ALL</alipay.version>
+        <fastjson.version>1.2.62</fastjson.version>
+        <jdk.version>1.8</jdk.version>
+        <junit.version>4.12</junit.version>
+        <hutool.version>5.0.4</hutool.version>
+
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-mp</artifactId>
+            <version>3.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>wx-java-pay-spring-boot-starter</artifactId>
+            <version>3.5.0</version>
+        </dependency>
+        <!--lombok依赖-->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.10</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-mp</artifactId>
+            <version>3.2.0</version>
+        </dependency>
+
+        <!--        <dependency>-->
+        <!--            <groupId>com.github.binarywang</groupId>-->
+        <!--            <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>-->
+        <!--            <version>3.5.0</version>-->
+        <!--        </dependency>-->
+    </dependencies>
+
+</project>
diff --git "a/mallplus\350\241\250\347\273\223\346\236\204.html" "b/mallplus\350\241\250\347\273\223\346\236\204.html"
index 3a6423b48a8f28cc06c4ea180bfa4633eb0f1277..f8f6714f74e0401c527ff576e10ce58344d60498 100644
--- "a/mallplus\350\241\250\347\273\223\346\236\204.html"
+++ "b/mallplus\350\241\250\347\273\223\346\236\204.html"
@@ -1,16369 +1,16372 @@
 <!DOCTYPE html>
 <html>
 
-	<head>
-		<!-- Standard Meta -->
-		<meta charset="utf-8" />
-		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-		<!-- Site Properties -->
-		<title>mallplus</title>
-		<link href="https://cdn.bootcss.com/semantic-ui/2.3.0/semantic.min.css" rel="stylesheet">
-		<script src="https://cdn.bootcss.com/jquery/2.1.4/jquery.min.js"></script>
-		<script src="https://cdn.bootcss.com/semantic-ui/2.3.0/semantic.min.js"></script>
-		<!-- Content JS HERE !-->
-		<style>
-			.last.container {
-				margin-bottom: 300px !important;
-			}
-			
-			h1.ui.center.header {
-				margin-top: 3em;
-			}
-			
-			h2.ui.center.header {
-				margin: 4em 0em 2em;
-			}
-			
-			h3.ui.center.header {
-				margin-top: 2em;
-				padding: 2em 0em;
-			}
-			.hide{
-				display: none;
-			}
-		</style>
-	</head>
-
-	<body>
-		<!-- 目录开始 -->
-		<h1 id="top" class="ui center aligned header ">数据库名称：mallplus</h1>
-		
-		<div  class="ui text container last db-index">
-			<h3 class="ui center aligned">目录</h3>
-			
-				<div class="ui segment">
-					<div class="ui list divided ">
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(0)">1. area
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(1)">2. city
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(2)">3. cms_employ_info
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(3)">4. cms_help
-									(帮助表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(4)">5. cms_help_category
-									(帮助分类表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(5)">6. cms_member_report
-									(用户举报表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(6)">7. cms_parter
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(7)">8. cms_prefrence_area
-									(优选专区)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(8)">9. cms_prefrence_area_product_relation
-									(优选专区和产品关系表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(9)">10. cms_subject
-									(专题表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(10)">11. cms_subject_category
-									(专题分类表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(11)">12. cms_subject_comment
-									(专题评论表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(12)">13. cms_subject_product_relation
-									(专题商品关系表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(13)">14. cms_topic
-									(话题表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(14)">15. cms_topic_category
-									(话题分类表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(15)">16. cms_topic_comment
-									(专题评论表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(16)">17. cms_topic_member
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(17)">18. college
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(18)">19. oms_cart_item
-									(购物车表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(19)">20. oms_company_address
-									(公司收发货地址表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(20)">21. oms_express_company
-									(物流公司表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(21)">22. oms_express_info
-									(物流信息表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(22)">23. oms_order
-									(订单表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(23)">24. oms_order_item
-									(订单中所包含的商品)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(24)">25. oms_order_operate_history
-									(订单操作历史记录)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(25)">26. oms_order_return_apply
-									(订单退货申请)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(26)">27. oms_order_return_reason
-									(退货原因表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(27)">28. oms_order_setting
-									(订单设置表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(28)">29. pms_album
-									(相册表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(29)">30. pms_album_pic
-									(画册图片表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(30)">31. pms_brand
-									(品牌表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(31)">32. pms_comment
-									(商品评价表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(32)">33. pms_comment_replay
-									(产品评价回复表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(33)">34. pms_favorite
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(34)">35. pms_feight_template
-									(运费模版)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(35)">36. pms_member_price
-									(商品会员价格表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(36)">37. pms_product
-									(商品信息)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(37)">38. pms_product_attribute
-									(商品属性参数表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(38)">39. pms_product_attribute_category
-									(产品属性分类表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(39)">40. pms_product_attribute_value
-									(存储产品参数信息的表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(40)">41. pms_product_category
-									(产品分类)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(41)">42. pms_product_category_attribute_relation
-									(产品的分类和属性的关系表，用于设置分类筛选条件（只支持一级分类）)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(42)">43. pms_product_consult
-									(产品咨询表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(43)">44. pms_product_full_reduction
-									(产品满减表(只针对同商品))
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(44)">45. pms_product_ladder
-									(产品阶梯价格表(只针对同商品))
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(45)">46. pms_product_operate_log
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(46)">47. pms_product_vertify_record
-									(商品审核记录)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(47)">48. pms_sku_stock
-									(sku的库存)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(48)">49. pms_small_navicon_category
-									(小程序首页nav管理)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(49)">50. province
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(50)">51. school
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(51)">52. shopping_store
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(52)">53. sms_coupon
-									(优惠卷表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(53)">54. sms_coupon_history
-									(优惠券使用、领取历史表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(54)">55. sms_coupon_product_category_relation
-									(优惠券和产品分类关系表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(55)">56. sms_coupon_product_relation
-									(优惠券和产品的关系表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(56)">57. sms_flash_promotion
-									(限时购表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(57)">58. sms_flash_promotion_log
-									(限时购通知记录)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(58)">59. sms_flash_promotion_product_relation
-									(商品限时购与商品关系表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(59)">60. sms_flash_promotion_session
-									(限时购场次表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(60)">61. sms_group
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(61)">62. sms_group_member
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(62)">63. sms_home_advertise
-									(首页轮播广告表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(63)">64. sms_home_brand
-									(首页推荐品牌表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(64)">65. sms_home_new_product
-									(新鲜好物表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(65)">66. sms_home_recommend_product
-									(人气推荐商品表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(66)">67. sms_home_recommend_subject
-									(首页推荐专题表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(67)">68. sms_red_packet
-									(红包)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(68)">69. sms_user_red_packet
-									(用户红包)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(69)">70. sys_admin_log
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(70)">71. sys_applet_set
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(71)">72. sys_area
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(72)">73. sys_dict
-									(系统配置信息表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(73)">74. sys_member_area
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(74)">75. sys_permission
-									(后台用户权限表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(75)">76. sys_permission_category
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(76)">77. sys_role
-									(后台用户角色表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(77)">78. sys_role_permission
-									(后台用户角色和权限关系表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(78)">79. sys_school
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(79)">80. sys_sms
-									(发短信记录)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(80)">81. sys_store
-									(店铺表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(81)">82. sys_user
-									(后台用户表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(82)">83. sys_user_permission
-									(后台用户和权限关系表(除角色中定义的权限以外的加减权限))
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(83)">84. sys_user_role
-									(后台用户和角色关系表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(84)">85. sys_web_log
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(85)">86. tb_health_push_task
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(86)">87. tb_health_push_task_user
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(87)">88. tb_panel
-									(内容分类)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(88)">89. tb_panel_content
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(89)">90. tb_user_from_id
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(90)">91. ums_collect
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(91)">92. ums_growth_change_history
-									(成长值变化历史记录表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(92)">93. ums_integration_change_history
-									(积分变化历史记录表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(93)">94. ums_integration_consume_setting
-									(积分消费设置)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(94)">95. ums_member
-									(会员表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(95)">96. ums_member_blance_log
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(96)">97. ums_member_level
-									(会员等级表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(97)">98. ums_member_login_log
-									(会员登录记录)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(98)">99. ums_member_member_tag_relation
-									(用户和标签关系表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(99)">100. ums_member_product_category_relation
-									(会员与产品分类关系表（用户喜欢的分类）)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(100)">101. ums_member_receive_address
-									(会员收货地址表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(101)">102. ums_member_rule_setting
-									(会员积分成长规则表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(102)">103. ums_member_statistics_info
-									(会员统计信息)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(103)">104. ums_member_tag
-									(用户标签表)
-								</a>
-							</div>
-						</div>
-						
-						<div class="item">
-							<div class="content">
-								<a onclick="toTable(104)">105. ums_member_task
-									(会员任务表)
-								</a>
-							</div>
-						</div>
-						
-					</div>
-
-				</div>
-			
-		</div>
-		
-		<!--目录结束-->
-		<!--表说明开始-->
-		<div id="db-table-0" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:area</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>aid</td>
-						<td>smallint(5) unsigned</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>areaID</td>
-						<td>mediumint(8) unsigned</td>
-						<td></td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>area</td>
-						<td>char(50)</td>
-						<td></td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>cityID</td>
-						<td>mediumint(8) unsigned</td>
-						<td></td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>aid</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-1" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:city</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>cid</td>
-						<td>smallint(5) unsigned</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>cityID</td>
-						<td>mediumint(8) unsigned</td>
-						<td></td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>city</td>
-						<td>char(50)</td>
-						<td></td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>provinceID</td>
-						<td>mediumint(8) unsigned</td>
-						<td></td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>cid</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-2" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:cms_employ_info</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td>编号</td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(255)</td>
-						<td>姓名</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>age</td>
-						<td>int(11)</td>
-						<td>年纪</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>gender</td>
-						<td>varchar(255)</td>
-						<td>性别</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>hobby</td>
-						<td>varchar(255)</td>
-						<td>爱好</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>peoplenote</td>
-						<td>varchar(255)</td>
-						<td>人生物语</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>phone</td>
-						<td>varchar(255)</td>
-						<td>电话</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>address</td>
-						<td>varchar(255)</td>
-						<td>地址</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>suggestion</td>
-						<td>varchar(255)</td>
-						<td>建议</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>guide</td>
-						<td>varchar(255)</td>
-						<td>主管</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>guide1</td>
-						<td>varchar(255)</td>
-						<td>备管1</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>guide2</td>
-						<td>varchar(255)</td>
-						<td>备管2</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>createtime</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-3" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:cms_help</h3>
-			<h3 class="ui center aligned ">注释:帮助表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>category_id</td>
-						<td>bigint(20)</td>
-						<td>类别</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>icon</td>
-						<td>varchar(500)</td>
-						<td>图片</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>title</td>
-						<td>varchar(100)</td>
-						<td>标题</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>show_status</td>
-						<td>int(1)</td>
-						<td>状态</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>read_count</td>
-						<td>int(1)</td>
-						<td>点击量</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>content</td>
-						<td>text</td>
-						<td>内容</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-4" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:cms_help_category</h3>
-			<h3 class="ui center aligned ">注释:帮助分类表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(100)</td>
-						<td>标题</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>icon</td>
-						<td>varchar(500)</td>
-						<td>分类图标</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>help_count</td>
-						<td>int(11)</td>
-						<td>专题数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>show_status</td>
-						<td>int(2)</td>
-						<td>状态</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort</td>
-						<td>int(11)</td>
-						<td>排序</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-5" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:cms_member_report</h3>
-			<h3 class="ui center aligned ">注释:用户举报表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>report_type</td>
-						<td>int(1)</td>
-						<td>举报类型：0->商品评价；1->话题内容；2->用户评论</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>report_member_name</td>
-						<td>varchar(100)</td>
-						<td>举报人</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>report_object</td>
-						<td>varchar(100)</td>
-						<td>举报对象</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>report_status</td>
-						<td>int(1)</td>
-						<td>举报状态：0->未处理；1->已处理</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>handle_status</td>
-						<td>int(1)</td>
-						<td>处理结果：0->无效；1->有效；2->恶意</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>note</td>
-						<td>varchar(200)</td>
-						<td>内容</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-6" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:cms_parter</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>int(11)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>companyname</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>idcard</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>phone</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>info</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-7" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:cms_prefrence_area</h3>
-			<h3 class="ui center aligned ">注释:优选专区</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(255)</td>
-						<td>标题</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sub_title</td>
-						<td>varchar(255)</td>
-						<td>子标题</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>pic</td>
-						<td>varbinary(500)</td>
-						<td>展示图片</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort</td>
-						<td>int(11)</td>
-						<td>排序</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>show_status</td>
-						<td>int(1)</td>
-						<td>状态</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-8" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:cms_prefrence_area_product_relation</h3>
-			<h3 class="ui center aligned ">注释:优选专区和产品关系表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>prefrence_area_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-9" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:cms_subject</h3>
-			<h3 class="ui center aligned ">注释:专题表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>category_id</td>
-						<td>bigint(20)</td>
-						<td>分类</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>title</td>
-						<td>varchar(100)</td>
-						<td>标题</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>pic</td>
-						<td>varchar(500)</td>
-						<td>专题主图</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_count</td>
-						<td>int(11)</td>
-						<td>关联产品数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>recommend_status</td>
-						<td>int(1)</td>
-						<td>推荐</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>collect_count</td>
-						<td>int(11)</td>
-						<td>收藏量</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>read_count</td>
-						<td>int(11)</td>
-						<td>点击量</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>comment_count</td>
-						<td>int(11)</td>
-						<td>评论量</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>album_pics</td>
-						<td>varchar(1000)</td>
-						<td>画册图片用逗号分割</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>description</td>
-						<td>varchar(1000)</td>
-						<td>描述</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>show_status</td>
-						<td>int(1)</td>
-						<td>显示状态：0->不显示；1->显示</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>content</td>
-						<td>text</td>
-						<td>内容</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>forward_count</td>
-						<td>int(11)</td>
-						<td>转发数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>category_name</td>
-						<td>varchar(200)</td>
-						<td>专题分类名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>area_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>school_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>reward</td>
-						<td>int(11)</td>
-						<td>打赏</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-10" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:cms_subject_category</h3>
-			<h3 class="ui center aligned ">注释:专题分类表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(100)</td>
-						<td>标题</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>icon</td>
-						<td>varchar(500)</td>
-						<td>分类图标</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>subject_count</td>
-						<td>int(11)</td>
-						<td>专题数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>show_status</td>
-						<td>int(2)</td>
-						<td>状态</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort</td>
-						<td>int(11)</td>
-						<td>排序</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-11" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:cms_subject_comment</h3>
-			<h3 class="ui center aligned ">注释:专题评论表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>subject_id</td>
-						<td>bigint(20)</td>
-						<td>所属专题</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_nick_name</td>
-						<td>varchar(255)</td>
-						<td>用户名</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_icon</td>
-						<td>varchar(255)</td>
-						<td>用户图标</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>content</td>
-						<td>varchar(1000)</td>
-						<td>内容</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>show_status</td>
-						<td>int(1)</td>
-						<td>状态</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-12" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:cms_subject_product_relation</h3>
-			<h3 class="ui center aligned ">注释:专题商品关系表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>subject_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-13" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:cms_topic</h3>
-			<h3 class="ui center aligned ">注释:话题表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>category_id</td>
-						<td>bigint(20)</td>
-						<td>所属分类</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(255)</td>
-						<td>标题</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>start_time</td>
-						<td>datetime</td>
-						<td>开始时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>end_time</td>
-						<td>datetime</td>
-						<td>结束时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>attend_count</td>
-						<td>int(11)</td>
-						<td>参与人数</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>attention_count</td>
-						<td>int(11)</td>
-						<td>关注人数</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>read_count</td>
-						<td>int(11)</td>
-						<td>点击人数</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>award_name</td>
-						<td>varchar(100)</td>
-						<td>奖品名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>attend_type</td>
-						<td>varchar(100)</td>
-						<td>参与方式</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>content</td>
-						<td>text</td>
-						<td>话题内容</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-14" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:cms_topic_category</h3>
-			<h3 class="ui center aligned ">注释:话题分类表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(100)</td>
-						<td>标题</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>icon</td>
-						<td>varchar(500)</td>
-						<td>分类图标</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>subject_count</td>
-						<td>int(11)</td>
-						<td>专题数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>show_status</td>
-						<td>int(2)</td>
-						<td>状态</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort</td>
-						<td>int(11)</td>
-						<td>排序</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-15" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:cms_topic_comment</h3>
-			<h3 class="ui center aligned ">注释:专题评论表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>member_nick_name</td>
-						<td>varchar(255)</td>
-						<td>用户名</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>topic_id</td>
-						<td>bigint(20)</td>
-						<td>主题</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_icon</td>
-						<td>varchar(255)</td>
-						<td>图标</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>content</td>
-						<td>varchar(1000)</td>
-						<td>内容</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>show_status</td>
-						<td>int(1)</td>
-						<td>状态</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-16" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:cms_topic_member</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td>编号</td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>member_id</td>
-						<td>bigint(20)</td>
-						<td>会员编号</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>username</td>
-						<td>varchar(255)</td>
-						<td>会员</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>status</td>
-						<td>varchar(255)</td>
-						<td>状态</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>topic_id</td>
-						<td>bigint(20)</td>
-						<td>活动编号</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-17" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:college</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>coid</td>
-						<td>smallint(5) unsigned</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>char(100)</td>
-						<td></td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>provinceID</td>
-						<td>mediumint(8) unsigned</td>
-						<td></td>
-						<td>MUL</td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>coid</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>provinceID</td>
-						<td>provinceID</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-18" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:oms_cart_item</h3>
-			<h3 class="ui center aligned ">注释:购物车表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>product_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_sku_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>quantity</td>
-						<td>int(11)</td>
-						<td>购买数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>price</td>
-						<td>decimal(10,2)</td>
-						<td>添加到购物车的价格</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sp1</td>
-						<td>varchar(200)</td>
-						<td>销售属性1</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sp2</td>
-						<td>varchar(200)</td>
-						<td>销售属性2</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sp3</td>
-						<td>varchar(200)</td>
-						<td>销售属性3</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_pic</td>
-						<td>varchar(1000)</td>
-						<td>商品主图</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_name</td>
-						<td>varchar(500)</td>
-						<td>商品名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_sub_title</td>
-						<td>varchar(500)</td>
-						<td>商品副标题（卖点）</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_sku_code</td>
-						<td>varchar(200)</td>
-						<td>商品sku条码</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_nickname</td>
-						<td>varchar(500)</td>
-						<td>会员昵称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_date</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>modify_date</td>
-						<td>datetime</td>
-						<td>修改时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>delete_status</td>
-						<td>int(1)</td>
-						<td>是否删除</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_category_id</td>
-						<td>bigint(20)</td>
-						<td>商品分类</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_brand</td>
-						<td>varchar(200)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_sn</td>
-						<td>varchar(200)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_attr</td>
-						<td>varchar(500)</td>
-						<td>商品销售属性:[{"key":"颜色","value":"颜色"},{"key":"容量","value":"4G"}]</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>checked</td>
-						<td>int(11)</td>
-						<td>1x选中 2 枚选中</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-19" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:oms_company_address</h3>
-			<h3 class="ui center aligned ">注释:公司收发货地址表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>address_name</td>
-						<td>varchar(200)</td>
-						<td>地址名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>send_status</td>
-						<td>int(1)</td>
-						<td>默认发货地址：0->否；1->是</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>receive_status</td>
-						<td>int(1)</td>
-						<td>是否默认收货地址：0->否；1->是</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(64)</td>
-						<td>收发货人姓名</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>phone</td>
-						<td>varchar(64)</td>
-						<td>收货人电话</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>province</td>
-						<td>varchar(64)</td>
-						<td>省/直辖市</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>city</td>
-						<td>varchar(64)</td>
-						<td>市</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>region</td>
-						<td>varchar(64)</td>
-						<td>区</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>detail_address</td>
-						<td>varchar(200)</td>
-						<td>详细地址</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-20" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:oms_express_company</h3>
-			<h3 class="ui center aligned ">注释:物流公司表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>ID</td>
-						<td>int(11)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>EXPRESS_CORP_ID</td>
-						<td>varchar(32)</td>
-						<td></td>
-						<td>UNI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>EXPRESS_CORP_NAME</td>
-						<td>varchar(64)</td>
-						<td>快递公司名称</td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>STATUS</td>
-						<td>tinyint(4)</td>
-						<td>0 可用 1 不可用</td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>LOGO_URL</td>
-						<td>varchar(32)</td>
-						<td>快递公司logo</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>ID</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>EXPRESS_CORP_ID_UNIQUE</td>
-						<td>EXPRESS_CORP_ID</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-21" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:oms_express_info</h3>
-			<h3 class="ui center aligned ">注释:物流信息表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>ID</td>
-						<td>int(11)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>ORDER_ID</td>
-						<td>int(10) unsigned</td>
-						<td></td>
-						<td>UNI</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>EXPRESS_CORP_ID</td>
-						<td>varchar(32)</td>
-						<td>物流公司编码</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>EXPRESS_NO</td>
-						<td>varchar(32)</td>
-						<td>运单号</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>EXPRESS_STATUS</td>
-						<td>tinyint(4)</td>
-						<td>运单状态0.初始化 1.已发货 2 已签收</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>EXPRESS_DETAIL</td>
-						<td>mediumtext</td>
-						<td>物流详情</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>UPDATE_TIME</td>
-						<td>datetime</td>
-						<td>更新时间</td>
-						<td>MUL</td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>IDX_EXPRESS_INFO_ORDER_ID</td>
-						<td>ORDER_ID</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>PRIMARY</td>
-						<td>ID</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>IDX_EXPRESS_INFO_UPDATETIME</td>
-						<td>UPDATE_TIME</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-22" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:oms_order</h3>
-			<h3 class="ui center aligned ">注释:订单表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td>订单id</td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>member_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>coupon_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>order_sn</td>
-						<td>varchar(64)</td>
-						<td>订单编号</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>提交时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_username</td>
-						<td>varchar(512)</td>
-						<td>用户帐号</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>total_amount</td>
-						<td>decimal(10,2)</td>
-						<td>订单总金额</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>pay_amount</td>
-						<td>decimal(10,2)</td>
-						<td>应付金额（实际支付金额）</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>freight_amount</td>
-						<td>decimal(10,2)</td>
-						<td>运费金额</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>promotion_amount</td>
-						<td>decimal(10,2)</td>
-						<td>促销优化金额（促销价、满减、阶梯价）</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>integration_amount</td>
-						<td>decimal(10,2)</td>
-						<td>积分抵扣金额</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>coupon_amount</td>
-						<td>decimal(10,2)</td>
-						<td>优惠券抵扣金额</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>discount_amount</td>
-						<td>decimal(10,2)</td>
-						<td>管理员后台调整订单使用的折扣金额</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>pay_type</td>
-						<td>int(1)</td>
-						<td>支付方式：0->未支付；1->支付宝；2->微信</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>source_type</td>
-						<td>int(1)</td>
-						<td>订单来源：0->PC订单；1->app订单</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>status</td>
-						<td>int(1)</td>
-						<td>订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>order_type</td>
-						<td>int(1)</td>
-						<td>订单类型：0->正常订单；1->秒杀订单</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>delivery_company</td>
-						<td>varchar(64)</td>
-						<td>物流公司(配送方式)</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>delivery_sn</td>
-						<td>varchar(64)</td>
-						<td>物流单号</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>auto_confirm_day</td>
-						<td>int(11)</td>
-						<td>自动确认时间（天）</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>integration</td>
-						<td>int(11)</td>
-						<td>可以获得的积分</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>growth</td>
-						<td>int(11)</td>
-						<td>可以活动的成长值</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>promotion_info</td>
-						<td>varchar(100)</td>
-						<td>活动信息</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>bill_type</td>
-						<td>int(1)</td>
-						<td>发票类型：0->不开发票；1->电子发票；2->纸质发票</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>bill_header</td>
-						<td>varchar(200)</td>
-						<td>发票抬头</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>bill_content</td>
-						<td>varchar(200)</td>
-						<td>发票内容</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>bill_receiver_phone</td>
-						<td>varchar(32)</td>
-						<td>收票人电话</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>bill_receiver_email</td>
-						<td>varchar(64)</td>
-						<td>收票人邮箱</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>receiver_name</td>
-						<td>varchar(100)</td>
-						<td>收货人姓名</td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>receiver_phone</td>
-						<td>varchar(32)</td>
-						<td>收货人电话</td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>receiver_post_code</td>
-						<td>varchar(32)</td>
-						<td>收货人邮编</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>receiver_province</td>
-						<td>varchar(32)</td>
-						<td>省份/直辖市</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>receiver_city</td>
-						<td>varchar(32)</td>
-						<td>城市</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>receiver_region</td>
-						<td>varchar(32)</td>
-						<td>区</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>receiver_detail_address</td>
-						<td>varchar(200)</td>
-						<td>详细地址</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>note</td>
-						<td>varchar(500)</td>
-						<td>订单备注</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>confirm_status</td>
-						<td>int(1)</td>
-						<td>确认收货状态：0->未确认；1->已确认</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>delete_status</td>
-						<td>int(1)</td>
-						<td>删除状态：0->未删除；1->已删除</td>
-						<td></td>
-						<td>NO</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>use_integration</td>
-						<td>int(11)</td>
-						<td>下单时使用的积分</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>payment_time</td>
-						<td>datetime</td>
-						<td>支付时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>delivery_time</td>
-						<td>datetime</td>
-						<td>发货时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>receive_time</td>
-						<td>datetime</td>
-						<td>确认收货时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>comment_time</td>
-						<td>datetime</td>
-						<td>评价时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>modify_time</td>
-						<td>datetime</td>
-						<td>修改时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>prepay_id</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>supply_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>goods_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>goods_name</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>school_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>receiver_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-23" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:oms_order_item</h3>
-			<h3 class="ui center aligned ">注释:订单中所包含的商品</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>order_id</td>
-						<td>bigint(20)</td>
-						<td>订单id</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>order_sn</td>
-						<td>varchar(64)</td>
-						<td>订单编号</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_pic</td>
-						<td>varchar(500)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_name</td>
-						<td>varchar(200)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_brand</td>
-						<td>varchar(200)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_sn</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_price</td>
-						<td>decimal(10,2)</td>
-						<td>销售价格</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_quantity</td>
-						<td>int(11)</td>
-						<td>购买数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_sku_id</td>
-						<td>bigint(20)</td>
-						<td>商品sku编号</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_sku_code</td>
-						<td>varchar(50)</td>
-						<td>商品sku条码</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_category_id</td>
-						<td>bigint(20)</td>
-						<td>商品分类id</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sp1</td>
-						<td>varchar(100)</td>
-						<td>商品的销售属性</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sp2</td>
-						<td>varchar(100)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sp3</td>
-						<td>varchar(100)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>promotion_name</td>
-						<td>varchar(200)</td>
-						<td>商品促销名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>promotion_amount</td>
-						<td>decimal(10,2)</td>
-						<td>商品促销分解金额</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>coupon_amount</td>
-						<td>decimal(10,2)</td>
-						<td>优惠券优惠分解金额</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>integration_amount</td>
-						<td>decimal(10,2)</td>
-						<td>积分优惠分解金额</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>real_amount</td>
-						<td>decimal(10,2)</td>
-						<td>该商品经过优惠后的分解金额</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>gift_integration</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>gift_growth</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_attr</td>
-						<td>varchar(500)</td>
-						<td>商品销售属性:[{"key":"颜色","value":"颜色"},{"key":"容量","value":"4G"}]</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-24" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:oms_order_operate_history</h3>
-			<h3 class="ui center aligned ">注释:订单操作历史记录</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>order_id</td>
-						<td>bigint(20)</td>
-						<td>订单id</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>operate_man</td>
-						<td>varchar(100)</td>
-						<td>操作人：用户；系统；后台管理员</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>操作时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>order_status</td>
-						<td>int(1)</td>
-						<td>订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>note</td>
-						<td>varchar(500)</td>
-						<td>备注</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-25" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:oms_order_return_apply</h3>
-			<h3 class="ui center aligned ">注释:订单退货申请</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>order_id</td>
-						<td>bigint(20)</td>
-						<td>订单id</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>company_address_id</td>
-						<td>bigint(20)</td>
-						<td>收货地址表id</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_id</td>
-						<td>bigint(20)</td>
-						<td>退货商品id</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>order_sn</td>
-						<td>varchar(64)</td>
-						<td>订单编号</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>申请时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_username</td>
-						<td>varchar(64)</td>
-						<td>会员用户名</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>return_amount</td>
-						<td>decimal(10,2)</td>
-						<td>退款金额</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>return_name</td>
-						<td>varchar(100)</td>
-						<td>退货人姓名</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>return_phone</td>
-						<td>varchar(100)</td>
-						<td>退货人电话</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>status</td>
-						<td>int(1)</td>
-						<td>申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>handle_time</td>
-						<td>datetime</td>
-						<td>处理时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_pic</td>
-						<td>varchar(500)</td>
-						<td>商品图片</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_name</td>
-						<td>varchar(200)</td>
-						<td>商品名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_brand</td>
-						<td>varchar(200)</td>
-						<td>商品品牌</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_attr</td>
-						<td>varchar(500)</td>
-						<td>商品销售属性：颜色：红色；尺码：xl;</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_count</td>
-						<td>int(11)</td>
-						<td>退货数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_price</td>
-						<td>decimal(10,2)</td>
-						<td>商品单价</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_real_price</td>
-						<td>decimal(10,2)</td>
-						<td>商品实际支付单价</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>reason</td>
-						<td>varchar(200)</td>
-						<td>原因</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>description</td>
-						<td>varchar(500)</td>
-						<td>描述</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>proof_pics</td>
-						<td>varchar(1000)</td>
-						<td>凭证图片，以逗号隔开</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>handle_note</td>
-						<td>varchar(500)</td>
-						<td>处理备注</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>handle_man</td>
-						<td>varchar(100)</td>
-						<td>处理人员</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>receive_man</td>
-						<td>varchar(100)</td>
-						<td>收货人</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>receive_time</td>
-						<td>datetime</td>
-						<td>收货时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>receive_note</td>
-						<td>varchar(500)</td>
-						<td>收货备注</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-26" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:oms_order_return_reason</h3>
-			<h3 class="ui center aligned ">注释:退货原因表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(100)</td>
-						<td>退货类型</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>status</td>
-						<td>int(1)</td>
-						<td>状态：0->不启用；1->启用</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>添加时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-27" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:oms_order_setting</h3>
-			<h3 class="ui center aligned ">注释:订单设置表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>flash_order_overtime</td>
-						<td>int(11)</td>
-						<td>秒杀订单超时关闭时间(分)</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>normal_order_overtime</td>
-						<td>int(11)</td>
-						<td>正常订单超时时间(分)</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>confirm_overtime</td>
-						<td>int(11)</td>
-						<td>发货后自动确认收货时间（天）</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>finish_overtime</td>
-						<td>int(11)</td>
-						<td>自动完成交易时间，不能申请售后（天）</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>comment_overtime</td>
-						<td>int(11)</td>
-						<td>订单完成后自动好评时间（天）</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-28" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_album</h3>
-			<h3 class="ui center aligned ">注释:相册表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>pic</td>
-						<td>varchar(200)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>type</td>
-						<td>varchar(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>description</td>
-						<td>varchar(1000)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-29" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_album_pic</h3>
-			<h3 class="ui center aligned ">注释:画册图片表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>album_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>pic</td>
-						<td>varchar(1000)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-30" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_brand</h3>
-			<h3 class="ui center aligned ">注释:品牌表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>first_letter</td>
-						<td>varchar(8)</td>
-						<td>首字母</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>factory_status</td>
-						<td>int(1)</td>
-						<td>是否为品牌制造商：0->不是；1->是</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>show_status</td>
-						<td>int(1)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_count</td>
-						<td>int(11)</td>
-						<td>产品数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_comment_count</td>
-						<td>int(11)</td>
-						<td>产品评论数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>logo</td>
-						<td>varchar(255)</td>
-						<td>品牌logo</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>big_pic</td>
-						<td>varchar(255)</td>
-						<td>专区大图</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>brand_story</td>
-						<td>text</td>
-						<td>品牌故事</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-31" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_comment</h3>
-			<h3 class="ui center aligned ">注释:商品评价表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>product_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_nick_name</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_name</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>star</td>
-						<td>int(3)</td>
-						<td>评价星数：0->5</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_ip</td>
-						<td>varchar(64)</td>
-						<td>评价的ip</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>show_status</td>
-						<td>int(1)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_attribute</td>
-						<td>varchar(255)</td>
-						<td>购买时的商品属性</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>collect_couont</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>read_count</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>content</td>
-						<td>text</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>pics</td>
-						<td>varchar(1000)</td>
-						<td>上传图片地址，以逗号隔开</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_icon</td>
-						<td>varchar(255)</td>
-						<td>评论用户头像</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>replay_count</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-32" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_comment_replay</h3>
-			<h3 class="ui center aligned ">注释:产品评价回复表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>comment_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_nick_name</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_icon</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>content</td>
-						<td>varchar(1000)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>type</td>
-						<td>int(1)</td>
-						<td>评论人员类型；0->会员；1->管理员</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-33" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_favorite</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>add_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>type</td>
-						<td>int(11)</td>
-						<td>1 商品 2 文章 3 店铺</td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>obj_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>meno1</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>meno2</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>meno3</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>FKAFC41E931E208F02</td>
-						<td>member_id</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>FKAFC41E93339519D2</td>
-						<td>obj_id</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>FKAFC41E931C0CA9F2</td>
-						<td>store_id</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-34" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_feight_template</h3>
-			<h3 class="ui center aligned ">注释:运费模版</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>charge_type</td>
-						<td>int(1)</td>
-						<td>计费类型:0->按重量；1->按件数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>first_weight</td>
-						<td>decimal(10,2)</td>
-						<td>首重kg</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>first_fee</td>
-						<td>decimal(10,2)</td>
-						<td>首费（元）</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>continue_weight</td>
-						<td>decimal(10,2)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>continme_fee</td>
-						<td>decimal(10,2)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>dest</td>
-						<td>varchar(255)</td>
-						<td>目的地（省、市）</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-35" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_member_price</h3>
-			<h3 class="ui center aligned ">注释:商品会员价格表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>product_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_level_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_price</td>
-						<td>decimal(10,2)</td>
-						<td>会员价格</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_level_name</td>
-						<td>varchar(100)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-36" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_product</h3>
-			<h3 class="ui center aligned ">注释:商品信息</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>brand_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_category_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>feight_template_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_attribute_category_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>pic</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_sn</td>
-						<td>varchar(64)</td>
-						<td>货号</td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>delete_status</td>
-						<td>int(1)</td>
-						<td>删除状态：0->未删除；1->已删除</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>publish_status</td>
-						<td>int(1)</td>
-						<td>上架状态：0->下架；1->上架</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>new_status</td>
-						<td>int(1)</td>
-						<td>新品状态:0->不是新品；1->新品</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>recommand_status</td>
-						<td>int(1)</td>
-						<td>推荐状态；0->不推荐；1->推荐</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>verify_status</td>
-						<td>int(1)</td>
-						<td>审核状态：0->未审核；1->审核通过</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort</td>
-						<td>int(11)</td>
-						<td>排序</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sale</td>
-						<td>int(11)</td>
-						<td>销量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>price</td>
-						<td>decimal(10,2)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>promotion_price</td>
-						<td>decimal(10,2)</td>
-						<td>促销价格</td>
-						<td></td>
-						<td>YES</td>
-						<td>0.00</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>gift_growth</td>
-						<td>int(11)</td>
-						<td>赠送的成长值</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>gift_point</td>
-						<td>int(11)</td>
-						<td>赠送的积分</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>use_point_limit</td>
-						<td>int(11)</td>
-						<td>限制使用的积分数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sub_title</td>
-						<td>varchar(255)</td>
-						<td>副标题</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>description</td>
-						<td>text</td>
-						<td>商品描述</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>original_price</td>
-						<td>decimal(10,2)</td>
-						<td>市场价</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>stock</td>
-						<td>int(11)</td>
-						<td>库存</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>low_stock</td>
-						<td>int(11)</td>
-						<td>库存预警值</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>unit</td>
-						<td>varchar(16)</td>
-						<td>单位</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>weight</td>
-						<td>decimal(10,2)</td>
-						<td>商品重量，默认为克</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>preview_status</td>
-						<td>int(1)</td>
-						<td>是否为预告商品：0->不是；1->是</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>service_ids</td>
-						<td>varchar(64)</td>
-						<td>以逗号分割的产品服务：1->无忧退货；2->快速退款；3->免费包邮</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>keywords</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>note</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>album_pics</td>
-						<td>varchar(255)</td>
-						<td>画册图片，连产品图片限制为5张，以逗号分割</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>detail_title</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>detail_desc</td>
-						<td>text</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>detail_html</td>
-						<td>text</td>
-						<td>产品详情网页内容</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>detail_mobile_html</td>
-						<td>text</td>
-						<td>移动端网页详情</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>promotion_start_time</td>
-						<td>datetime</td>
-						<td>促销开始时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>promotion_end_time</td>
-						<td>datetime</td>
-						<td>促销结束时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>promotion_per_limit</td>
-						<td>int(11)</td>
-						<td>活动限购数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>promotion_type</td>
-						<td>int(1)</td>
-						<td>促销类型：0->没有促销使用原价;1->使用促销价；2->使用会员价；3->使用阶梯价格；4->使用满减价格；5->限时购</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>brand_name</td>
-						<td>varchar(255)</td>
-						<td>品牌名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_category_name</td>
-						<td>varchar(255)</td>
-						<td>商品分类名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>supply_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>school_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>hit</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-37" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_product_attribute</h3>
-			<h3 class="ui center aligned ">注释:商品属性参数表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>product_attribute_category_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>select_type</td>
-						<td>int(1)</td>
-						<td>属性选择类型：0->唯一；1->单选；2->多选</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>input_type</td>
-						<td>int(1)</td>
-						<td>属性录入方式：0->手工录入；1->从列表中选取</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>input_list</td>
-						<td>varchar(255)</td>
-						<td>可选值列表，以逗号隔开</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort</td>
-						<td>int(11)</td>
-						<td>排序字段：最高的可以单独上传图片</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>filter_type</td>
-						<td>int(1)</td>
-						<td>分类筛选样式：1->普通；1->颜色</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>search_type</td>
-						<td>int(1)</td>
-						<td>检索类型；0->不需要进行检索；1->关键字检索；2->范围检索</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>related_status</td>
-						<td>int(1)</td>
-						<td>相同属性产品是否关联；0->不关联；1->关联</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>hand_add_status</td>
-						<td>int(1)</td>
-						<td>是否支持手动新增；0->不支持；1->支持</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>type</td>
-						<td>int(1)</td>
-						<td>属性的类型；0->规格；1->参数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-38" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_product_attribute_category</h3>
-			<h3 class="ui center aligned ">注释:产品属性分类表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>attribute_count</td>
-						<td>int(11)</td>
-						<td>属性数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>param_count</td>
-						<td>int(11)</td>
-						<td>参数数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>pic</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-39" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_product_attribute_value</h3>
-			<h3 class="ui center aligned ">注释:存储产品参数信息的表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>product_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_attribute_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>value</td>
-						<td>varchar(64)</td>
-						<td>手动添加规格或参数的值，参数单值，规格有多个时以逗号隔开</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>type</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-40" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_product_category</h3>
-			<h3 class="ui center aligned ">注释:产品分类</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>parent_id</td>
-						<td>bigint(20)</td>
-						<td>上机分类的编号：0表示一级分类</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>level</td>
-						<td>int(1)</td>
-						<td>分类级别：0->1级；1->2级</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_count</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_unit</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>nav_status</td>
-						<td>int(1)</td>
-						<td>是否显示在导航栏：0->不显示；1->显示</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>show_status</td>
-						<td>int(1)</td>
-						<td>显示状态：0->不显示；1->显示</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>index_status</td>
-						<td>int(1)</td>
-						<td>是否是首页分类0-->不是，1-->是</td>
-						<td></td>
-						<td>NO</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>icon</td>
-						<td>varchar(255)</td>
-						<td>图标</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>keywords</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>description</td>
-						<td>text</td>
-						<td>描述</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-41" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_product_category_attribute_relation</h3>
-			<h3 class="ui center aligned ">注释:产品的分类和属性的关系表，用于设置分类筛选条件（只支持一级分类）</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>product_category_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_attribute_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-42" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_product_consult</h3>
-			<h3 class="ui center aligned ">注释:产品咨询表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(10) unsigned</td>
-						<td>咨询编号</td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>goods_id</td>
-						<td>bigint(11) unsigned</td>
-						<td>商品编号</td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>goods_name</td>
-						<td>varchar(100)</td>
-						<td>商品名称</td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_id</td>
-						<td>bigint(11)</td>
-						<td>咨询发布者会员编号(0：游客)</td>
-						<td></td>
-						<td>NO</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_name</td>
-						<td>varchar(100)</td>
-						<td>会员名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>bigint(11) unsigned</td>
-						<td>店铺编号</td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>email</td>
-						<td>varchar(255)</td>
-						<td>咨询发布者邮箱</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>consult_content</td>
-						<td>varchar(255)</td>
-						<td>咨询内容</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>consult_addtime</td>
-						<td>datetime</td>
-						<td>咨询添加时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>consult_reply</td>
-						<td>varchar(255)</td>
-						<td>咨询回复内容</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>consult_reply_time</td>
-						<td>datetime</td>
-						<td>咨询回复时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>isanonymous</td>
-						<td>tinyint(1)</td>
-						<td>0表示不匿名 1表示匿名</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>is_del</td>
-						<td>tinyint(1)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>pic</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>goods_id</td>
-						<td>goods_id</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>seller_id</td>
-						<td>store_id</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-43" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_product_full_reduction</h3>
-			<h3 class="ui center aligned ">注释:产品满减表(只针对同商品)</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(11)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>product_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>full_price</td>
-						<td>decimal(10,2)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>reduce_price</td>
-						<td>decimal(10,2)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-44" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_product_ladder</h3>
-			<h3 class="ui center aligned ">注释:产品阶梯价格表(只针对同商品)</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>product_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>count</td>
-						<td>int(11)</td>
-						<td>满足的商品数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>discount</td>
-						<td>decimal(10,2)</td>
-						<td>折扣</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>price</td>
-						<td>decimal(10,2)</td>
-						<td>折后价格</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-45" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_product_operate_log</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>product_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>price_old</td>
-						<td>decimal(10,2)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>price_new</td>
-						<td>decimal(10,2)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sale_price_old</td>
-						<td>decimal(10,2)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sale_price_new</td>
-						<td>decimal(10,2)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>gift_point_old</td>
-						<td>int(11)</td>
-						<td>赠送的积分</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>gift_point_new</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>use_point_limit_old</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>use_point_limit_new</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>operate_man</td>
-						<td>varchar(64)</td>
-						<td>操作人</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-46" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_product_vertify_record</h3>
-			<h3 class="ui center aligned ">注释:商品审核记录</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>product_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>vertify_man</td>
-						<td>varchar(64)</td>
-						<td>审核人</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>status</td>
-						<td>int(1)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>detail</td>
-						<td>varchar(255)</td>
-						<td>反馈详情</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-47" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_sku_stock</h3>
-			<h3 class="ui center aligned ">注释:sku的库存</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>product_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sku_code</td>
-						<td>varchar(64)</td>
-						<td>sku编码</td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>price</td>
-						<td>decimal(10,2)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>stock</td>
-						<td>int(11)</td>
-						<td>库存</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>low_stock</td>
-						<td>int(11)</td>
-						<td>预警库存</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sp1</td>
-						<td>varchar(64)</td>
-						<td>销售属性1</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sp2</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sp3</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>pic</td>
-						<td>varchar(255)</td>
-						<td>展示图片</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sale</td>
-						<td>int(11)</td>
-						<td>销量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>promotion_price</td>
-						<td>decimal(10,2)</td>
-						<td>单品促销价格</td>
-						<td></td>
-						<td>YES</td>
-						<td>0.00</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>lock_stock</td>
-						<td>int(11)</td>
-						<td>锁定库存</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_name</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sp4</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-48" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:pms_small_navicon_category</h3>
-			<h3 class="ui center aligned ">注释:小程序首页nav管理</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(11)</td>
-						<td>小程序首页分类ID</td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>title</td>
-						<td>varchar(200)</td>
-						<td>分类名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>icon</td>
-						<td>varchar(500)</td>
-						<td>分类图标</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>summary</td>
-						<td>varchar(200)</td>
-						<td>跳转页面</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>content</td>
-						<td>varchar(50)</td>
-						<td>跳转类型</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort</td>
-						<td>int(10)</td>
-						<td>排序</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-49" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:province</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>pid</td>
-						<td>smallint(3) unsigned</td>
-						<td>省份ID</td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>provinceID</td>
-						<td>mediumint(8) unsigned</td>
-						<td></td>
-						<td>MUL</td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>pname</td>
-						<td>varchar(15)</td>
-						<td>省份名称</td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>pid</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>provinceID</td>
-						<td>provinceID</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-50" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:school</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>scid</td>
-						<td>int(8) unsigned</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>char(100)</td>
-						<td></td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>collegeID</td>
-						<td>smallint(5) unsigned</td>
-						<td></td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>scid</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-51" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:shopping_store</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>addTime</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>deleteStatus</td>
-						<td>bit(1)</td>
-						<td></td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>card_approve</td>
-						<td>bit(1)</td>
-						<td></td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>realstore_approve</td>
-						<td>bit(1)</td>
-						<td></td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_address</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_credit</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_info</td>
-						<td>longtext</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_msn</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_name</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_ower</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_ower_card</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_qq</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_recommend</td>
-						<td>bit(1)</td>
-						<td></td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_recommend_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_seo_description</td>
-						<td>longtext</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_seo_keywords</td>
-						<td>longtext</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_status</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_telephone</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_zip</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>template</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>validity</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>violation_reseaon</td>
-						<td>longtext</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>area_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>card_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>grade_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sc_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_banner_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_license_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_logo_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>update_grade_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>domain_modify_count</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_second_domain</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>favorite_count</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_lat</td>
-						<td>decimal(6,2)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_lng</td>
-						<td>decimal(6,2)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_ww</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>map_type</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>baidu</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>delivery_begin_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>delivery_end_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>combin_begin_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>combin_end_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>weixin_begin_time</td>
-						<td>date</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>weixin_end_time</td>
-						<td>date</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>weixin_status</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>weixin_appId</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>weixin_appSecret</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>weixin_token</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>weixin_welecome_content</td>
-						<td>longtext</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>weixin_qr_img_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>weixin_account</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_weixin_logo_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>weixin_store_name</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>FK1A2E9F4A7CE341A</td>
-						<td>store_banner_id</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>FK1A2E9F4A9A6FEF94</td>
-						<td>card_id</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>FK1A2E9F4AFA5E3FC2</td>
-						<td>area_id</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>FK1A2E9F4A33028121</td>
-						<td>grade_id</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>FK1A2E9F4A33F45DA9</td>
-						<td>sc_id</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>FK1A2E9F4AA10642E1</td>
-						<td>store_license_id</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>FK1A2E9F4A11D81442</td>
-						<td>weixin_qr_img_id</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>FK1A2E9F4A8D04BD7</td>
-						<td>update_grade_id</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>FK1A2E9F4AC98DF95A</td>
-						<td>store_weixin_logo_id</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>FK1A2E9F4A929E09BB</td>
-						<td>store_logo_id</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-52" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sms_coupon</h3>
-			<h3 class="ui center aligned ">注释:优惠卷表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>type</td>
-						<td>int(1)</td>
-						<td>优惠卷类型；0->全场赠券；1->会员赠券；2->购物赠券；3->注册赠券</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(100)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>platform</td>
-						<td>int(1)</td>
-						<td>使用平台：0->全部；1->移动；2->PC</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>count</td>
-						<td>int(11)</td>
-						<td>数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>amount</td>
-						<td>decimal(10,2)</td>
-						<td>金额</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>per_limit</td>
-						<td>int(11)</td>
-						<td>每人限领张数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>min_point</td>
-						<td>decimal(10,2)</td>
-						<td>使用门槛；0表示无门槛</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>start_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>end_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>use_type</td>
-						<td>int(1)</td>
-						<td>使用类型：0->全场通用；1->指定分类；2->指定商品</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>note</td>
-						<td>varchar(200)</td>
-						<td>备注</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>publish_count</td>
-						<td>int(11)</td>
-						<td>发行数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>use_count</td>
-						<td>int(11)</td>
-						<td>已使用数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>receive_count</td>
-						<td>int(11)</td>
-						<td>领取数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>enable_time</td>
-						<td>datetime</td>
-						<td>可以领取的日期</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>code</td>
-						<td>varchar(64)</td>
-						<td>优惠码</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_level</td>
-						<td>int(1)</td>
-						<td>可领取的会员类型：0->无限时</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-53" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sms_coupon_history</h3>
-			<h3 class="ui center aligned ">注释:优惠券使用、领取历史表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>coupon_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>coupon_code</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_nickname</td>
-						<td>varchar(64)</td>
-						<td>领取人昵称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>get_type</td>
-						<td>int(1)</td>
-						<td>获取类型：0->后台赠送；1->主动获取</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>use_status</td>
-						<td>int(1)</td>
-						<td>使用状态：0->未使用；1->已使用；2->已过期</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>use_time</td>
-						<td>datetime</td>
-						<td>使用时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>order_id</td>
-						<td>bigint(20)</td>
-						<td>订单编号</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>order_sn</td>
-						<td>varchar(100)</td>
-						<td>订单号码</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>start_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>end_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>note</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>idx_member_id</td>
-						<td>member_id</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>idx_coupon_id</td>
-						<td>coupon_id</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-54" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sms_coupon_product_category_relation</h3>
-			<h3 class="ui center aligned ">注释:优惠券和产品分类关系表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>coupon_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_category_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_category_name</td>
-						<td>varchar(200)</td>
-						<td>产品分类名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>parent_category_name</td>
-						<td>varchar(200)</td>
-						<td>父分类名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-55" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sms_coupon_product_relation</h3>
-			<h3 class="ui center aligned ">注释:优惠券和产品的关系表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>coupon_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_name</td>
-						<td>varchar(500)</td>
-						<td>商品名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_sn</td>
-						<td>varchar(200)</td>
-						<td>商品编码</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-56" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sms_flash_promotion</h3>
-			<h3 class="ui center aligned ">注释:限时购表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>title</td>
-						<td>varchar(200)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>start_date</td>
-						<td>date</td>
-						<td>开始日期</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>end_date</td>
-						<td>date</td>
-						<td>结束日期</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>status</td>
-						<td>int(1)</td>
-						<td>上下线状态</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>秒杀时间段名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>isIndex</td>
-						<td>int(1)</td>
-						<td>是否是首页抢购 0为不是，1为是</td>
-						<td></td>
-						<td>NO</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-57" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sms_flash_promotion_log</h3>
-			<h3 class="ui center aligned ">注释:限时购通知记录</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>int(11)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>member_id</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_phone</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_name</td>
-						<td>varchar(100)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>subscribe_time</td>
-						<td>datetime</td>
-						<td>会员订阅时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>send_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-58" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sms_flash_promotion_product_relation</h3>
-			<h3 class="ui center aligned ">注释:商品限时购与商品关系表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td>编号</td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>flash_promotion_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>flash_promotion_session_id</td>
-						<td>bigint(20)</td>
-						<td>编号</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>flash_promotion_price</td>
-						<td>decimal(10,2)</td>
-						<td>限时购价格</td>
-						<td></td>
-						<td>YES</td>
-						<td>0.00</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>flash_promotion_count</td>
-						<td>int(11)</td>
-						<td>限时购数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>flash_promotion_limit</td>
-						<td>int(11)</td>
-						<td>每人限购数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort</td>
-						<td>int(11)</td>
-						<td>排序</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-59" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sms_flash_promotion_session</h3>
-			<h3 class="ui center aligned ">注释:限时购场次表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td>编号</td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(200)</td>
-						<td>场次名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>start_time</td>
-						<td>time</td>
-						<td>每日开始时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>end_time</td>
-						<td>time</td>
-						<td>每日结束时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>status</td>
-						<td>int(1)</td>
-						<td>启用状态：0->不启用；1->启用</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-60" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sms_group</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>goods_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>goods_name</td>
-						<td>varchar(255)</td>
-						<td>商品</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>origin_price</td>
-						<td>decimal(10,0)</td>
-						<td>商品价格</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>group_price</td>
-						<td>decimal(10,0)</td>
-						<td>拼团价格</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>start_time</td>
-						<td>datetime</td>
-						<td>开始时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>end_time</td>
-						<td>datetime</td>
-						<td>结束时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>hours</td>
-						<td>int(11)</td>
-						<td>拼团小时</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>peoples</td>
-						<td>int(11)</td>
-						<td>成团人数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>status</td>
-						<td>int(11)</td>
-						<td>状态</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>max_people</td>
-						<td>int(11)</td>
-						<td>拼团总人数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>limit_goods</td>
-						<td>int(11)</td>
-						<td>团购次数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-61" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sms_group_member</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>group_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>member_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>main_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>goods_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>status</td>
-						<td>int(11)</td>
-						<td>状态</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>order_id</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>groupAndMain</td>
-						<td>group_id,member_id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-62" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sms_home_advertise</h3>
-			<h3 class="ui center aligned ">注释:首页轮播广告表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(100)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>type</td>
-						<td>int(1)</td>
-						<td>轮播位置：0->PC首页轮播；1->app首页轮播</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>pic</td>
-						<td>varchar(500)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>start_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>end_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>status</td>
-						<td>int(1)</td>
-						<td>上下线状态：0->下线；1->上线</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>click_count</td>
-						<td>int(11)</td>
-						<td>点击数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>order_count</td>
-						<td>int(11)</td>
-						<td>下单数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>url</td>
-						<td>varchar(500)</td>
-						<td>链接地址</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>note</td>
-						<td>varchar(500)</td>
-						<td>备注</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort</td>
-						<td>int(11)</td>
-						<td>排序</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-63" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sms_home_brand</h3>
-			<h3 class="ui center aligned ">注释:首页推荐品牌表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>brand_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>brand_name</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>recommend_status</td>
-						<td>int(1)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-64" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sms_home_new_product</h3>
-			<h3 class="ui center aligned ">注释:新鲜好物表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>product_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_name</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>recommend_status</td>
-						<td>int(1)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort</td>
-						<td>int(1)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-65" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sms_home_recommend_product</h3>
-			<h3 class="ui center aligned ">注释:人气推荐商品表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>product_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_name</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>recommend_status</td>
-						<td>int(1)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort</td>
-						<td>int(1)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-66" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sms_home_recommend_subject</h3>
-			<h3 class="ui center aligned ">注释:首页推荐专题表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>subject_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>subject_name</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>recommend_status</td>
-						<td>int(1)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-67" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sms_red_packet</h3>
-			<h3 class="ui center aligned ">注释:红包</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>int(12)</td>
-						<td>红包编号</td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>user_id</td>
-						<td>bigint(12)</td>
-						<td>发红包的用户id</td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>amount</td>
-						<td>decimal(16,2)</td>
-						<td>红包金额</td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>send_date</td>
-						<td>date</td>
-						<td>发红包日期</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>total</td>
-						<td>int(12)</td>
-						<td>红包总数</td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>unit_amount</td>
-						<td>decimal(12,0)</td>
-						<td>单个红包的金额</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>stock</td>
-						<td>int(12)</td>
-						<td>红包剩余个数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>type</td>
-						<td>int(12)</td>
-						<td>红包类型</td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>note</td>
-						<td>varchar(256)</td>
-						<td>备注</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-68" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sms_user_red_packet</h3>
-			<h3 class="ui center aligned ">注释:用户红包</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>int(12)</td>
-						<td>用户红包编号</td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>red_packet_id</td>
-						<td>int(12)</td>
-						<td>红包编号</td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>admin_id</td>
-						<td>bigint(12)</td>
-						<td>发红包用户的编号</td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>user_id</td>
-						<td>bigint(12)</td>
-						<td>抢红包用户的编号</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>amount</td>
-						<td>decimal(16,2)</td>
-						<td>抢到的红包金额</td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>grab_time</td>
-						<td>date</td>
-						<td>抢红包时间</td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>note</td>
-						<td>varchar(256)</td>
-						<td>备注</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-69" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sys_admin_log</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td>编号</td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>user_id</td>
-						<td>bigint(20)</td>
-						<td>用户编号</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>user_name</td>
-						<td>varchar(55)</td>
-						<td>用户名</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>service_name</td>
-						<td>varchar(100)</td>
-						<td>模块名</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>method</td>
-						<td>varchar(255)</td>
-						<td>记录类名+方法名</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>operation_desc</td>
-						<td>varchar(255)</td>
-						<td>描述</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>ip</td>
-						<td>varchar(100)</td>
-						<td>IP</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>params</td>
-						<td>varchar(3000)</td>
-						<td>参数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>time_min</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-70" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sys_applet_set</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>appid</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>appsecret</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>mchid</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>paySignKey</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>certName</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>notifyUrl</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>templateId1</td>
-						<td>varchar(255)</td>
-						<td>下单通知模版</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>templateId2</td>
-						<td>varchar(255)</td>
-						<td>支付成功模版</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>templateId3</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>templateId4</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>templateId5</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>templateId6</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>store_id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-71" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sys_area</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>pid</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>deep</td>
-						<td>int(11)</td>
-						<td>层级</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(255)</td>
-						<td>名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>pinyin_prefix</td>
-						<td>varchar(255)</td>
-						<td>拼音前缀</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>pinyin</td>
-						<td>varchar(255)</td>
-						<td>拼音</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>ext_id</td>
-						<td>varchar(255)</td>
-						<td>备注名</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>ext_name</td>
-						<td>varchar(255)</td>
-						<td>备注名</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-72" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sys_dict</h3>
-			<h3 class="ui center aligned ">注释:系统配置信息表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>keyname</td>
-						<td>varchar(50)</td>
-						<td>标签</td>
-						<td>UNI</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>valuename</td>
-						<td>varchar(2000)</td>
-						<td>值</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>status</td>
-						<td>tinyint(4)</td>
-						<td>状态   0：隐藏   1：显示</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>remark</td>
-						<td>varchar(500)</td>
-						<td>备注</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>type</td>
-						<td>varchar(255)</td>
-						<td>类型</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>key</td>
-						<td>keyname</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-73" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sys_member_area</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>member_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>obj_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>type</td>
-						<td>varchar(255)</td>
-						<td>1 会员区域 2 会员学校</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>member_id,obj_id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-74" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sys_permission</h3>
-			<h3 class="ui center aligned ">注释:后台用户权限表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>pid</td>
-						<td>bigint(20)</td>
-						<td>父级权限id</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(100)</td>
-						<td>名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>value</td>
-						<td>varchar(200)</td>
-						<td>权限值</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>icon</td>
-						<td>varchar(500)</td>
-						<td>图标</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>type</td>
-						<td>int(1)</td>
-						<td>权限类型：0->目录；1->菜单；2->按钮（接口绑定权限）</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>uri</td>
-						<td>varchar(200)</td>
-						<td>前端资源路径</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>status</td>
-						<td>int(1)</td>
-						<td>启用状态；0->禁用；1->启用</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort</td>
-						<td>int(11)</td>
-						<td>排序</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-75" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sys_permission_category</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(100)</td>
-						<td>类型名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>icon</td>
-						<td>varchar(500)</td>
-						<td>类型图标</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>type_count</td>
-						<td>int(11)</td>
-						<td>类型数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>show_status</td>
-						<td>int(2)</td>
-						<td>状态</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort</td>
-						<td>int(11)</td>
-						<td>排序</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-76" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sys_role</h3>
-			<h3 class="ui center aligned ">注释:后台用户角色表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(100)</td>
-						<td>名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>description</td>
-						<td>varchar(500)</td>
-						<td>描述</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>admin_count</td>
-						<td>int(11)</td>
-						<td>后台用户数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>status</td>
-						<td>int(1)</td>
-						<td>启用状态：0->禁用；1->启用</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-77" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sys_role_permission</h3>
-			<h3 class="ui center aligned ">注释:后台用户角色和权限关系表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>role_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>permission_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-78" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sys_school</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(11)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>longitude</td>
-						<td>varchar(40)</td>
-						<td>精度</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>latitude</td>
-						<td>varchar(40)</td>
-						<td>纬度</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(40)</td>
-						<td>名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>province</td>
-						<td>varchar(20)</td>
-						<td>省</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>city</td>
-						<td>varchar(20)</td>
-						<td>市</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>region</td>
-						<td>varchar(20)</td>
-						<td>区</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>address</td>
-						<td>varchar(255)</td>
-						<td>地址</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>hot</td>
-						<td>int(11)</td>
-						<td>1热门</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>is211</td>
-						<td>int(11)</td>
-						<td>211</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>is985</td>
-						<td>int(11)</td>
-						<td>985</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-79" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sys_sms</h3>
-			<h3 class="ui center aligned ">注释:发短信记录</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>int(11)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>phone</td>
-						<td>varchar(16)</td>
-						<td>手机号码</td>
-						<td>MUL</td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>signName</td>
-						<td>varchar(128)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>templateCode</td>
-						<td>varchar(128)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>params</td>
-						<td>varchar(500)</td>
-						<td>参数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>bizId</td>
-						<td>varchar(128)</td>
-						<td>阿里云返回的</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>code</td>
-						<td>varchar(64)</td>
-						<td>阿里云返回的code</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>message</td>
-						<td>varchar(128)</td>
-						<td>阿里云返回的</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>day</td>
-						<td>date</td>
-						<td>日期</td>
-						<td>MUL</td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>createTime</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>updateTime</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>phone</td>
-						<td>phone</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>day</td>
-						<td>day</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-80" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sys_store</h3>
-			<h3 class="ui center aligned ">注释:店铺表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>sms_quantity</td>
-						<td>bigint(20)</td>
-						<td>短信数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>register_type</td>
-						<td>smallint(6)</td>
-						<td>注册类型</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>expire_time</td>
-						<td>datetime</td>
-						<td>到期时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>try_time</td>
-						<td>datetime</td>
-						<td>尝试时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>contact_mobile</td>
-						<td>char(11)</td>
-						<td>联系电话</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>address_province</td>
-						<td>bigint(20)</td>
-						<td>地区省</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>buy_plan_times</td>
-						<td>bigint(20)</td>
-						<td>所购物品计划时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>is_checked</td>
-						<td>smallint(6)</td>
-						<td>是否选中</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>is_deleted</td>
-						<td>smallint(6)</td>
-						<td>是否删除</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>service_phone</td>
-						<td>varchar(30)</td>
-						<td>服务电话</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>address_lat</td>
-						<td>varchar(40)</td>
-						<td>地址名</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>contact_name</td>
-						<td>varchar(20)</td>
-						<td>联系人名</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>delete_time</td>
-						<td>datetime</td>
-						<td>删除时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>diy_profile</td>
-						<td>text</td>
-						<td>自己配置文件</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>industry_two</td>
-						<td>bigint(20)</td>
-						<td>行业</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>is_star</td>
-						<td>smallint(6)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>is_try</td>
-						<td>smallint(6)</td>
-						<td>尝试</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>logo</td>
-						<td>varchar(255)</td>
-						<td>图标</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>address_detail</td>
-						<td>varchar(100)</td>
-						<td>地址细节</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>plan_id</td>
-						<td>bigint(20)</td>
-						<td>计划id</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>support_name</td>
-						<td>varchar(20)</td>
-						<td>支持，维持名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(50)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>status</td>
-						<td>smallint(6)</td>
-						<td>1为出售中，3为已售罄，-2为仓库中，-1为回收站</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>uid</td>
-						<td>smallint(6)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>type</td>
-						<td>smallint(6)</td>
-						<td>类型</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>contact_qq</td>
-						<td>varchar(11)</td>
-						<td>联系QQ</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>address_lng</td>
-						<td>varchar(40)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>last_login_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>support_phone</td>
-						<td>varchar(30)</td>
-						<td>支持电话</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>address_area</td>
-						<td>bigint(20)</td>
-						<td>地址区域</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>contact_qrcode</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>description</td>
-						<td>varchar(255)</td>
-						<td>描述</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>industry_one</td>
-						<td>bigint(20)</td>
-						<td>行业1</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>address_city</td>
-						<td>bigint(20)</td>
-						<td>地址城市</td>
-						<td></td>
-						<td>YES</td>
-						<td>0</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>id</td>
-						<td>int(11)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-81" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sys_user</h3>
-			<h3 class="ui center aligned ">注释:后台用户表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>username</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>password</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>icon</td>
-						<td>varchar(500)</td>
-						<td>头像</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>email</td>
-						<td>varchar(100)</td>
-						<td>邮箱</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>nick_name</td>
-						<td>varchar(200)</td>
-						<td>昵称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>note</td>
-						<td>varchar(500)</td>
-						<td>备注信息</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>login_time</td>
-						<td>datetime</td>
-						<td>最后登录时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>status</td>
-						<td>int(1)</td>
-						<td>帐号启用状态：0->禁用；1->启用</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>supply_id</td>
-						<td>int(20)</td>
-						<td>供应商</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>bigint(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>ums_admin_username</td>
-						<td>username,store_id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td>用户名唯一索引</td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-82" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sys_user_permission</h3>
-			<h3 class="ui center aligned ">注释:后台用户和权限关系表(除角色中定义的权限以外的加减权限)</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>admin_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>permission_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>type</td>
-						<td>int(1)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-83" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sys_user_role</h3>
-			<h3 class="ui center aligned ">注释:后台用户和角色关系表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>admin_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>role_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-84" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:sys_web_log</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td>编号</td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>user_id</td>
-						<td>bigint(20)</td>
-						<td>用户编号</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>user_name</td>
-						<td>varchar(55)</td>
-						<td>用户名</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>service_name</td>
-						<td>varchar(100)</td>
-						<td>模块名</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>method</td>
-						<td>varchar(255)</td>
-						<td>记录类名+方法名</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>operation_desc</td>
-						<td>varchar(955)</td>
-						<td>描述</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>ip</td>
-						<td>varchar(100)</td>
-						<td>IP</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>params</td>
-						<td>varchar(3000)</td>
-						<td>参数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>time_min</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-85" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:tb_health_push_task</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>int(11)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>template_id</td>
-						<td>varchar(64)</td>
-						<td>小程序模版ID</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>task_name</td>
-						<td>varchar(64)</td>
-						<td>模版名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>task_topic</td>
-						<td>varchar(64)</td>
-						<td>活动主题</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>task_caption</td>
-						<td>varchar(200)</td>
-						<td>活动说明</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>task_tips</td>
-						<td>varchar(64)</td>
-						<td>温馨提示</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>task_type</td>
-						<td>varchar(64)</td>
-						<td>任务类型</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>status</td>
-						<td>int(1)</td>
-						<td>任务是否已经发送 1 未发送[默认] 2 已发送</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>goods_id</td>
-						<td>int(11)</td>
-						<td>商品ID</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>goods_name</td>
-						<td>varchar(64)</td>
-						<td>商品标题</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>goods_online_status</td>
-						<td>int(2)</td>
-						<td>商品前台状态 1 上架 0 下架</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>price</td>
-						<td>decimal(10,2)</td>
-						<td>商品金额（需要的海贝数）</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>is_upload</td>
-						<td>int(1)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>file_name</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>update_time</td>
-						<td>datetime</td>
-						<td>更新时间</td>
-						<td></td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-86" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:tb_health_push_task_user</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>int(11)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>task_id</td>
-						<td>int(11)</td>
-						<td>推送ID</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>user_id</td>
-						<td>int(11)</td>
-						<td>用户ID</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>form_id</td>
-						<td>varchar(50)</td>
-						<td>小程序推送formId</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>status</td>
-						<td>int(2)</td>
-						<td>推送状态 1 已推送 2 未推送</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>update_time</td>
-						<td>datetime</td>
-						<td>更新时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>note</td>
-						<td>varchar(255)</td>
-						<td>备注</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-87" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:tb_panel</h3>
-			<h3 class="ui center aligned ">注释:内容分类</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>int(11)</td>
-						<td>类目ID</td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(50)</td>
-						<td>板块名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>type</td>
-						<td>int(1)</td>
-						<td>类型 0轮播图 1板块种类一 2板块种类二 3板块种类三 </td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort_order</td>
-						<td>int(4)</td>
-						<td>排列序号</td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>position</td>
-						<td>int(1)</td>
-						<td>所属位置 0首页 1商品推荐 2我要捐赠</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>limit_num</td>
-						<td>int(4)</td>
-						<td>板块限制商品数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>status</td>
-						<td>int(1)</td>
-						<td>状态</td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>remark</td>
-						<td>varchar(255)</td>
-						<td>备注</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>created</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>updated</td>
-						<td>datetime</td>
-						<td>更新时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort_order</td>
-						<td>sort_order</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>parent_id</td>
-						<td>status</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-88" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:tb_panel_content</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>int(11)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>panel_id</td>
-						<td>int(11)</td>
-						<td>所属板块id</td>
-						<td>MUL</td>
-						<td>NO</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>type</td>
-						<td>int(1)</td>
-						<td>类型 0关联商品 1其他链接</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_id</td>
-						<td>bigint(20)</td>
-						<td>关联商品id</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>sort_order</td>
-						<td>int(4)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>full_url</td>
-						<td>varchar(500)</td>
-						<td>其他链接</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>pic_url</td>
-						<td>varchar(500)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>pic_url2</td>
-						<td>varchar(500)</td>
-						<td>3d轮播图备用</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>pic_url3</td>
-						<td>varchar(500)</td>
-						<td>3d轮播图备用</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>created</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>updated</td>
-						<td>datetime</td>
-						<td></td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>category_id</td>
-						<td>panel_id</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>updated</td>
-						<td>updated</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-89" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:tb_user_from_id</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(11)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>user_id</td>
-						<td>bigint(11)</td>
-						<td>用户id</td>
-						<td>MUL</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>form_id</td>
-						<td>varchar(100)</td>
-						<td>小程序推送formId</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>source</td>
-						<td>smallint(2)</td>
-						<td>来源 source 1，步数兑换海贝按钮；2，首页邀请按钮；3，步数拦截弹窗邀请按钮；4，兑换商品按钮；\n\n5，海贝不够邀请按钮；6，引导关注蒙层按钮；7，健康体验领取按钮 8，首页弹窗“马上领取”按钮</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>status</td>
-						<td>smallint(2)</td>
-						<td>使用状态 1 未使用[默认] 2 已使用</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>update_time</td>
-						<td>datetime</td>
-						<td>修改时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>_idx_form_id_</td>
-						<td>user_id</td>
-						<td>
-								NORMAL
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-90" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:ums_collect</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td>编号</td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>member_id</td>
-						<td>bigint(20)</td>
-						<td>会员编号</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>goods_id</td>
-						<td>bigint(20)</td>
-						<td>商品编号</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>goods_name</td>
-						<td>varchar(255)</td>
-						<td>商品</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>goods_pic</td>
-						<td>varchar(255)</td>
-						<td>图片</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>goods_price</td>
-						<td>varchar(255)</td>
-						<td>价格</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>type</td>
-						<td>int(11)</td>
-						<td>1 商品 2 文章</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>创建时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-91" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:ums_growth_change_history</h3>
-			<h3 class="ui center aligned ">注释:成长值变化历史记录表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>member_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>change_type</td>
-						<td>int(1)</td>
-						<td>改变类型：0->增加；1->减少</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>change_count</td>
-						<td>int(11)</td>
-						<td>积分改变数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>operate_man</td>
-						<td>varchar(100)</td>
-						<td>操作人员</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>operate_note</td>
-						<td>varchar(200)</td>
-						<td>操作备注</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>source_type</td>
-						<td>int(1)</td>
-						<td>积分来源：0->购物；1->管理员修改</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-92" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:ums_integration_change_history</h3>
-			<h3 class="ui center aligned ">注释:积分变化历史记录表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>member_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>change_type</td>
-						<td>int(1)</td>
-						<td>改变类型：0->增加；1->减少</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>change_count</td>
-						<td>int(11)</td>
-						<td>积分改变数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>operate_man</td>
-						<td>varchar(100)</td>
-						<td>操作人员</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>operate_note</td>
-						<td>varchar(200)</td>
-						<td>操作备注</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>source_type</td>
-						<td>int(1)</td>
-						<td>积分来源：0->购物；1->管理员修改</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-93" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:ums_integration_consume_setting</h3>
-			<h3 class="ui center aligned ">注释:积分消费设置</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>deduction_per_amount</td>
-						<td>int(11)</td>
-						<td>每一元需要抵扣的积分数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>max_percent_per_order</td>
-						<td>int(11)</td>
-						<td>每笔订单最高抵用百分比</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>use_unit</td>
-						<td>int(11)</td>
-						<td>每次使用积分最小单位100</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>coupon_status</td>
-						<td>int(1)</td>
-						<td>是否可以和优惠券同用；0->不可以；1->可以</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-94" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:ums_member</h3>
-			<h3 class="ui center aligned ">注释:会员表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>member_level_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>username</td>
-						<td>varchar(64)</td>
-						<td>用户名</td>
-						<td>UNI</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>password</td>
-						<td>varchar(64)</td>
-						<td>密码</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>nickname</td>
-						<td>varchar(64)</td>
-						<td>昵称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>phone</td>
-						<td>varchar(64)</td>
-						<td>手机号码</td>
-						<td>UNI</td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>status</td>
-						<td>int(1)</td>
-						<td>帐号启用状态:0->禁用；1->启用</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td>注册时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>icon</td>
-						<td>varchar(500)</td>
-						<td>头像</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>gender</td>
-						<td>int(1)</td>
-						<td>性别：0->未知；1->男；2->女</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>birthday</td>
-						<td>date</td>
-						<td>生日</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>city</td>
-						<td>varchar(64)</td>
-						<td>所做城市</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>job</td>
-						<td>varchar(100)</td>
-						<td>职业</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>personalized_signature</td>
-						<td>varchar(200)</td>
-						<td>个性签名</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>source_type</td>
-						<td>int(1)</td>
-						<td>用户来源 1 小程序 2 公众号 3 页面</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>integration</td>
-						<td>int(11)</td>
-						<td>积分</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>growth</td>
-						<td>int(11)</td>
-						<td>成长值</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>luckey_count</td>
-						<td>int(11)</td>
-						<td>剩余抽奖次数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>history_integration</td>
-						<td>int(11)</td>
-						<td>历史积分数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>avatar</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>weixin_openid</td>
-						<td>varchar(50)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>invitecode</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>blance</td>
-						<td>decimal(10,0)</td>
-						<td>余额</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>school_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>area_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>idx_username</td>
-						<td>username</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>idx_phone</td>
-						<td>phone</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-95" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:ums_member_blance_log</h3>
-			<h3 class="ui center aligned ">注释:</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>member_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>price</td>
-						<td>decimal(11,0)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>type</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>note</td>
-						<td>varchar(255)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-96" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:ums_member_level</h3>
-			<h3 class="ui center aligned ">注释:会员等级表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(100)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>growth_point</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>default_status</td>
-						<td>int(1)</td>
-						<td>是否为默认等级：0->不是；1->是</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>free_freight_point</td>
-						<td>decimal(10,2)</td>
-						<td>免运费标准</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>comment_growth_point</td>
-						<td>int(11)</td>
-						<td>每次评价获取的成长值</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>priviledge_free_freight</td>
-						<td>int(1)</td>
-						<td>是否有免邮特权</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>priviledge_sign_in</td>
-						<td>int(1)</td>
-						<td>是否有签到特权</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>priviledge_comment</td>
-						<td>int(1)</td>
-						<td>是否有评论获奖励特权</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>priviledge_promotion</td>
-						<td>int(1)</td>
-						<td>是否有专享活动特权</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>priviledge_member_price</td>
-						<td>int(1)</td>
-						<td>是否有会员价格特权</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>priviledge_birthday</td>
-						<td>int(1)</td>
-						<td>是否有生日特权</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>articlecount</td>
-						<td>int(1)</td>
-						<td>可发文章数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>goodscount</td>
-						<td>int(1)</td>
-						<td>可发商品数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>price</td>
-						<td>decimal(10,2)</td>
-						<td>成为会员的价格</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>note</td>
-						<td>varchar(200)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-97" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:ums_member_login_log</h3>
-			<h3 class="ui center aligned ">注释:会员登录记录</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>member_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>ip</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>city</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>login_type</td>
-						<td>int(1)</td>
-						<td>登录类型：0->PC；1->android;2->ios;3->小程序</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>province</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-98" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:ums_member_member_tag_relation</h3>
-			<h3 class="ui center aligned ">注释:用户和标签关系表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>member_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>tag_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-99" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:ums_member_product_category_relation</h3>
-			<h3 class="ui center aligned ">注释:会员与产品分类关系表（用户喜欢的分类）</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>member_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>product_category_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-100" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:ums_member_receive_address</h3>
-			<h3 class="ui center aligned ">注释:会员收货地址表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>member_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(100)</td>
-						<td>收货人名称</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>phone_number</td>
-						<td>varchar(64)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>default_status</td>
-						<td>int(1)</td>
-						<td>是否为默认</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>post_code</td>
-						<td>varchar(100)</td>
-						<td>邮政编码</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>province</td>
-						<td>varchar(100)</td>
-						<td>省份/直辖市</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>city</td>
-						<td>varchar(100)</td>
-						<td>城市</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>region</td>
-						<td>varchar(100)</td>
-						<td>区</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>detail_address</td>
-						<td>varchar(128)</td>
-						<td>详细地址(街道)</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-101" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:ums_member_rule_setting</h3>
-			<h3 class="ui center aligned ">注释:会员积分成长规则表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>continue_sign_day</td>
-						<td>int(11)</td>
-						<td>连续签到天数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>continue_sign_point</td>
-						<td>int(11)</td>
-						<td>连续签到赠送数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>consume_per_point</td>
-						<td>decimal(10,2)</td>
-						<td>每消费多少元获取1个点</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>low_order_amount</td>
-						<td>decimal(10,2)</td>
-						<td>最低获取点数的订单金额</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>max_point_per_order</td>
-						<td>int(11)</td>
-						<td>每笔订单最高获取点数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>type</td>
-						<td>int(1)</td>
-						<td>类型：0->积分规则；1->成长值规则</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-102" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:ums_member_statistics_info</h3>
-			<h3 class="ui center aligned ">注释:会员统计信息</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>member_id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>consume_amount</td>
-						<td>decimal(10,2)</td>
-						<td>累计消费金额</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>order_count</td>
-						<td>int(11)</td>
-						<td>订单数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>coupon_count</td>
-						<td>int(11)</td>
-						<td>优惠券数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>comment_count</td>
-						<td>int(11)</td>
-						<td>评价数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>return_order_count</td>
-						<td>int(11)</td>
-						<td>退货数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>login_count</td>
-						<td>int(11)</td>
-						<td>登录次数</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>attend_count</td>
-						<td>int(11)</td>
-						<td>关注数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>fans_count</td>
-						<td>int(11)</td>
-						<td>粉丝数量</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>collect_product_count</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>collect_subject_count</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>collect_topic_count</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>collect_comment_count</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>invite_friend_count</td>
-						<td>int(11)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>recent_order_time</td>
-						<td>datetime</td>
-						<td>最后一次下订单时间</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-103" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:ums_member_tag</h3>
-			<h3 class="ui center aligned ">注释:用户标签表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(100)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>type</td>
-						<td>int(11)</td>
-						<td>1会员标签 2 商品标签 3 文章标签</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>gen_type</td>
-						<td>int(10)</td>
-						<td>1自动标签 2 手动标签</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>create_time</td>
-						<td>datetime</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		<div id="db-table-104" style="display: none" class="ui container last db-table ">
-			<h1 class="ui center aligned header">表名:ums_member_task</h3>
-			<h3 class="ui center aligned ">注释:会员任务表</h3>
-			<h3 class="ui center aligned " ><a onclick="toIndex()">返回目录</a></h3>
-			<table class="ui orange celled   table">
-				<caption>表格信息</caption>
-				<thead>
-					<tr>
-						<th>字段</th>
-						<th>类型</th>
-						<th>注释</th>
-						<th>键</th>
-						<th>能否为空</th>
-						<th>默认值</th>
-						<th>其他</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>id</td>
-						<td>bigint(20)</td>
-						<td></td>
-						<td>PRI</td>
-						<td>NO</td>
-						<td>无</td>
-						<td>auto_increment</td>
-					</tr>
-					<tr>
-						<td>name</td>
-						<td>varchar(100)</td>
-						<td></td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>growth</td>
-						<td>int(11)</td>
-						<td>赠送成长值</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>intergration</td>
-						<td>int(11)</td>
-						<td>赠送积分</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>type</td>
-						<td>int(1)</td>
-						<td>任务类型：0->新手任务；1->日常任务</td>
-						<td></td>
-						<td>YES</td>
-						<td>无</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>store_id</td>
-						<td>int(11)</td>
-						<td>所属店铺</td>
-						<td></td>
-						<td>YES</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-			
-			<table class="ui orange celled   table">
-				<caption>索引信息</caption>
-				<thead>
-					<tr>
-						<th>名称</th>
-						<th>栏位</th>
-						<th>索引类型</th>
-						<th>索引方式</th>
-						<th>索引备注</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>PRIMARY</td>
-						<td>id</td>
-						<td>
-								UNIQUE
-						</td>
-						<td>BTREE</td>
-						<td></td>
-					</tr>
-				</tbody>
-
-			</table>
-		</div>
-		
-
-		<script type="text/javascript">
-			
-			
-			function toTable(id){
-				$(".db-table").hide();
-				$(".db-index").hide();
-				$("#db-table-"+id).show();
-				toTop();
-			}
-			
-			function toIndex(){
-				$(".db-table").hide();
-				$(".db-index").show();
-				toTop();
-			}
-			
-			function toTop(){
-				location.href = "#top";
-			}
-			
-		</script>
-
-	</body>
-
-</html>
\ No newline at end of file
+<head>
+    <!-- Standard Meta -->
+    <meta charset="utf-8"/>
+    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible"/>
+    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0" name="viewport">
+    <!-- Site Properties -->
+    <title>mallplus</title>
+    <link href="https://cdn.bootcss.com/semantic-ui/2.3.0/semantic.min.css" rel="stylesheet">
+    <script src="https://cdn.bootcss.com/jquery/2.1.4/jquery.min.js"></script>
+    <script src="https://cdn.bootcss.com/semantic-ui/2.3.0/semantic.min.js"></script>
+    <!-- Content JS HERE !-->
+    <style>
+        .last.container {
+            margin-bottom: 300px !important;
+        }
+
+        h1.ui.center.header {
+            margin-top: 3em;
+        }
+
+        h2.ui.center.header {
+            margin: 4em 0em 2em;
+        }
+
+        h3.ui.center.header {
+            margin-top: 2em;
+            padding: 2em 0em;
+        }
+
+        .hide {
+            display: none;
+        }
+    </style>
+</head>
+
+<body>
+<!-- 目录开始 -->
+<h1 class="ui center aligned header " id="top">数据库名称：mallplus</h1>
+
+<div class="ui text container last db-index">
+    <h3 class="ui center aligned">目录</h3>
+
+    <div class="ui segment">
+        <div class="ui list divided ">
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(0)">1. area
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(1)">2. city
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(2)">3. cms_employ_info
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(3)">4. cms_help
+                        (帮助表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(4)">5. cms_help_category
+                        (帮助分类表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(5)">6. cms_member_report
+                        (用户举报表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(6)">7. cms_parter
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(7)">8. cms_prefrence_area
+                        (优选专区)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(8)">9. cms_prefrence_area_product_relation
+                        (优选专区和产品关系表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(9)">10. cms_subject
+                        (专题表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(10)">11. cms_subject_category
+                        (专题分类表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(11)">12. cms_subject_comment
+                        (专题评论表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(12)">13. cms_subject_product_relation
+                        (专题商品关系表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(13)">14. cms_topic
+                        (话题表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(14)">15. cms_topic_category
+                        (话题分类表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(15)">16. cms_topic_comment
+                        (专题评论表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(16)">17. cms_topic_member
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(17)">18. college
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(18)">19. oms_cart_item
+                        (购物车表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(19)">20. oms_company_address
+                        (公司收发货地址表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(20)">21. oms_express_company
+                        (物流公司表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(21)">22. oms_express_info
+                        (物流信息表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(22)">23. oms_order
+                        (订单表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(23)">24. oms_order_item
+                        (订单中所包含的商品)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(24)">25. oms_order_operate_history
+                        (订单操作历史记录)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(25)">26. oms_order_return_apply
+                        (订单退货申请)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(26)">27. oms_order_return_reason
+                        (退货原因表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(27)">28. oms_order_setting
+                        (订单设置表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(28)">29. pms_album
+                        (相册表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(29)">30. pms_album_pic
+                        (画册图片表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(30)">31. pms_brand
+                        (品牌表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(31)">32. pms_comment
+                        (商品评价表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(32)">33. pms_comment_replay
+                        (产品评价回复表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(33)">34. pms_favorite
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(34)">35. pms_feight_template
+                        (运费模版)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(35)">36. pms_member_price
+                        (商品会员价格表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(36)">37. pms_product
+                        (商品信息)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(37)">38. pms_product_attribute
+                        (商品属性参数表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(38)">39. pms_product_attribute_category
+                        (产品属性分类表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(39)">40. pms_product_attribute_value
+                        (存储产品参数信息的表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(40)">41. pms_product_category
+                        (产品分类)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(41)">42. pms_product_category_attribute_relation
+                        (产品的分类和属性的关系表，用于设置分类筛选条件（只支持一级分类）)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(42)">43. pms_product_consult
+                        (产品咨询表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(43)">44. pms_product_full_reduction
+                        (产品满减表(只针对同商品))
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(44)">45. pms_product_ladder
+                        (产品阶梯价格表(只针对同商品))
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(45)">46. pms_product_operate_log
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(46)">47. pms_product_vertify_record
+                        (商品审核记录)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(47)">48. pms_sku_stock
+                        (sku的库存)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(48)">49. pms_small_navicon_category
+                        (小程序首页nav管理)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(49)">50. province
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(50)">51. school
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(51)">52. shopping_store
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(52)">53. sms_coupon
+                        (优惠卷表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(53)">54. sms_coupon_history
+                        (优惠券使用、领取历史表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(54)">55. sms_coupon_product_category_relation
+                        (优惠券和产品分类关系表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(55)">56. sms_coupon_product_relation
+                        (优惠券和产品的关系表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(56)">57. sms_flash_promotion
+                        (限时购表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(57)">58. sms_flash_promotion_log
+                        (限时购通知记录)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(58)">59. sms_flash_promotion_product_relation
+                        (商品限时购与商品关系表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(59)">60. sms_flash_promotion_session
+                        (限时购场次表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(60)">61. sms_group
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(61)">62. sms_group_member
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(62)">63. sms_home_advertise
+                        (首页轮播广告表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(63)">64. sms_home_brand
+                        (首页推荐品牌表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(64)">65. sms_home_new_product
+                        (新鲜好物表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(65)">66. sms_home_recommend_product
+                        (人气推荐商品表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(66)">67. sms_home_recommend_subject
+                        (首页推荐专题表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(67)">68. sms_red_packet
+                        (红包)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(68)">69. sms_user_red_packet
+                        (用户红包)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(69)">70. sys_admin_log
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(70)">71. sys_applet_set
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(71)">72. sys_area
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(72)">73. sys_dict
+                        (系统配置信息表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(73)">74. sys_member_area
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(74)">75. sys_permission
+                        (后台用户权限表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(75)">76. sys_permission_category
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(76)">77. sys_role
+                        (后台用户角色表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(77)">78. sys_role_permission
+                        (后台用户角色和权限关系表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(78)">79. sys_school
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(79)">80. sys_sms
+                        (发短信记录)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(80)">81. sys_store
+                        (店铺表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(81)">82. sys_user
+                        (后台用户表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(82)">83. sys_user_permission
+                        (后台用户和权限关系表(除角色中定义的权限以外的加减权限))
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(83)">84. sys_user_role
+                        (后台用户和角色关系表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(84)">85. sys_web_log
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(85)">86. tb_health_push_task
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(86)">87. tb_health_push_task_user
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(87)">88. tb_panel
+                        (内容分类)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(88)">89. tb_panel_content
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(89)">90. tb_user_from_id
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(90)">91. ums_collect
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(91)">92. ums_growth_change_history
+                        (成长值变化历史记录表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(92)">93. ums_integration_change_history
+                        (积分变化历史记录表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(93)">94. ums_integration_consume_setting
+                        (积分消费设置)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(94)">95. ums_member
+                        (会员表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(95)">96. ums_member_blance_log
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(96)">97. ums_member_level
+                        (会员等级表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(97)">98. ums_member_login_log
+                        (会员登录记录)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(98)">99. ums_member_member_tag_relation
+                        (用户和标签关系表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(99)">100. ums_member_product_category_relation
+                        (会员与产品分类关系表（用户喜欢的分类）)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(100)">101. ums_member_receive_address
+                        (会员收货地址表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(101)">102. ums_member_rule_setting
+                        (会员积分成长规则表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(102)">103. ums_member_statistics_info
+                        (会员统计信息)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(103)">104. ums_member_tag
+                        (用户标签表)
+                    </a>
+                </div>
+            </div>
+
+            <div class="item">
+                <div class="content">
+                    <a onclick="toTable(104)">105. ums_member_task
+                        (会员任务表)
+                    </a>
+                </div>
+            </div>
+
+        </div>
+
+    </div>
+
+</div>
+
+<!--目录结束-->
+<!--表说明开始-->
+<div class="ui container last db-table " id="db-table-0" style="display: none">
+    <h1 class="ui center aligned header">表名:area</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>aid</td>
+                <td>smallint(5) unsigned</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>areaID</td>
+                <td>mediumint(8) unsigned</td>
+                <td></td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>area</td>
+                <td>char(50)</td>
+                <td></td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>cityID</td>
+                <td>mediumint(8) unsigned</td>
+                <td></td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>aid</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-1" style="display: none">
+    <h1 class="ui center aligned header">表名:city</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>cid</td>
+                <td>smallint(5) unsigned</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>cityID</td>
+                <td>mediumint(8) unsigned</td>
+                <td></td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>city</td>
+                <td>char(50)</td>
+                <td></td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>provinceID</td>
+                <td>mediumint(8) unsigned</td>
+                <td></td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>cid</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-2" style="display: none">
+    <h1 class="ui center aligned header">表名:cms_employ_info</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td>编号</td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(255)</td>
+                <td>姓名</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>age</td>
+                <td>int(11)</td>
+                <td>年纪</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>gender</td>
+                <td>varchar(255)</td>
+                <td>性别</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>hobby</td>
+                <td>varchar(255)</td>
+                <td>爱好</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>peoplenote</td>
+                <td>varchar(255)</td>
+                <td>人生物语</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>phone</td>
+                <td>varchar(255)</td>
+                <td>电话</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>address</td>
+                <td>varchar(255)</td>
+                <td>地址</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>suggestion</td>
+                <td>varchar(255)</td>
+                <td>建议</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>guide</td>
+                <td>varchar(255)</td>
+                <td>主管</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>guide1</td>
+                <td>varchar(255)</td>
+                <td>备管1</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>guide2</td>
+                <td>varchar(255)</td>
+                <td>备管2</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>createtime</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-3" style="display: none">
+    <h1 class="ui center aligned header">表名:cms_help</h3>
+        <h3 class="ui center aligned ">注释:帮助表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>category_id</td>
+                <td>bigint(20)</td>
+                <td>类别</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>icon</td>
+                <td>varchar(500)</td>
+                <td>图片</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>title</td>
+                <td>varchar(100)</td>
+                <td>标题</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>show_status</td>
+                <td>int(1)</td>
+                <td>状态</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>read_count</td>
+                <td>int(1)</td>
+                <td>点击量</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>content</td>
+                <td>text</td>
+                <td>内容</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-4" style="display: none">
+    <h1 class="ui center aligned header">表名:cms_help_category</h3>
+        <h3 class="ui center aligned ">注释:帮助分类表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(100)</td>
+                <td>标题</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>icon</td>
+                <td>varchar(500)</td>
+                <td>分类图标</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>help_count</td>
+                <td>int(11)</td>
+                <td>专题数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>show_status</td>
+                <td>int(2)</td>
+                <td>状态</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort</td>
+                <td>int(11)</td>
+                <td>排序</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-5" style="display: none">
+    <h1 class="ui center aligned header">表名:cms_member_report</h3>
+        <h3 class="ui center aligned ">注释:用户举报表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>report_type</td>
+                <td>int(1)</td>
+                <td>举报类型：0->商品评价；1->话题内容；2->用户评论</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>report_member_name</td>
+                <td>varchar(100)</td>
+                <td>举报人</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>report_object</td>
+                <td>varchar(100)</td>
+                <td>举报对象</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>report_status</td>
+                <td>int(1)</td>
+                <td>举报状态：0->未处理；1->已处理</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>handle_status</td>
+                <td>int(1)</td>
+                <td>处理结果：0->无效；1->有效；2->恶意</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>note</td>
+                <td>varchar(200)</td>
+                <td>内容</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-6" style="display: none">
+    <h1 class="ui center aligned header">表名:cms_parter</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>int(11)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>companyname</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>idcard</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>phone</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>info</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-7" style="display: none">
+    <h1 class="ui center aligned header">表名:cms_prefrence_area</h3>
+        <h3 class="ui center aligned ">注释:优选专区</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(255)</td>
+                <td>标题</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sub_title</td>
+                <td>varchar(255)</td>
+                <td>子标题</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>pic</td>
+                <td>varbinary(500)</td>
+                <td>展示图片</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort</td>
+                <td>int(11)</td>
+                <td>排序</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>show_status</td>
+                <td>int(1)</td>
+                <td>状态</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-8" style="display: none">
+    <h1 class="ui center aligned header">表名:cms_prefrence_area_product_relation</h3>
+        <h3 class="ui center aligned ">注释:优选专区和产品关系表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>prefrence_area_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-9" style="display: none">
+    <h1 class="ui center aligned header">表名:cms_subject</h3>
+        <h3 class="ui center aligned ">注释:专题表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>category_id</td>
+                <td>bigint(20)</td>
+                <td>分类</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>title</td>
+                <td>varchar(100)</td>
+                <td>标题</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>pic</td>
+                <td>varchar(500)</td>
+                <td>专题主图</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_count</td>
+                <td>int(11)</td>
+                <td>关联产品数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>recommend_status</td>
+                <td>int(1)</td>
+                <td>推荐</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>collect_count</td>
+                <td>int(11)</td>
+                <td>收藏量</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>read_count</td>
+                <td>int(11)</td>
+                <td>点击量</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>comment_count</td>
+                <td>int(11)</td>
+                <td>评论量</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>album_pics</td>
+                <td>varchar(1000)</td>
+                <td>画册图片用逗号分割</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>description</td>
+                <td>varchar(1000)</td>
+                <td>描述</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>show_status</td>
+                <td>int(1)</td>
+                <td>显示状态：0->不显示；1->显示</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>content</td>
+                <td>text</td>
+                <td>内容</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>forward_count</td>
+                <td>int(11)</td>
+                <td>转发数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>category_name</td>
+                <td>varchar(200)</td>
+                <td>专题分类名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>area_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>school_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>reward</td>
+                <td>int(11)</td>
+                <td>打赏</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-10" style="display: none">
+    <h1 class="ui center aligned header">表名:cms_subject_category</h3>
+        <h3 class="ui center aligned ">注释:专题分类表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(100)</td>
+                <td>标题</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>icon</td>
+                <td>varchar(500)</td>
+                <td>分类图标</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>subject_count</td>
+                <td>int(11)</td>
+                <td>专题数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>show_status</td>
+                <td>int(2)</td>
+                <td>状态</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort</td>
+                <td>int(11)</td>
+                <td>排序</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-11" style="display: none">
+    <h1 class="ui center aligned header">表名:cms_subject_comment</h3>
+        <h3 class="ui center aligned ">注释:专题评论表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>subject_id</td>
+                <td>bigint(20)</td>
+                <td>所属专题</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_nick_name</td>
+                <td>varchar(255)</td>
+                <td>用户名</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_icon</td>
+                <td>varchar(255)</td>
+                <td>用户图标</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>content</td>
+                <td>varchar(1000)</td>
+                <td>内容</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>show_status</td>
+                <td>int(1)</td>
+                <td>状态</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-12" style="display: none">
+    <h1 class="ui center aligned header">表名:cms_subject_product_relation</h3>
+        <h3 class="ui center aligned ">注释:专题商品关系表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>subject_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-13" style="display: none">
+    <h1 class="ui center aligned header">表名:cms_topic</h3>
+        <h3 class="ui center aligned ">注释:话题表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>category_id</td>
+                <td>bigint(20)</td>
+                <td>所属分类</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(255)</td>
+                <td>标题</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>start_time</td>
+                <td>datetime</td>
+                <td>开始时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>end_time</td>
+                <td>datetime</td>
+                <td>结束时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>attend_count</td>
+                <td>int(11)</td>
+                <td>参与人数</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>attention_count</td>
+                <td>int(11)</td>
+                <td>关注人数</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>read_count</td>
+                <td>int(11)</td>
+                <td>点击人数</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>award_name</td>
+                <td>varchar(100)</td>
+                <td>奖品名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>attend_type</td>
+                <td>varchar(100)</td>
+                <td>参与方式</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>content</td>
+                <td>text</td>
+                <td>话题内容</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-14" style="display: none">
+    <h1 class="ui center aligned header">表名:cms_topic_category</h3>
+        <h3 class="ui center aligned ">注释:话题分类表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(100)</td>
+                <td>标题</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>icon</td>
+                <td>varchar(500)</td>
+                <td>分类图标</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>subject_count</td>
+                <td>int(11)</td>
+                <td>专题数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>show_status</td>
+                <td>int(2)</td>
+                <td>状态</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort</td>
+                <td>int(11)</td>
+                <td>排序</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-15" style="display: none">
+    <h1 class="ui center aligned header">表名:cms_topic_comment</h3>
+        <h3 class="ui center aligned ">注释:专题评论表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>member_nick_name</td>
+                <td>varchar(255)</td>
+                <td>用户名</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>topic_id</td>
+                <td>bigint(20)</td>
+                <td>主题</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_icon</td>
+                <td>varchar(255)</td>
+                <td>图标</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>content</td>
+                <td>varchar(1000)</td>
+                <td>内容</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>show_status</td>
+                <td>int(1)</td>
+                <td>状态</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-16" style="display: none">
+    <h1 class="ui center aligned header">表名:cms_topic_member</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td>编号</td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>member_id</td>
+                <td>bigint(20)</td>
+                <td>会员编号</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>username</td>
+                <td>varchar(255)</td>
+                <td>会员</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>status</td>
+                <td>varchar(255)</td>
+                <td>状态</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>topic_id</td>
+                <td>bigint(20)</td>
+                <td>活动编号</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-17" style="display: none">
+    <h1 class="ui center aligned header">表名:college</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>coid</td>
+                <td>smallint(5) unsigned</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>char(100)</td>
+                <td></td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>provinceID</td>
+                <td>mediumint(8) unsigned</td>
+                <td></td>
+                <td>MUL</td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>coid</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>provinceID</td>
+                <td>provinceID</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-18" style="display: none">
+    <h1 class="ui center aligned header">表名:oms_cart_item</h3>
+        <h3 class="ui center aligned ">注释:购物车表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>product_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_sku_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>quantity</td>
+                <td>int(11)</td>
+                <td>购买数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>price</td>
+                <td>decimal(10,2)</td>
+                <td>添加到购物车的价格</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sp1</td>
+                <td>varchar(200)</td>
+                <td>销售属性1</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sp2</td>
+                <td>varchar(200)</td>
+                <td>销售属性2</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sp3</td>
+                <td>varchar(200)</td>
+                <td>销售属性3</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_pic</td>
+                <td>varchar(1000)</td>
+                <td>商品主图</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_name</td>
+                <td>varchar(500)</td>
+                <td>商品名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_sub_title</td>
+                <td>varchar(500)</td>
+                <td>商品副标题（卖点）</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_sku_code</td>
+                <td>varchar(200)</td>
+                <td>商品sku条码</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_nickname</td>
+                <td>varchar(500)</td>
+                <td>会员昵称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_date</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>modify_date</td>
+                <td>datetime</td>
+                <td>修改时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>delete_status</td>
+                <td>int(1)</td>
+                <td>是否删除</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_category_id</td>
+                <td>bigint(20)</td>
+                <td>商品分类</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_brand</td>
+                <td>varchar(200)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_sn</td>
+                <td>varchar(200)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_attr</td>
+                <td>varchar(500)</td>
+                <td>商品销售属性:[{"key":"颜色","value":"颜色"},{"key":"容量","value":"4G"}]</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>checked</td>
+                <td>int(11)</td>
+                <td>1x选中 2 枚选中</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-19" style="display: none">
+    <h1 class="ui center aligned header">表名:oms_company_address</h3>
+        <h3 class="ui center aligned ">注释:公司收发货地址表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>address_name</td>
+                <td>varchar(200)</td>
+                <td>地址名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>send_status</td>
+                <td>int(1)</td>
+                <td>默认发货地址：0->否；1->是</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>receive_status</td>
+                <td>int(1)</td>
+                <td>是否默认收货地址：0->否；1->是</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(64)</td>
+                <td>收发货人姓名</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>phone</td>
+                <td>varchar(64)</td>
+                <td>收货人电话</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>province</td>
+                <td>varchar(64)</td>
+                <td>省/直辖市</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>city</td>
+                <td>varchar(64)</td>
+                <td>市</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>region</td>
+                <td>varchar(64)</td>
+                <td>区</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>detail_address</td>
+                <td>varchar(200)</td>
+                <td>详细地址</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-20" style="display: none">
+    <h1 class="ui center aligned header">表名:oms_express_company</h3>
+        <h3 class="ui center aligned ">注释:物流公司表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>ID</td>
+                <td>int(11)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>EXPRESS_CORP_ID</td>
+                <td>varchar(32)</td>
+                <td></td>
+                <td>UNI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>EXPRESS_CORP_NAME</td>
+                <td>varchar(64)</td>
+                <td>快递公司名称</td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>STATUS</td>
+                <td>tinyint(4)</td>
+                <td>0 可用 1 不可用</td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>LOGO_URL</td>
+                <td>varchar(32)</td>
+                <td>快递公司logo</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>ID</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>EXPRESS_CORP_ID_UNIQUE</td>
+                <td>EXPRESS_CORP_ID</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-21" style="display: none">
+    <h1 class="ui center aligned header">表名:oms_express_info</h3>
+        <h3 class="ui center aligned ">注释:物流信息表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>ID</td>
+                <td>int(11)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>ORDER_ID</td>
+                <td>int(10) unsigned</td>
+                <td></td>
+                <td>UNI</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>EXPRESS_CORP_ID</td>
+                <td>varchar(32)</td>
+                <td>物流公司编码</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>EXPRESS_NO</td>
+                <td>varchar(32)</td>
+                <td>运单号</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>EXPRESS_STATUS</td>
+                <td>tinyint(4)</td>
+                <td>运单状态0.初始化 1.已发货 2 已签收</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>EXPRESS_DETAIL</td>
+                <td>mediumtext</td>
+                <td>物流详情</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>UPDATE_TIME</td>
+                <td>datetime</td>
+                <td>更新时间</td>
+                <td>MUL</td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>IDX_EXPRESS_INFO_ORDER_ID</td>
+                <td>ORDER_ID</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>PRIMARY</td>
+                <td>ID</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>IDX_EXPRESS_INFO_UPDATETIME</td>
+                <td>UPDATE_TIME</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-22" style="display: none">
+    <h1 class="ui center aligned header">表名:oms_order</h3>
+        <h3 class="ui center aligned ">注释:订单表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td>订单id</td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>member_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>coupon_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>order_sn</td>
+                <td>varchar(64)</td>
+                <td>订单编号</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>提交时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_username</td>
+                <td>varchar(512)</td>
+                <td>用户帐号</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>total_amount</td>
+                <td>decimal(10,2)</td>
+                <td>订单总金额</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>pay_amount</td>
+                <td>decimal(10,2)</td>
+                <td>应付金额（实际支付金额）</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>freight_amount</td>
+                <td>decimal(10,2)</td>
+                <td>运费金额</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>promotion_amount</td>
+                <td>decimal(10,2)</td>
+                <td>促销优化金额（促销价、满减、阶梯价）</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>integration_amount</td>
+                <td>decimal(10,2)</td>
+                <td>积分抵扣金额</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>coupon_amount</td>
+                <td>decimal(10,2)</td>
+                <td>优惠券抵扣金额</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>discount_amount</td>
+                <td>decimal(10,2)</td>
+                <td>管理员后台调整订单使用的折扣金额</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>pay_type</td>
+                <td>int(1)</td>
+                <td>支付方式：0->未支付；1->支付宝；2->微信</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>source_type</td>
+                <td>int(1)</td>
+                <td>订单来源：0->PC订单；1->app订单</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>status</td>
+                <td>int(1)</td>
+                <td>订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>order_type</td>
+                <td>int(1)</td>
+                <td>订单类型：0->正常订单；1->秒杀订单</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>delivery_company</td>
+                <td>varchar(64)</td>
+                <td>物流公司(配送方式)</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>delivery_sn</td>
+                <td>varchar(64)</td>
+                <td>物流单号</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>auto_confirm_day</td>
+                <td>int(11)</td>
+                <td>自动确认时间（天）</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>integration</td>
+                <td>int(11)</td>
+                <td>可以获得的积分</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>growth</td>
+                <td>int(11)</td>
+                <td>可以活动的成长值</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>promotion_info</td>
+                <td>varchar(100)</td>
+                <td>活动信息</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>bill_type</td>
+                <td>int(1)</td>
+                <td>发票类型：0->不开发票；1->电子发票；2->纸质发票</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>bill_header</td>
+                <td>varchar(200)</td>
+                <td>发票抬头</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>bill_content</td>
+                <td>varchar(200)</td>
+                <td>发票内容</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>bill_receiver_phone</td>
+                <td>varchar(32)</td>
+                <td>收票人电话</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>bill_receiver_email</td>
+                <td>varchar(64)</td>
+                <td>收票人邮箱</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>receiver_name</td>
+                <td>varchar(100)</td>
+                <td>收货人姓名</td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>receiver_phone</td>
+                <td>varchar(32)</td>
+                <td>收货人电话</td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>receiver_post_code</td>
+                <td>varchar(32)</td>
+                <td>收货人邮编</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>receiver_province</td>
+                <td>varchar(32)</td>
+                <td>省份/直辖市</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>receiver_city</td>
+                <td>varchar(32)</td>
+                <td>城市</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>receiver_region</td>
+                <td>varchar(32)</td>
+                <td>区</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>receiver_detail_address</td>
+                <td>varchar(200)</td>
+                <td>详细地址</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>note</td>
+                <td>varchar(500)</td>
+                <td>订单备注</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>confirm_status</td>
+                <td>int(1)</td>
+                <td>确认收货状态：0->未确认；1->已确认</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>delete_status</td>
+                <td>int(1)</td>
+                <td>删除状态：0->未删除；1->已删除</td>
+                <td></td>
+                <td>NO</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>use_integration</td>
+                <td>int(11)</td>
+                <td>下单时使用的积分</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>payment_time</td>
+                <td>datetime</td>
+                <td>支付时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>delivery_time</td>
+                <td>datetime</td>
+                <td>发货时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>receive_time</td>
+                <td>datetime</td>
+                <td>确认收货时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>comment_time</td>
+                <td>datetime</td>
+                <td>评价时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>modify_time</td>
+                <td>datetime</td>
+                <td>修改时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>prepay_id</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>supply_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>goods_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>goods_name</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>school_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>receiver_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-23" style="display: none">
+    <h1 class="ui center aligned header">表名:oms_order_item</h3>
+        <h3 class="ui center aligned ">注释:订单中所包含的商品</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>order_id</td>
+                <td>bigint(20)</td>
+                <td>订单id</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>order_sn</td>
+                <td>varchar(64)</td>
+                <td>订单编号</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_pic</td>
+                <td>varchar(500)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_name</td>
+                <td>varchar(200)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_brand</td>
+                <td>varchar(200)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_sn</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_price</td>
+                <td>decimal(10,2)</td>
+                <td>销售价格</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_quantity</td>
+                <td>int(11)</td>
+                <td>购买数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_sku_id</td>
+                <td>bigint(20)</td>
+                <td>商品sku编号</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_sku_code</td>
+                <td>varchar(50)</td>
+                <td>商品sku条码</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_category_id</td>
+                <td>bigint(20)</td>
+                <td>商品分类id</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sp1</td>
+                <td>varchar(100)</td>
+                <td>商品的销售属性</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sp2</td>
+                <td>varchar(100)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sp3</td>
+                <td>varchar(100)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>promotion_name</td>
+                <td>varchar(200)</td>
+                <td>商品促销名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>promotion_amount</td>
+                <td>decimal(10,2)</td>
+                <td>商品促销分解金额</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>coupon_amount</td>
+                <td>decimal(10,2)</td>
+                <td>优惠券优惠分解金额</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>integration_amount</td>
+                <td>decimal(10,2)</td>
+                <td>积分优惠分解金额</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>real_amount</td>
+                <td>decimal(10,2)</td>
+                <td>该商品经过优惠后的分解金额</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>gift_integration</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>gift_growth</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_attr</td>
+                <td>varchar(500)</td>
+                <td>商品销售属性:[{"key":"颜色","value":"颜色"},{"key":"容量","value":"4G"}]</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-24" style="display: none">
+    <h1 class="ui center aligned header">表名:oms_order_operate_history</h3>
+        <h3 class="ui center aligned ">注释:订单操作历史记录</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>order_id</td>
+                <td>bigint(20)</td>
+                <td>订单id</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>operate_man</td>
+                <td>varchar(100)</td>
+                <td>操作人：用户；系统；后台管理员</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>操作时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>order_status</td>
+                <td>int(1)</td>
+                <td>订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>note</td>
+                <td>varchar(500)</td>
+                <td>备注</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-25" style="display: none">
+    <h1 class="ui center aligned header">表名:oms_order_return_apply</h3>
+        <h3 class="ui center aligned ">注释:订单退货申请</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>order_id</td>
+                <td>bigint(20)</td>
+                <td>订单id</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>company_address_id</td>
+                <td>bigint(20)</td>
+                <td>收货地址表id</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_id</td>
+                <td>bigint(20)</td>
+                <td>退货商品id</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>order_sn</td>
+                <td>varchar(64)</td>
+                <td>订单编号</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>申请时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_username</td>
+                <td>varchar(64)</td>
+                <td>会员用户名</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>return_amount</td>
+                <td>decimal(10,2)</td>
+                <td>退款金额</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>return_name</td>
+                <td>varchar(100)</td>
+                <td>退货人姓名</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>return_phone</td>
+                <td>varchar(100)</td>
+                <td>退货人电话</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>status</td>
+                <td>int(1)</td>
+                <td>申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>handle_time</td>
+                <td>datetime</td>
+                <td>处理时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_pic</td>
+                <td>varchar(500)</td>
+                <td>商品图片</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_name</td>
+                <td>varchar(200)</td>
+                <td>商品名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_brand</td>
+                <td>varchar(200)</td>
+                <td>商品品牌</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_attr</td>
+                <td>varchar(500)</td>
+                <td>商品销售属性：颜色：红色；尺码：xl;</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_count</td>
+                <td>int(11)</td>
+                <td>退货数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_price</td>
+                <td>decimal(10,2)</td>
+                <td>商品单价</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_real_price</td>
+                <td>decimal(10,2)</td>
+                <td>商品实际支付单价</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>reason</td>
+                <td>varchar(200)</td>
+                <td>原因</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>description</td>
+                <td>varchar(500)</td>
+                <td>描述</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>proof_pics</td>
+                <td>varchar(1000)</td>
+                <td>凭证图片，以逗号隔开</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>handle_note</td>
+                <td>varchar(500)</td>
+                <td>处理备注</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>handle_man</td>
+                <td>varchar(100)</td>
+                <td>处理人员</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>receive_man</td>
+                <td>varchar(100)</td>
+                <td>收货人</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>receive_time</td>
+                <td>datetime</td>
+                <td>收货时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>receive_note</td>
+                <td>varchar(500)</td>
+                <td>收货备注</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-26" style="display: none">
+    <h1 class="ui center aligned header">表名:oms_order_return_reason</h3>
+        <h3 class="ui center aligned ">注释:退货原因表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(100)</td>
+                <td>退货类型</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>status</td>
+                <td>int(1)</td>
+                <td>状态：0->不启用；1->启用</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>添加时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-27" style="display: none">
+    <h1 class="ui center aligned header">表名:oms_order_setting</h3>
+        <h3 class="ui center aligned ">注释:订单设置表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>flash_order_overtime</td>
+                <td>int(11)</td>
+                <td>秒杀订单超时关闭时间(分)</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>normal_order_overtime</td>
+                <td>int(11)</td>
+                <td>正常订单超时时间(分)</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>confirm_overtime</td>
+                <td>int(11)</td>
+                <td>发货后自动确认收货时间（天）</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>finish_overtime</td>
+                <td>int(11)</td>
+                <td>自动完成交易时间，不能申请售后（天）</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>comment_overtime</td>
+                <td>int(11)</td>
+                <td>订单完成后自动好评时间（天）</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-28" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_album</h3>
+        <h3 class="ui center aligned ">注释:相册表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>pic</td>
+                <td>varchar(200)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>type</td>
+                <td>varchar(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>description</td>
+                <td>varchar(1000)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-29" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_album_pic</h3>
+        <h3 class="ui center aligned ">注释:画册图片表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>album_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>pic</td>
+                <td>varchar(1000)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-30" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_brand</h3>
+        <h3 class="ui center aligned ">注释:品牌表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>first_letter</td>
+                <td>varchar(8)</td>
+                <td>首字母</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>factory_status</td>
+                <td>int(1)</td>
+                <td>是否为品牌制造商：0->不是；1->是</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>show_status</td>
+                <td>int(1)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_count</td>
+                <td>int(11)</td>
+                <td>产品数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_comment_count</td>
+                <td>int(11)</td>
+                <td>产品评论数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>logo</td>
+                <td>varchar(255)</td>
+                <td>品牌logo</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>big_pic</td>
+                <td>varchar(255)</td>
+                <td>专区大图</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>brand_story</td>
+                <td>text</td>
+                <td>品牌故事</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-31" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_comment</h3>
+        <h3 class="ui center aligned ">注释:商品评价表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>product_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_nick_name</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_name</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>star</td>
+                <td>int(3)</td>
+                <td>评价星数：0->5</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_ip</td>
+                <td>varchar(64)</td>
+                <td>评价的ip</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>show_status</td>
+                <td>int(1)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_attribute</td>
+                <td>varchar(255)</td>
+                <td>购买时的商品属性</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>collect_couont</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>read_count</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>content</td>
+                <td>text</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>pics</td>
+                <td>varchar(1000)</td>
+                <td>上传图片地址，以逗号隔开</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_icon</td>
+                <td>varchar(255)</td>
+                <td>评论用户头像</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>replay_count</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-32" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_comment_replay</h3>
+        <h3 class="ui center aligned ">注释:产品评价回复表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>comment_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_nick_name</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_icon</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>content</td>
+                <td>varchar(1000)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>type</td>
+                <td>int(1)</td>
+                <td>评论人员类型；0->会员；1->管理员</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-33" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_favorite</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>add_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>type</td>
+                <td>int(11)</td>
+                <td>1 商品 2 文章 3 店铺</td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>obj_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>meno1</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>meno2</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>meno3</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>FKAFC41E931E208F02</td>
+                <td>member_id</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>FKAFC41E93339519D2</td>
+                <td>obj_id</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>FKAFC41E931C0CA9F2</td>
+                <td>store_id</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-34" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_feight_template</h3>
+        <h3 class="ui center aligned ">注释:运费模版</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>charge_type</td>
+                <td>int(1)</td>
+                <td>计费类型:0->按重量；1->按件数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>first_weight</td>
+                <td>decimal(10,2)</td>
+                <td>首重kg</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>first_fee</td>
+                <td>decimal(10,2)</td>
+                <td>首费（元）</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>continue_weight</td>
+                <td>decimal(10,2)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>continme_fee</td>
+                <td>decimal(10,2)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>dest</td>
+                <td>varchar(255)</td>
+                <td>目的地（省、市）</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-35" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_member_price</h3>
+        <h3 class="ui center aligned ">注释:商品会员价格表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>product_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_level_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_price</td>
+                <td>decimal(10,2)</td>
+                <td>会员价格</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_level_name</td>
+                <td>varchar(100)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-36" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_product</h3>
+        <h3 class="ui center aligned ">注释:商品信息</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>brand_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_category_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>feight_template_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_attribute_category_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>pic</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_sn</td>
+                <td>varchar(64)</td>
+                <td>货号</td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>delete_status</td>
+                <td>int(1)</td>
+                <td>删除状态：0->未删除；1->已删除</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>publish_status</td>
+                <td>int(1)</td>
+                <td>上架状态：0->下架；1->上架</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>new_status</td>
+                <td>int(1)</td>
+                <td>新品状态:0->不是新品；1->新品</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>recommand_status</td>
+                <td>int(1)</td>
+                <td>推荐状态；0->不推荐；1->推荐</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>verify_status</td>
+                <td>int(1)</td>
+                <td>审核状态：0->未审核；1->审核通过</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort</td>
+                <td>int(11)</td>
+                <td>排序</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sale</td>
+                <td>int(11)</td>
+                <td>销量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>price</td>
+                <td>decimal(10,2)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>promotion_price</td>
+                <td>decimal(10,2)</td>
+                <td>促销价格</td>
+                <td></td>
+                <td>YES</td>
+                <td>0.00</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>gift_growth</td>
+                <td>int(11)</td>
+                <td>赠送的成长值</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>gift_point</td>
+                <td>int(11)</td>
+                <td>赠送的积分</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>use_point_limit</td>
+                <td>int(11)</td>
+                <td>限制使用的积分数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sub_title</td>
+                <td>varchar(255)</td>
+                <td>副标题</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>description</td>
+                <td>text</td>
+                <td>商品描述</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>original_price</td>
+                <td>decimal(10,2)</td>
+                <td>市场价</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>stock</td>
+                <td>int(11)</td>
+                <td>库存</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>low_stock</td>
+                <td>int(11)</td>
+                <td>库存预警值</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>unit</td>
+                <td>varchar(16)</td>
+                <td>单位</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>weight</td>
+                <td>decimal(10,2)</td>
+                <td>商品重量，默认为克</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>preview_status</td>
+                <td>int(1)</td>
+                <td>是否为预告商品：0->不是；1->是</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>service_ids</td>
+                <td>varchar(64)</td>
+                <td>以逗号分割的产品服务：1->无忧退货；2->快速退款；3->免费包邮</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>keywords</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>note</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>album_pics</td>
+                <td>varchar(255)</td>
+                <td>画册图片，连产品图片限制为5张，以逗号分割</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>detail_title</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>detail_desc</td>
+                <td>text</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>detail_html</td>
+                <td>text</td>
+                <td>产品详情网页内容</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>detail_mobile_html</td>
+                <td>text</td>
+                <td>移动端网页详情</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>promotion_start_time</td>
+                <td>datetime</td>
+                <td>促销开始时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>promotion_end_time</td>
+                <td>datetime</td>
+                <td>促销结束时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>promotion_per_limit</td>
+                <td>int(11)</td>
+                <td>活动限购数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>promotion_type</td>
+                <td>int(1)</td>
+                <td>促销类型：0->没有促销使用原价;1->使用促销价；2->使用会员价；3->使用阶梯价格；4->使用满减价格；5->限时购</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>brand_name</td>
+                <td>varchar(255)</td>
+                <td>品牌名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_category_name</td>
+                <td>varchar(255)</td>
+                <td>商品分类名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>supply_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>school_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>hit</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-37" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_product_attribute</h3>
+        <h3 class="ui center aligned ">注释:商品属性参数表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>product_attribute_category_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>select_type</td>
+                <td>int(1)</td>
+                <td>属性选择类型：0->唯一；1->单选；2->多选</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>input_type</td>
+                <td>int(1)</td>
+                <td>属性录入方式：0->手工录入；1->从列表中选取</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>input_list</td>
+                <td>varchar(255)</td>
+                <td>可选值列表，以逗号隔开</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort</td>
+                <td>int(11)</td>
+                <td>排序字段：最高的可以单独上传图片</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>filter_type</td>
+                <td>int(1)</td>
+                <td>分类筛选样式：1->普通；1->颜色</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>search_type</td>
+                <td>int(1)</td>
+                <td>检索类型；0->不需要进行检索；1->关键字检索；2->范围检索</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>related_status</td>
+                <td>int(1)</td>
+                <td>相同属性产品是否关联；0->不关联；1->关联</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>hand_add_status</td>
+                <td>int(1)</td>
+                <td>是否支持手动新增；0->不支持；1->支持</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>type</td>
+                <td>int(1)</td>
+                <td>属性的类型；0->规格；1->参数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-38" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_product_attribute_category</h3>
+        <h3 class="ui center aligned ">注释:产品属性分类表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>attribute_count</td>
+                <td>int(11)</td>
+                <td>属性数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>param_count</td>
+                <td>int(11)</td>
+                <td>参数数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>pic</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-39" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_product_attribute_value</h3>
+        <h3 class="ui center aligned ">注释:存储产品参数信息的表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>product_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_attribute_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>value</td>
+                <td>varchar(64)</td>
+                <td>手动添加规格或参数的值，参数单值，规格有多个时以逗号隔开</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>type</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-40" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_product_category</h3>
+        <h3 class="ui center aligned ">注释:产品分类</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>parent_id</td>
+                <td>bigint(20)</td>
+                <td>上机分类的编号：0表示一级分类</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>level</td>
+                <td>int(1)</td>
+                <td>分类级别：0->1级；1->2级</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_count</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_unit</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>nav_status</td>
+                <td>int(1)</td>
+                <td>是否显示在导航栏：0->不显示；1->显示</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>show_status</td>
+                <td>int(1)</td>
+                <td>显示状态：0->不显示；1->显示</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>index_status</td>
+                <td>int(1)</td>
+                <td>是否是首页分类0-->不是，1-->是</td>
+                <td></td>
+                <td>NO</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>icon</td>
+                <td>varchar(255)</td>
+                <td>图标</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>keywords</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>description</td>
+                <td>text</td>
+                <td>描述</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-41" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_product_category_attribute_relation</h3>
+        <h3 class="ui center aligned ">注释:产品的分类和属性的关系表，用于设置分类筛选条件（只支持一级分类）</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>product_category_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_attribute_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-42" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_product_consult</h3>
+        <h3 class="ui center aligned ">注释:产品咨询表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(10) unsigned</td>
+                <td>咨询编号</td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>goods_id</td>
+                <td>bigint(11) unsigned</td>
+                <td>商品编号</td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>goods_name</td>
+                <td>varchar(100)</td>
+                <td>商品名称</td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_id</td>
+                <td>bigint(11)</td>
+                <td>咨询发布者会员编号(0：游客)</td>
+                <td></td>
+                <td>NO</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_name</td>
+                <td>varchar(100)</td>
+                <td>会员名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>bigint(11) unsigned</td>
+                <td>店铺编号</td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>email</td>
+                <td>varchar(255)</td>
+                <td>咨询发布者邮箱</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>consult_content</td>
+                <td>varchar(255)</td>
+                <td>咨询内容</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>consult_addtime</td>
+                <td>datetime</td>
+                <td>咨询添加时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>consult_reply</td>
+                <td>varchar(255)</td>
+                <td>咨询回复内容</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>consult_reply_time</td>
+                <td>datetime</td>
+                <td>咨询回复时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>isanonymous</td>
+                <td>tinyint(1)</td>
+                <td>0表示不匿名 1表示匿名</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>is_del</td>
+                <td>tinyint(1)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>pic</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>goods_id</td>
+                <td>goods_id</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>seller_id</td>
+                <td>store_id</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-43" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_product_full_reduction</h3>
+        <h3 class="ui center aligned ">注释:产品满减表(只针对同商品)</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(11)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>product_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>full_price</td>
+                <td>decimal(10,2)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>reduce_price</td>
+                <td>decimal(10,2)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-44" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_product_ladder</h3>
+        <h3 class="ui center aligned ">注释:产品阶梯价格表(只针对同商品)</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>product_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>count</td>
+                <td>int(11)</td>
+                <td>满足的商品数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>discount</td>
+                <td>decimal(10,2)</td>
+                <td>折扣</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>price</td>
+                <td>decimal(10,2)</td>
+                <td>折后价格</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-45" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_product_operate_log</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>product_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>price_old</td>
+                <td>decimal(10,2)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>price_new</td>
+                <td>decimal(10,2)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sale_price_old</td>
+                <td>decimal(10,2)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sale_price_new</td>
+                <td>decimal(10,2)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>gift_point_old</td>
+                <td>int(11)</td>
+                <td>赠送的积分</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>gift_point_new</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>use_point_limit_old</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>use_point_limit_new</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>operate_man</td>
+                <td>varchar(64)</td>
+                <td>操作人</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-46" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_product_vertify_record</h3>
+        <h3 class="ui center aligned ">注释:商品审核记录</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>product_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>vertify_man</td>
+                <td>varchar(64)</td>
+                <td>审核人</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>status</td>
+                <td>int(1)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>detail</td>
+                <td>varchar(255)</td>
+                <td>反馈详情</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-47" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_sku_stock</h3>
+        <h3 class="ui center aligned ">注释:sku的库存</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>product_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sku_code</td>
+                <td>varchar(64)</td>
+                <td>sku编码</td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>price</td>
+                <td>decimal(10,2)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>stock</td>
+                <td>int(11)</td>
+                <td>库存</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>low_stock</td>
+                <td>int(11)</td>
+                <td>预警库存</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sp1</td>
+                <td>varchar(64)</td>
+                <td>销售属性1</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sp2</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sp3</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>pic</td>
+                <td>varchar(255)</td>
+                <td>展示图片</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sale</td>
+                <td>int(11)</td>
+                <td>销量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>promotion_price</td>
+                <td>decimal(10,2)</td>
+                <td>单品促销价格</td>
+                <td></td>
+                <td>YES</td>
+                <td>0.00</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>lock_stock</td>
+                <td>int(11)</td>
+                <td>锁定库存</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_name</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sp4</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-48" style="display: none">
+    <h1 class="ui center aligned header">表名:pms_small_navicon_category</h3>
+        <h3 class="ui center aligned ">注释:小程序首页nav管理</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(11)</td>
+                <td>小程序首页分类ID</td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>title</td>
+                <td>varchar(200)</td>
+                <td>分类名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>icon</td>
+                <td>varchar(500)</td>
+                <td>分类图标</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>summary</td>
+                <td>varchar(200)</td>
+                <td>跳转页面</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>content</td>
+                <td>varchar(50)</td>
+                <td>跳转类型</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort</td>
+                <td>int(10)</td>
+                <td>排序</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-49" style="display: none">
+    <h1 class="ui center aligned header">表名:province</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>pid</td>
+                <td>smallint(3) unsigned</td>
+                <td>省份ID</td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>provinceID</td>
+                <td>mediumint(8) unsigned</td>
+                <td></td>
+                <td>MUL</td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>pname</td>
+                <td>varchar(15)</td>
+                <td>省份名称</td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>pid</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>provinceID</td>
+                <td>provinceID</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-50" style="display: none">
+    <h1 class="ui center aligned header">表名:school</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>scid</td>
+                <td>int(8) unsigned</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>char(100)</td>
+                <td></td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>collegeID</td>
+                <td>smallint(5) unsigned</td>
+                <td></td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>scid</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-51" style="display: none">
+    <h1 class="ui center aligned header">表名:shopping_store</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>addTime</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>deleteStatus</td>
+                <td>bit(1)</td>
+                <td></td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>card_approve</td>
+                <td>bit(1)</td>
+                <td></td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>realstore_approve</td>
+                <td>bit(1)</td>
+                <td></td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_address</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_credit</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_info</td>
+                <td>longtext</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_msn</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_name</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_ower</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_ower_card</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_qq</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_recommend</td>
+                <td>bit(1)</td>
+                <td></td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_recommend_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_seo_description</td>
+                <td>longtext</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_seo_keywords</td>
+                <td>longtext</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_status</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_telephone</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_zip</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>template</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>validity</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>violation_reseaon</td>
+                <td>longtext</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>area_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>card_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>grade_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sc_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_banner_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_license_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_logo_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>update_grade_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>domain_modify_count</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_second_domain</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>favorite_count</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_lat</td>
+                <td>decimal(6,2)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_lng</td>
+                <td>decimal(6,2)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_ww</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>map_type</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>baidu</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>delivery_begin_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>delivery_end_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>combin_begin_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>combin_end_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>weixin_begin_time</td>
+                <td>date</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>weixin_end_time</td>
+                <td>date</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>weixin_status</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>weixin_appId</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>weixin_appSecret</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>weixin_token</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>weixin_welecome_content</td>
+                <td>longtext</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>weixin_qr_img_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>weixin_account</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_weixin_logo_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>weixin_store_name</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>FK1A2E9F4A7CE341A</td>
+                <td>store_banner_id</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>FK1A2E9F4A9A6FEF94</td>
+                <td>card_id</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>FK1A2E9F4AFA5E3FC2</td>
+                <td>area_id</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>FK1A2E9F4A33028121</td>
+                <td>grade_id</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>FK1A2E9F4A33F45DA9</td>
+                <td>sc_id</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>FK1A2E9F4AA10642E1</td>
+                <td>store_license_id</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>FK1A2E9F4A11D81442</td>
+                <td>weixin_qr_img_id</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>FK1A2E9F4A8D04BD7</td>
+                <td>update_grade_id</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>FK1A2E9F4AC98DF95A</td>
+                <td>store_weixin_logo_id</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>FK1A2E9F4A929E09BB</td>
+                <td>store_logo_id</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-52" style="display: none">
+    <h1 class="ui center aligned header">表名:sms_coupon</h3>
+        <h3 class="ui center aligned ">注释:优惠卷表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>type</td>
+                <td>int(1)</td>
+                <td>优惠卷类型；0->全场赠券；1->会员赠券；2->购物赠券；3->注册赠券</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(100)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>platform</td>
+                <td>int(1)</td>
+                <td>使用平台：0->全部；1->移动；2->PC</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>count</td>
+                <td>int(11)</td>
+                <td>数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>amount</td>
+                <td>decimal(10,2)</td>
+                <td>金额</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>per_limit</td>
+                <td>int(11)</td>
+                <td>每人限领张数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>min_point</td>
+                <td>decimal(10,2)</td>
+                <td>使用门槛；0表示无门槛</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>start_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>end_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>use_type</td>
+                <td>int(1)</td>
+                <td>使用类型：0->全场通用；1->指定分类；2->指定商品</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>note</td>
+                <td>varchar(200)</td>
+                <td>备注</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>publish_count</td>
+                <td>int(11)</td>
+                <td>发行数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>use_count</td>
+                <td>int(11)</td>
+                <td>已使用数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>receive_count</td>
+                <td>int(11)</td>
+                <td>领取数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>enable_time</td>
+                <td>datetime</td>
+                <td>可以领取的日期</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>code</td>
+                <td>varchar(64)</td>
+                <td>优惠码</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_level</td>
+                <td>int(1)</td>
+                <td>可领取的会员类型：0->无限时</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-53" style="display: none">
+    <h1 class="ui center aligned header">表名:sms_coupon_history</h3>
+        <h3 class="ui center aligned ">注释:优惠券使用、领取历史表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>coupon_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>coupon_code</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_nickname</td>
+                <td>varchar(64)</td>
+                <td>领取人昵称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>get_type</td>
+                <td>int(1)</td>
+                <td>获取类型：0->后台赠送；1->主动获取</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>use_status</td>
+                <td>int(1)</td>
+                <td>使用状态：0->未使用；1->已使用；2->已过期</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>use_time</td>
+                <td>datetime</td>
+                <td>使用时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>order_id</td>
+                <td>bigint(20)</td>
+                <td>订单编号</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>order_sn</td>
+                <td>varchar(100)</td>
+                <td>订单号码</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>start_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>end_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>note</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>idx_member_id</td>
+                <td>member_id</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>idx_coupon_id</td>
+                <td>coupon_id</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-54" style="display: none">
+    <h1 class="ui center aligned header">表名:sms_coupon_product_category_relation</h3>
+        <h3 class="ui center aligned ">注释:优惠券和产品分类关系表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>coupon_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_category_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_category_name</td>
+                <td>varchar(200)</td>
+                <td>产品分类名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>parent_category_name</td>
+                <td>varchar(200)</td>
+                <td>父分类名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-55" style="display: none">
+    <h1 class="ui center aligned header">表名:sms_coupon_product_relation</h3>
+        <h3 class="ui center aligned ">注释:优惠券和产品的关系表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>coupon_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_name</td>
+                <td>varchar(500)</td>
+                <td>商品名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_sn</td>
+                <td>varchar(200)</td>
+                <td>商品编码</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-56" style="display: none">
+    <h1 class="ui center aligned header">表名:sms_flash_promotion</h3>
+        <h3 class="ui center aligned ">注释:限时购表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>title</td>
+                <td>varchar(200)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>start_date</td>
+                <td>date</td>
+                <td>开始日期</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>end_date</td>
+                <td>date</td>
+                <td>结束日期</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>status</td>
+                <td>int(1)</td>
+                <td>上下线状态</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>秒杀时间段名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>isIndex</td>
+                <td>int(1)</td>
+                <td>是否是首页抢购 0为不是，1为是</td>
+                <td></td>
+                <td>NO</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-57" style="display: none">
+    <h1 class="ui center aligned header">表名:sms_flash_promotion_log</h3>
+        <h3 class="ui center aligned ">注释:限时购通知记录</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>int(11)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>member_id</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_phone</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_name</td>
+                <td>varchar(100)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>subscribe_time</td>
+                <td>datetime</td>
+                <td>会员订阅时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>send_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-58" style="display: none">
+    <h1 class="ui center aligned header">表名:sms_flash_promotion_product_relation</h3>
+        <h3 class="ui center aligned ">注释:商品限时购与商品关系表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td>编号</td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>flash_promotion_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>flash_promotion_session_id</td>
+                <td>bigint(20)</td>
+                <td>编号</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>flash_promotion_price</td>
+                <td>decimal(10,2)</td>
+                <td>限时购价格</td>
+                <td></td>
+                <td>YES</td>
+                <td>0.00</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>flash_promotion_count</td>
+                <td>int(11)</td>
+                <td>限时购数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>flash_promotion_limit</td>
+                <td>int(11)</td>
+                <td>每人限购数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort</td>
+                <td>int(11)</td>
+                <td>排序</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-59" style="display: none">
+    <h1 class="ui center aligned header">表名:sms_flash_promotion_session</h3>
+        <h3 class="ui center aligned ">注释:限时购场次表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td>编号</td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(200)</td>
+                <td>场次名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>start_time</td>
+                <td>time</td>
+                <td>每日开始时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>end_time</td>
+                <td>time</td>
+                <td>每日结束时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>status</td>
+                <td>int(1)</td>
+                <td>启用状态：0->不启用；1->启用</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-60" style="display: none">
+    <h1 class="ui center aligned header">表名:sms_group</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>goods_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>goods_name</td>
+                <td>varchar(255)</td>
+                <td>商品</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>origin_price</td>
+                <td>decimal(10,0)</td>
+                <td>商品价格</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>group_price</td>
+                <td>decimal(10,0)</td>
+                <td>拼团价格</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>start_time</td>
+                <td>datetime</td>
+                <td>开始时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>end_time</td>
+                <td>datetime</td>
+                <td>结束时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>hours</td>
+                <td>int(11)</td>
+                <td>拼团小时</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>peoples</td>
+                <td>int(11)</td>
+                <td>成团人数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>status</td>
+                <td>int(11)</td>
+                <td>状态</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>max_people</td>
+                <td>int(11)</td>
+                <td>拼团总人数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>limit_goods</td>
+                <td>int(11)</td>
+                <td>团购次数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-61" style="display: none">
+    <h1 class="ui center aligned header">表名:sms_group_member</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>group_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>member_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>main_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>goods_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>status</td>
+                <td>int(11)</td>
+                <td>状态</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>order_id</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>groupAndMain</td>
+                <td>group_id,member_id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-62" style="display: none">
+    <h1 class="ui center aligned header">表名:sms_home_advertise</h3>
+        <h3 class="ui center aligned ">注释:首页轮播广告表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(100)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>type</td>
+                <td>int(1)</td>
+                <td>轮播位置：0->PC首页轮播；1->app首页轮播</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>pic</td>
+                <td>varchar(500)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>start_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>end_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>status</td>
+                <td>int(1)</td>
+                <td>上下线状态：0->下线；1->上线</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>click_count</td>
+                <td>int(11)</td>
+                <td>点击数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>order_count</td>
+                <td>int(11)</td>
+                <td>下单数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>url</td>
+                <td>varchar(500)</td>
+                <td>链接地址</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>note</td>
+                <td>varchar(500)</td>
+                <td>备注</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort</td>
+                <td>int(11)</td>
+                <td>排序</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-63" style="display: none">
+    <h1 class="ui center aligned header">表名:sms_home_brand</h3>
+        <h3 class="ui center aligned ">注释:首页推荐品牌表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>brand_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>brand_name</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>recommend_status</td>
+                <td>int(1)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-64" style="display: none">
+    <h1 class="ui center aligned header">表名:sms_home_new_product</h3>
+        <h3 class="ui center aligned ">注释:新鲜好物表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>product_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_name</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>recommend_status</td>
+                <td>int(1)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort</td>
+                <td>int(1)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-65" style="display: none">
+    <h1 class="ui center aligned header">表名:sms_home_recommend_product</h3>
+        <h3 class="ui center aligned ">注释:人气推荐商品表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>product_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_name</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>recommend_status</td>
+                <td>int(1)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort</td>
+                <td>int(1)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-66" style="display: none">
+    <h1 class="ui center aligned header">表名:sms_home_recommend_subject</h3>
+        <h3 class="ui center aligned ">注释:首页推荐专题表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>subject_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>subject_name</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>recommend_status</td>
+                <td>int(1)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-67" style="display: none">
+    <h1 class="ui center aligned header">表名:sms_red_packet</h3>
+        <h3 class="ui center aligned ">注释:红包</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>int(12)</td>
+                <td>红包编号</td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>user_id</td>
+                <td>bigint(12)</td>
+                <td>发红包的用户id</td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>amount</td>
+                <td>decimal(16,2)</td>
+                <td>红包金额</td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>send_date</td>
+                <td>date</td>
+                <td>发红包日期</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>total</td>
+                <td>int(12)</td>
+                <td>红包总数</td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>unit_amount</td>
+                <td>decimal(12,0)</td>
+                <td>单个红包的金额</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>stock</td>
+                <td>int(12)</td>
+                <td>红包剩余个数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>type</td>
+                <td>int(12)</td>
+                <td>红包类型</td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>note</td>
+                <td>varchar(256)</td>
+                <td>备注</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-68" style="display: none">
+    <h1 class="ui center aligned header">表名:sms_user_red_packet</h3>
+        <h3 class="ui center aligned ">注释:用户红包</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>int(12)</td>
+                <td>用户红包编号</td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>red_packet_id</td>
+                <td>int(12)</td>
+                <td>红包编号</td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>admin_id</td>
+                <td>bigint(12)</td>
+                <td>发红包用户的编号</td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>user_id</td>
+                <td>bigint(12)</td>
+                <td>抢红包用户的编号</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>amount</td>
+                <td>decimal(16,2)</td>
+                <td>抢到的红包金额</td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>grab_time</td>
+                <td>date</td>
+                <td>抢红包时间</td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>note</td>
+                <td>varchar(256)</td>
+                <td>备注</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-69" style="display: none">
+    <h1 class="ui center aligned header">表名:sys_admin_log</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td>编号</td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>user_id</td>
+                <td>bigint(20)</td>
+                <td>用户编号</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>user_name</td>
+                <td>varchar(55)</td>
+                <td>用户名</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>service_name</td>
+                <td>varchar(100)</td>
+                <td>模块名</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>method</td>
+                <td>varchar(255)</td>
+                <td>记录类名+方法名</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>operation_desc</td>
+                <td>varchar(255)</td>
+                <td>描述</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>ip</td>
+                <td>varchar(100)</td>
+                <td>IP</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>params</td>
+                <td>varchar(3000)</td>
+                <td>参数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>time_min</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-70" style="display: none">
+    <h1 class="ui center aligned header">表名:sys_applet_set</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>appid</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>appsecret</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>mchid</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>paySignKey</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>certName</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>notifyUrl</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>templateId1</td>
+                <td>varchar(255)</td>
+                <td>下单通知模版</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>templateId2</td>
+                <td>varchar(255)</td>
+                <td>支付成功模版</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>templateId3</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>templateId4</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>templateId5</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>templateId6</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>store_id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-71" style="display: none">
+    <h1 class="ui center aligned header">表名:sys_area</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>pid</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>deep</td>
+                <td>int(11)</td>
+                <td>层级</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(255)</td>
+                <td>名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>pinyin_prefix</td>
+                <td>varchar(255)</td>
+                <td>拼音前缀</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>pinyin</td>
+                <td>varchar(255)</td>
+                <td>拼音</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>ext_id</td>
+                <td>varchar(255)</td>
+                <td>备注名</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>ext_name</td>
+                <td>varchar(255)</td>
+                <td>备注名</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-72" style="display: none">
+    <h1 class="ui center aligned header">表名:sys_dict</h3>
+        <h3 class="ui center aligned ">注释:系统配置信息表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>keyname</td>
+                <td>varchar(50)</td>
+                <td>标签</td>
+                <td>UNI</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>valuename</td>
+                <td>varchar(2000)</td>
+                <td>值</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>status</td>
+                <td>tinyint(4)</td>
+                <td>状态 0：隐藏 1：显示</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>remark</td>
+                <td>varchar(500)</td>
+                <td>备注</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>type</td>
+                <td>varchar(255)</td>
+                <td>类型</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>key</td>
+                <td>keyname</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-73" style="display: none">
+    <h1 class="ui center aligned header">表名:sys_member_area</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>member_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>obj_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>type</td>
+                <td>varchar(255)</td>
+                <td>1 会员区域 2 会员学校</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>member_id,obj_id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-74" style="display: none">
+    <h1 class="ui center aligned header">表名:sys_permission</h3>
+        <h3 class="ui center aligned ">注释:后台用户权限表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>pid</td>
+                <td>bigint(20)</td>
+                <td>父级权限id</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(100)</td>
+                <td>名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>value</td>
+                <td>varchar(200)</td>
+                <td>权限值</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>icon</td>
+                <td>varchar(500)</td>
+                <td>图标</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>type</td>
+                <td>int(1)</td>
+                <td>权限类型：0->目录；1->菜单；2->按钮（接口绑定权限）</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>uri</td>
+                <td>varchar(200)</td>
+                <td>前端资源路径</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>status</td>
+                <td>int(1)</td>
+                <td>启用状态；0->禁用；1->启用</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort</td>
+                <td>int(11)</td>
+                <td>排序</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-75" style="display: none">
+    <h1 class="ui center aligned header">表名:sys_permission_category</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(100)</td>
+                <td>类型名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>icon</td>
+                <td>varchar(500)</td>
+                <td>类型图标</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>type_count</td>
+                <td>int(11)</td>
+                <td>类型数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>show_status</td>
+                <td>int(2)</td>
+                <td>状态</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort</td>
+                <td>int(11)</td>
+                <td>排序</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-76" style="display: none">
+    <h1 class="ui center aligned header">表名:sys_role</h3>
+        <h3 class="ui center aligned ">注释:后台用户角色表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(100)</td>
+                <td>名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>description</td>
+                <td>varchar(500)</td>
+                <td>描述</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>admin_count</td>
+                <td>int(11)</td>
+                <td>后台用户数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>status</td>
+                <td>int(1)</td>
+                <td>启用状态：0->禁用；1->启用</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-77" style="display: none">
+    <h1 class="ui center aligned header">表名:sys_role_permission</h3>
+        <h3 class="ui center aligned ">注释:后台用户角色和权限关系表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>role_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>permission_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-78" style="display: none">
+    <h1 class="ui center aligned header">表名:sys_school</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(11)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>longitude</td>
+                <td>varchar(40)</td>
+                <td>精度</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>latitude</td>
+                <td>varchar(40)</td>
+                <td>纬度</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(40)</td>
+                <td>名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>province</td>
+                <td>varchar(20)</td>
+                <td>省</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>city</td>
+                <td>varchar(20)</td>
+                <td>市</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>region</td>
+                <td>varchar(20)</td>
+                <td>区</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>address</td>
+                <td>varchar(255)</td>
+                <td>地址</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>hot</td>
+                <td>int(11)</td>
+                <td>1热门</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>is211</td>
+                <td>int(11)</td>
+                <td>211</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>is985</td>
+                <td>int(11)</td>
+                <td>985</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-79" style="display: none">
+    <h1 class="ui center aligned header">表名:sys_sms</h3>
+        <h3 class="ui center aligned ">注释:发短信记录</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>int(11)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>phone</td>
+                <td>varchar(16)</td>
+                <td>手机号码</td>
+                <td>MUL</td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>signName</td>
+                <td>varchar(128)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>templateCode</td>
+                <td>varchar(128)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>params</td>
+                <td>varchar(500)</td>
+                <td>参数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>bizId</td>
+                <td>varchar(128)</td>
+                <td>阿里云返回的</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>code</td>
+                <td>varchar(64)</td>
+                <td>阿里云返回的code</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>message</td>
+                <td>varchar(128)</td>
+                <td>阿里云返回的</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>day</td>
+                <td>date</td>
+                <td>日期</td>
+                <td>MUL</td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>createTime</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>updateTime</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>phone</td>
+                <td>phone</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>day</td>
+                <td>day</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-80" style="display: none">
+    <h1 class="ui center aligned header">表名:sys_store</h3>
+        <h3 class="ui center aligned ">注释:店铺表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>sms_quantity</td>
+                <td>bigint(20)</td>
+                <td>短信数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>register_type</td>
+                <td>smallint(6)</td>
+                <td>注册类型</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>expire_time</td>
+                <td>datetime</td>
+                <td>到期时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>try_time</td>
+                <td>datetime</td>
+                <td>尝试时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>contact_mobile</td>
+                <td>char(11)</td>
+                <td>联系电话</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>address_province</td>
+                <td>bigint(20)</td>
+                <td>地区省</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>buy_plan_times</td>
+                <td>bigint(20)</td>
+                <td>所购物品计划时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>is_checked</td>
+                <td>smallint(6)</td>
+                <td>是否选中</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>is_deleted</td>
+                <td>smallint(6)</td>
+                <td>是否删除</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>service_phone</td>
+                <td>varchar(30)</td>
+                <td>服务电话</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>address_lat</td>
+                <td>varchar(40)</td>
+                <td>地址名</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>contact_name</td>
+                <td>varchar(20)</td>
+                <td>联系人名</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>delete_time</td>
+                <td>datetime</td>
+                <td>删除时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>diy_profile</td>
+                <td>text</td>
+                <td>自己配置文件</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>industry_two</td>
+                <td>bigint(20)</td>
+                <td>行业</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>is_star</td>
+                <td>smallint(6)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>is_try</td>
+                <td>smallint(6)</td>
+                <td>尝试</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>logo</td>
+                <td>varchar(255)</td>
+                <td>图标</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>address_detail</td>
+                <td>varchar(100)</td>
+                <td>地址细节</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>plan_id</td>
+                <td>bigint(20)</td>
+                <td>计划id</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>support_name</td>
+                <td>varchar(20)</td>
+                <td>支持，维持名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(50)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>status</td>
+                <td>smallint(6)</td>
+                <td>1为出售中，3为已售罄，-2为仓库中，-1为回收站</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>uid</td>
+                <td>smallint(6)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>type</td>
+                <td>smallint(6)</td>
+                <td>类型</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>contact_qq</td>
+                <td>varchar(11)</td>
+                <td>联系QQ</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>address_lng</td>
+                <td>varchar(40)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>last_login_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>support_phone</td>
+                <td>varchar(30)</td>
+                <td>支持电话</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>address_area</td>
+                <td>bigint(20)</td>
+                <td>地址区域</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>contact_qrcode</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>description</td>
+                <td>varchar(255)</td>
+                <td>描述</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>industry_one</td>
+                <td>bigint(20)</td>
+                <td>行业1</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>address_city</td>
+                <td>bigint(20)</td>
+                <td>地址城市</td>
+                <td></td>
+                <td>YES</td>
+                <td>0</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>id</td>
+                <td>int(11)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-81" style="display: none">
+    <h1 class="ui center aligned header">表名:sys_user</h3>
+        <h3 class="ui center aligned ">注释:后台用户表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>username</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>password</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>icon</td>
+                <td>varchar(500)</td>
+                <td>头像</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>email</td>
+                <td>varchar(100)</td>
+                <td>邮箱</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>nick_name</td>
+                <td>varchar(200)</td>
+                <td>昵称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>note</td>
+                <td>varchar(500)</td>
+                <td>备注信息</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>login_time</td>
+                <td>datetime</td>
+                <td>最后登录时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>status</td>
+                <td>int(1)</td>
+                <td>帐号启用状态：0->禁用；1->启用</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>supply_id</td>
+                <td>int(20)</td>
+                <td>供应商</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>bigint(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>ums_admin_username</td>
+                <td>username,store_id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td>用户名唯一索引</td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-82" style="display: none">
+    <h1 class="ui center aligned header">表名:sys_user_permission</h3>
+        <h3 class="ui center aligned ">注释:后台用户和权限关系表(除角色中定义的权限以外的加减权限)</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>admin_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>permission_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>type</td>
+                <td>int(1)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-83" style="display: none">
+    <h1 class="ui center aligned header">表名:sys_user_role</h3>
+        <h3 class="ui center aligned ">注释:后台用户和角色关系表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>admin_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>role_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-84" style="display: none">
+    <h1 class="ui center aligned header">表名:sys_web_log</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td>编号</td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>user_id</td>
+                <td>bigint(20)</td>
+                <td>用户编号</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>user_name</td>
+                <td>varchar(55)</td>
+                <td>用户名</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>service_name</td>
+                <td>varchar(100)</td>
+                <td>模块名</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>method</td>
+                <td>varchar(255)</td>
+                <td>记录类名+方法名</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>operation_desc</td>
+                <td>varchar(955)</td>
+                <td>描述</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>ip</td>
+                <td>varchar(100)</td>
+                <td>IP</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>params</td>
+                <td>varchar(3000)</td>
+                <td>参数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>time_min</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-85" style="display: none">
+    <h1 class="ui center aligned header">表名:tb_health_push_task</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>int(11)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>template_id</td>
+                <td>varchar(64)</td>
+                <td>小程序模版ID</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>task_name</td>
+                <td>varchar(64)</td>
+                <td>模版名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>task_topic</td>
+                <td>varchar(64)</td>
+                <td>活动主题</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>task_caption</td>
+                <td>varchar(200)</td>
+                <td>活动说明</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>task_tips</td>
+                <td>varchar(64)</td>
+                <td>温馨提示</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>task_type</td>
+                <td>varchar(64)</td>
+                <td>任务类型</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>status</td>
+                <td>int(1)</td>
+                <td>任务是否已经发送 1 未发送[默认] 2 已发送</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>goods_id</td>
+                <td>int(11)</td>
+                <td>商品ID</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>goods_name</td>
+                <td>varchar(64)</td>
+                <td>商品标题</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>goods_online_status</td>
+                <td>int(2)</td>
+                <td>商品前台状态 1 上架 0 下架</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>price</td>
+                <td>decimal(10,2)</td>
+                <td>商品金额（需要的海贝数）</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>is_upload</td>
+                <td>int(1)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>file_name</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>update_time</td>
+                <td>datetime</td>
+                <td>更新时间</td>
+                <td></td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-86" style="display: none">
+    <h1 class="ui center aligned header">表名:tb_health_push_task_user</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>int(11)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>task_id</td>
+                <td>int(11)</td>
+                <td>推送ID</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>user_id</td>
+                <td>int(11)</td>
+                <td>用户ID</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>form_id</td>
+                <td>varchar(50)</td>
+                <td>小程序推送formId</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>status</td>
+                <td>int(2)</td>
+                <td>推送状态 1 已推送 2 未推送</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>update_time</td>
+                <td>datetime</td>
+                <td>更新时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>note</td>
+                <td>varchar(255)</td>
+                <td>备注</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-87" style="display: none">
+    <h1 class="ui center aligned header">表名:tb_panel</h3>
+        <h3 class="ui center aligned ">注释:内容分类</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>int(11)</td>
+                <td>类目ID</td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(50)</td>
+                <td>板块名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>type</td>
+                <td>int(1)</td>
+                <td>类型 0轮播图 1板块种类一 2板块种类二 3板块种类三</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort_order</td>
+                <td>int(4)</td>
+                <td>排列序号</td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>position</td>
+                <td>int(1)</td>
+                <td>所属位置 0首页 1商品推荐 2我要捐赠</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>limit_num</td>
+                <td>int(4)</td>
+                <td>板块限制商品数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>status</td>
+                <td>int(1)</td>
+                <td>状态</td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>remark</td>
+                <td>varchar(255)</td>
+                <td>备注</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>created</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>updated</td>
+                <td>datetime</td>
+                <td>更新时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort_order</td>
+                <td>sort_order</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>parent_id</td>
+                <td>status</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-88" style="display: none">
+    <h1 class="ui center aligned header">表名:tb_panel_content</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>int(11)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>panel_id</td>
+                <td>int(11)</td>
+                <td>所属板块id</td>
+                <td>MUL</td>
+                <td>NO</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>type</td>
+                <td>int(1)</td>
+                <td>类型 0关联商品 1其他链接</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_id</td>
+                <td>bigint(20)</td>
+                <td>关联商品id</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>sort_order</td>
+                <td>int(4)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>full_url</td>
+                <td>varchar(500)</td>
+                <td>其他链接</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>pic_url</td>
+                <td>varchar(500)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>pic_url2</td>
+                <td>varchar(500)</td>
+                <td>3d轮播图备用</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>pic_url3</td>
+                <td>varchar(500)</td>
+                <td>3d轮播图备用</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>created</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>updated</td>
+                <td>datetime</td>
+                <td></td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>category_id</td>
+                <td>panel_id</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>updated</td>
+                <td>updated</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-89" style="display: none">
+    <h1 class="ui center aligned header">表名:tb_user_from_id</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(11)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>user_id</td>
+                <td>bigint(11)</td>
+                <td>用户id</td>
+                <td>MUL</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>form_id</td>
+                <td>varchar(100)</td>
+                <td>小程序推送formId</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>source</td>
+                <td>smallint(2)</td>
+                <td>来源 source 1，步数兑换海贝按钮；2，首页邀请按钮；3，步数拦截弹窗邀请按钮；4，兑换商品按钮；\n\n5，海贝不够邀请按钮；6，引导关注蒙层按钮；7，健康体验领取按钮
+                    8，首页弹窗“马上领取”按钮
+                </td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>status</td>
+                <td>smallint(2)</td>
+                <td>使用状态 1 未使用[默认] 2 已使用</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>update_time</td>
+                <td>datetime</td>
+                <td>修改时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>_idx_form_id_</td>
+                <td>user_id</td>
+                <td>
+                    NORMAL
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-90" style="display: none">
+    <h1 class="ui center aligned header">表名:ums_collect</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td>编号</td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>member_id</td>
+                <td>bigint(20)</td>
+                <td>会员编号</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>goods_id</td>
+                <td>bigint(20)</td>
+                <td>商品编号</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>goods_name</td>
+                <td>varchar(255)</td>
+                <td>商品</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>goods_pic</td>
+                <td>varchar(255)</td>
+                <td>图片</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>goods_price</td>
+                <td>varchar(255)</td>
+                <td>价格</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>type</td>
+                <td>int(11)</td>
+                <td>1 商品 2 文章</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>创建时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-91" style="display: none">
+    <h1 class="ui center aligned header">表名:ums_growth_change_history</h3>
+        <h3 class="ui center aligned ">注释:成长值变化历史记录表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>member_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>change_type</td>
+                <td>int(1)</td>
+                <td>改变类型：0->增加；1->减少</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>change_count</td>
+                <td>int(11)</td>
+                <td>积分改变数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>operate_man</td>
+                <td>varchar(100)</td>
+                <td>操作人员</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>operate_note</td>
+                <td>varchar(200)</td>
+                <td>操作备注</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>source_type</td>
+                <td>int(1)</td>
+                <td>积分来源：0->购物；1->管理员修改</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-92" style="display: none">
+    <h1 class="ui center aligned header">表名:ums_integration_change_history</h3>
+        <h3 class="ui center aligned ">注释:积分变化历史记录表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>member_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>change_type</td>
+                <td>int(1)</td>
+                <td>改变类型：0->增加；1->减少</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>change_count</td>
+                <td>int(11)</td>
+                <td>积分改变数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>operate_man</td>
+                <td>varchar(100)</td>
+                <td>操作人员</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>operate_note</td>
+                <td>varchar(200)</td>
+                <td>操作备注</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>source_type</td>
+                <td>int(1)</td>
+                <td>积分来源：0->购物；1->管理员修改</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-93" style="display: none">
+    <h1 class="ui center aligned header">表名:ums_integration_consume_setting</h3>
+        <h3 class="ui center aligned ">注释:积分消费设置</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>deduction_per_amount</td>
+                <td>int(11)</td>
+                <td>每一元需要抵扣的积分数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>max_percent_per_order</td>
+                <td>int(11)</td>
+                <td>每笔订单最高抵用百分比</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>use_unit</td>
+                <td>int(11)</td>
+                <td>每次使用积分最小单位100</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>coupon_status</td>
+                <td>int(1)</td>
+                <td>是否可以和优惠券同用；0->不可以；1->可以</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-94" style="display: none">
+    <h1 class="ui center aligned header">表名:ums_member</h3>
+        <h3 class="ui center aligned ">注释:会员表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>member_level_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>username</td>
+                <td>varchar(64)</td>
+                <td>用户名</td>
+                <td>UNI</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>password</td>
+                <td>varchar(64)</td>
+                <td>密码</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>nickname</td>
+                <td>varchar(64)</td>
+                <td>昵称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>phone</td>
+                <td>varchar(64)</td>
+                <td>手机号码</td>
+                <td>UNI</td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>status</td>
+                <td>int(1)</td>
+                <td>帐号启用状态:0->禁用；1->启用</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td>注册时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>icon</td>
+                <td>varchar(500)</td>
+                <td>头像</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>gender</td>
+                <td>int(1)</td>
+                <td>性别：0->未知；1->男；2->女</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>birthday</td>
+                <td>date</td>
+                <td>生日</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>city</td>
+                <td>varchar(64)</td>
+                <td>所做城市</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>job</td>
+                <td>varchar(100)</td>
+                <td>职业</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>personalized_signature</td>
+                <td>varchar(200)</td>
+                <td>个性签名</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>source_type</td>
+                <td>int(1)</td>
+                <td>用户来源 1 小程序 2 公众号 3 页面</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>integration</td>
+                <td>int(11)</td>
+                <td>积分</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>growth</td>
+                <td>int(11)</td>
+                <td>成长值</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>luckey_count</td>
+                <td>int(11)</td>
+                <td>剩余抽奖次数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>history_integration</td>
+                <td>int(11)</td>
+                <td>历史积分数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>avatar</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>weixin_openid</td>
+                <td>varchar(50)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>invitecode</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>blance</td>
+                <td>decimal(10,0)</td>
+                <td>余额</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>school_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>area_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>idx_username</td>
+                <td>username</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>idx_phone</td>
+                <td>phone</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-95" style="display: none">
+    <h1 class="ui center aligned header">表名:ums_member_blance_log</h3>
+        <h3 class="ui center aligned ">注释:</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>member_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>price</td>
+                <td>decimal(11,0)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>type</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>note</td>
+                <td>varchar(255)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-96" style="display: none">
+    <h1 class="ui center aligned header">表名:ums_member_level</h3>
+        <h3 class="ui center aligned ">注释:会员等级表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(100)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>growth_point</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>default_status</td>
+                <td>int(1)</td>
+                <td>是否为默认等级：0->不是；1->是</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>free_freight_point</td>
+                <td>decimal(10,2)</td>
+                <td>免运费标准</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>comment_growth_point</td>
+                <td>int(11)</td>
+                <td>每次评价获取的成长值</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>priviledge_free_freight</td>
+                <td>int(1)</td>
+                <td>是否有免邮特权</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>priviledge_sign_in</td>
+                <td>int(1)</td>
+                <td>是否有签到特权</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>priviledge_comment</td>
+                <td>int(1)</td>
+                <td>是否有评论获奖励特权</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>priviledge_promotion</td>
+                <td>int(1)</td>
+                <td>是否有专享活动特权</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>priviledge_member_price</td>
+                <td>int(1)</td>
+                <td>是否有会员价格特权</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>priviledge_birthday</td>
+                <td>int(1)</td>
+                <td>是否有生日特权</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>articlecount</td>
+                <td>int(1)</td>
+                <td>可发文章数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>goodscount</td>
+                <td>int(1)</td>
+                <td>可发商品数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>price</td>
+                <td>decimal(10,2)</td>
+                <td>成为会员的价格</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>note</td>
+                <td>varchar(200)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-97" style="display: none">
+    <h1 class="ui center aligned header">表名:ums_member_login_log</h3>
+        <h3 class="ui center aligned ">注释:会员登录记录</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>member_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>ip</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>city</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>login_type</td>
+                <td>int(1)</td>
+                <td>登录类型：0->PC；1->android;2->ios;3->小程序</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>province</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-98" style="display: none">
+    <h1 class="ui center aligned header">表名:ums_member_member_tag_relation</h3>
+        <h3 class="ui center aligned ">注释:用户和标签关系表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>member_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>tag_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-99" style="display: none">
+    <h1 class="ui center aligned header">表名:ums_member_product_category_relation</h3>
+        <h3 class="ui center aligned ">注释:会员与产品分类关系表（用户喜欢的分类）</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>member_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>product_category_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-100" style="display: none">
+    <h1 class="ui center aligned header">表名:ums_member_receive_address</h3>
+        <h3 class="ui center aligned ">注释:会员收货地址表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>member_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(100)</td>
+                <td>收货人名称</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>phone_number</td>
+                <td>varchar(64)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>default_status</td>
+                <td>int(1)</td>
+                <td>是否为默认</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>post_code</td>
+                <td>varchar(100)</td>
+                <td>邮政编码</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>province</td>
+                <td>varchar(100)</td>
+                <td>省份/直辖市</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>city</td>
+                <td>varchar(100)</td>
+                <td>城市</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>region</td>
+                <td>varchar(100)</td>
+                <td>区</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>detail_address</td>
+                <td>varchar(128)</td>
+                <td>详细地址(街道)</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-101" style="display: none">
+    <h1 class="ui center aligned header">表名:ums_member_rule_setting</h3>
+        <h3 class="ui center aligned ">注释:会员积分成长规则表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>continue_sign_day</td>
+                <td>int(11)</td>
+                <td>连续签到天数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>continue_sign_point</td>
+                <td>int(11)</td>
+                <td>连续签到赠送数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>consume_per_point</td>
+                <td>decimal(10,2)</td>
+                <td>每消费多少元获取1个点</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>low_order_amount</td>
+                <td>decimal(10,2)</td>
+                <td>最低获取点数的订单金额</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>max_point_per_order</td>
+                <td>int(11)</td>
+                <td>每笔订单最高获取点数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>type</td>
+                <td>int(1)</td>
+                <td>类型：0->积分规则；1->成长值规则</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-102" style="display: none">
+    <h1 class="ui center aligned header">表名:ums_member_statistics_info</h3>
+        <h3 class="ui center aligned ">注释:会员统计信息</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>member_id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>consume_amount</td>
+                <td>decimal(10,2)</td>
+                <td>累计消费金额</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>order_count</td>
+                <td>int(11)</td>
+                <td>订单数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>coupon_count</td>
+                <td>int(11)</td>
+                <td>优惠券数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>comment_count</td>
+                <td>int(11)</td>
+                <td>评价数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>return_order_count</td>
+                <td>int(11)</td>
+                <td>退货数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>login_count</td>
+                <td>int(11)</td>
+                <td>登录次数</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>attend_count</td>
+                <td>int(11)</td>
+                <td>关注数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>fans_count</td>
+                <td>int(11)</td>
+                <td>粉丝数量</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>collect_product_count</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>collect_subject_count</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>collect_topic_count</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>collect_comment_count</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>invite_friend_count</td>
+                <td>int(11)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>recent_order_time</td>
+                <td>datetime</td>
+                <td>最后一次下订单时间</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-103" style="display: none">
+    <h1 class="ui center aligned header">表名:ums_member_tag</h3>
+        <h3 class="ui center aligned ">注释:用户标签表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(100)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>type</td>
+                <td>int(11)</td>
+                <td>1会员标签 2 商品标签 3 文章标签</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>gen_type</td>
+                <td>int(10)</td>
+                <td>1自动标签 2 手动标签</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>create_time</td>
+                <td>datetime</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+<div class="ui container last db-table " id="db-table-104" style="display: none">
+    <h1 class="ui center aligned header">表名:ums_member_task</h3>
+        <h3 class="ui center aligned ">注释:会员任务表</h3>
+        <h3 class="ui center aligned "><a onclick="toIndex()">返回目录</a></h3>
+        <table class="ui orange celled   table">
+            <caption>表格信息</caption>
+            <thead>
+            <tr>
+                <th>字段</th>
+                <th>类型</th>
+                <th>注释</th>
+                <th>键</th>
+                <th>能否为空</th>
+                <th>默认值</th>
+                <th>其他</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>id</td>
+                <td>bigint(20)</td>
+                <td></td>
+                <td>PRI</td>
+                <td>NO</td>
+                <td>无</td>
+                <td>auto_increment</td>
+            </tr>
+            <tr>
+                <td>name</td>
+                <td>varchar(100)</td>
+                <td></td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>growth</td>
+                <td>int(11)</td>
+                <td>赠送成长值</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>intergration</td>
+                <td>int(11)</td>
+                <td>赠送积分</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>type</td>
+                <td>int(1)</td>
+                <td>任务类型：0->新手任务；1->日常任务</td>
+                <td></td>
+                <td>YES</td>
+                <td>无</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>store_id</td>
+                <td>int(11)</td>
+                <td>所属店铺</td>
+                <td></td>
+                <td>YES</td>
+                <td>1</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+
+        <table class="ui orange celled   table">
+            <caption>索引信息</caption>
+            <thead>
+            <tr>
+                <th>名称</th>
+                <th>栏位</th>
+                <th>索引类型</th>
+                <th>索引方式</th>
+                <th>索引备注</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td>PRIMARY</td>
+                <td>id</td>
+                <td>
+                    UNIQUE
+                </td>
+                <td>BTREE</td>
+                <td></td>
+            </tr>
+            </tbody>
+
+        </table>
+</div>
+
+
+<script type="text/javascript">
+
+
+    function toTable(id) {
+        $(".db-table").hide();
+        $(".db-index").hide();
+        $("#db-table-" + id).show();
+        toTop();
+    }
+
+    function toIndex() {
+        $(".db-table").hide();
+        $(".db-index").show();
+        toTop();
+    }
+
+    function toTop() {
+        location.href = "#top";
+    }
+
+</script>
+
+</body>
+
+</html>
diff --git a/pom.xml b/pom.xml
index 58b5152def6a914387c0b0b14f0add64497cddaf..732e913f667176992d3f883e938b7fa3c9cda2ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,11 +11,11 @@
 
     <modules>
         <module>mallplus-mbg</module>
-
-        <module>mallplus-admin</module>
-
+        <module>mallplus-pay</module>
+        <module>mallplus-wechat</module>
         <module>mallplus-portal</module>
-
+        <module>mallplus-admin</module>
+      <!--  <module>mallplus-search</module>-->
     </modules>
 
 </project>
diff --git a/test b/test
index 4a9cc8745c1e8a1a80ffee406b7a5119eb8ec2ae..d700caaecd4e685df22dca3b8fa0e5c284b76358 100644
--- a/test
+++ b/test
@@ -1,93 +1,30 @@
-huobi =
-55683750454
-55683748444
-55683746484
-55683744403
-55683742881
-55683741133
-55683738172
-55683736275
-55683733453
-55683731620
-55683729262
-55683727190
-55683723883
-
-55683750454
-55683748444
-
-55683746484
-55683744403
-55683742881
-
-
-ok==
-3852769735361536
-3849181018407936
-3849180629644288
-3497496996495360
-3497496850742272
-3497496449987584
-3497495985802240
-3490711319364608
-3490711140714496
-3490710975560704
-3490710825744384
-3490710674686976
-3490710554754048
-3490710454947840
-3490710314764288
-3490709667793920
-3490709343587328
-3490709146782720
-3490708924219392
-3490708664698880
-3490707719343104
-
-3852769735361536
-3849181018407936
-3849180629644288
-
-
-3820504368418816
-3820504368154624
-3819949997688832
-3819949980522496
-3819664206488576
-3819645980053504
-3819622403544064
-3819622396465152
-3819617916488704
-3819617908775936
-3818916520796160
-3818913804402688
-3809727518087168
-3809726264928256
-3809716797907968
-3809599290874880
-3809597304941568
-3780597561633792
-3780597561494528
-3780570430251008
-3780570358635520
-3779184077707264
-3769603442748416
-3769603390118912
-3769577977750528
-3769577921779712
-3768015115527168
-3756888029468672
-3756887123303424
-3756886422808576
-
-3820504368418816
-3820504368154624
-3819949997688832
-
-3819949980522496
-3819664206488576
-3819645980053504
-
+server {
+    listen    80;
+    server_name example.com;
+
+    location ^~ /web {
+        proxy_pass     http://localhost:8081;
+        proxy_set_header  Host       $host;
+        proxy_set_header  X-Real-IP    $remote_addr;
+        proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location ^~ /admin {
+        proxy_pass     http://localhost:8085;
+        proxy_set_header  Host       $host;
+        proxy_set_header  X-Real-IP    $remote_addr;
+        proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    location ^~ /h5 {
+       proxy_pass     http://localhost:8082;
+       proxy_set_header  Host       $host;
+       proxy_set_header  X-Real-IP    $remote_addr;
+       proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+}
+
+http://shop.legendshop.cn/s/system/paySite
 
 
 USE information_schema;
@@ -180,62 +117,98 @@ http://ext.dcloud.net.cn/plugin?id=104 cms
 select DATE_FORMAT(create_time, '%Y-%m-%d') day1,sum(pay_amount) FROM  oms_order group by day1  HAVING day1>='2019-08-01'  ORDER BY day1
 
 
-3820504368418816
-3820504368154624
-3819949997688832
-3819949980522496
-3819664206488576
-3819645980053504
-3819622403544064
-3819622396465152
-3819617916488704
-
-3819617908775936
-3818916520796160
-3818913804402688
-3809727518087168
-3809726264928256
-3809716797907968
-3809599290874880
-3809597304941568
-3780597561633792
-3780597561494528
-3780570430251008
-3780570358635520
-3779184077707264
-3769603442748416
-3769603390118912
-3769577977750528
-3769577921779712
-3768015115527168
-3756888029468672
-3756887123303424
-3756886422808576
-smallId=3756886422808576，by=3820504368418816
-
-3820504368418816
-3820504368154624
-3819949997688832
-smallId=3819949997688832，by=3820504368418816
-
-
-55683748444
-55683746484
-smallId=55683744403，by=55683748444
-
-55683750454
-55683748444
-55683746484
-55683744403
-
-55683742881
-55683741133
-55683738172
-55683736275
-55683733453
-55683731620
-55683729262
-55683727190
+h5
+alipay  WAP
+isWeiXin wechatpay JSAPI_OFFICIAL
+wechatpay MWEB
+
+
+
+####项目一nginx配置文件
+
+server {
+
+        #访问端口(页面访问端口)
+        listen 80;
+        server_name www.yjlive.cn;
+
+        error_page 500 502 503 504 /50x.html;
+            location = /50x.html {
+            root html;
+        }
+
+        location / {
+            # 前端工程根目录
+            root /root/jm/h5;
+            index index.html;
+        }
+
+
+		#没有跨域需求可以不配
+        #代理路径 地址是以spi开头的 ‘/api开头的都走这个代理’
+        # 将前端访问的后台端口变更为‘前台id:前台端口/api/xxx/xxx’
+
+        location /api {
+
+            #正则表达式匹配路径
+
+            rewrite  ^/api/(.*)$ /$1 break;
+
+            include  uwsgi_params;
+
+            #后端端口(后端最终访问的端口)
 
+            proxy_pass   http://39.106.212.32:8081 ;
 
+        }
+        location @router {
+        rewrite ^.*$ /index.html last;
+        }
+    }
+
+
+
+	server {
+
+        #访问端口(页面访问端口)
+        listen 80;
+        server_name www.yjlive.cn;
+		#root /usr/local/www/;
+        error_page 500 502 503 504 /50x.html;
+            location = /50x.html {
+            root html;
+        }
+    ##项目一，同过域名直接访问
+		location / {
+            #前端工程根目录
+            alias /root/jm/h5/;
+            index index.html;
+        }
+    ##项目二，同过域名.com/YYY访问
+        location /h5 {
+            # 前端工程根目录
+            alias  /root/jm/mall/;
+			try_files $uri $uri/ @router;
+			index index.html;
+        }
+		# 没有跨域需求可以不配
+        #代理路径 地址是以spi开头的 ‘/api开头的都走这个代理’
+        # 将前端访问的后台端口变更为‘前台id:前台端口/api/xxx/xxx’
+        location /api {
+
+            #正则表达式匹配路径
+
+            rewrite  ^/api/(.*)$ /$1 break;
+
+            include  uwsgi_params;
+
+            #后端端口(后端最终访问的端口)
+
+            proxy_pass   http://39.106.212.32:8081 ;
+
+        }
+        location @router {
+        rewrite ^.*$ /index.html last;
+        }
+    }