Merge remote-tracking branch 'origin/main' into main

2021-03-23 15:15:15 +08:00 · 2021-03-23 15:15:15 +08:00 · 8ee766b0e3
commit 8ee766b0e3
parent 227f733ff9 d8b6f4b3bb
7 changed files with 77 additions and 16 deletions
--- a/src/main/java/cn/com/tenlion/pojo/bos/shop/ShopBO.java
+++ b/src/main/java/cn/com/tenlion/pojo/bos/shop/ShopBO.java
@ -15,6 +15,7 @@ public class ShopBO {
    private String shopSummary;
    private Double shopStar;
    private String shopLogo;
+    private Integer shopTemplateId;
    private Double userEvaluate;
    private Integer isOpen;
    private String openDate;
@ -66,6 +67,14 @@ public class ShopBO {
        this.shopLogo = shopLogo;
    }

+    public Integer getShopTemplateId() {
+        return shopTemplateId;
+    }
+
+    public void setShopTemplateId(Integer shopTemplateId) {
+        this.shopTemplateId = shopTemplateId;
+    }
+
    public Double getUserEvaluate() {
        return userEvaluate == null ? 0D : userEvaluate;
    }
--- a/src/main/java/cn/com/tenlion/pojo/dtos/shop/ShopDTO.java
+++ b/src/main/java/cn/com/tenlion/pojo/dtos/shop/ShopDTO.java
@ -26,6 +26,11 @@ public class ShopDTO {
    private Double shopStar;
    @ApiModelProperty(name = "shopLogo", value = "店铺LOGO文件ID")
    private String shopLogo;
+
+    @ApiModelProperty(name = "shopTemplateId", value = "模板ID")
+    private Integer shopTemplateId;
+
+
    @ApiModelProperty(name = "userEvaluate", value = "用户评价，分数，满分10分，通过用户对商品的满意度计算")
    private Double userEvaluate;
    @ApiModelProperty(name = "isOpen", value = "是否营业 0:未开业，1:开业中")
@ -90,6 +95,14 @@ public class ShopDTO {
        this.shopLogo = shopLogo;
    }

+    public Integer getShopTemplateId() {
+        return shopTemplateId;
+    }
+
+    public void setShopTemplateId(Integer shopTemplateId) {
+        this.shopTemplateId = shopTemplateId;
+    }
+
    public Double getUserEvaluate() {
        return userEvaluate == null ? 0D : userEvaluate;
    }
--- a/src/main/java/cn/com/tenlion/pojo/pos/shop/ShopPO.java
+++ b/src/main/java/cn/com/tenlion/pojo/pos/shop/ShopPO.java
@ -15,6 +15,7 @@ public class ShopPO {
    private String shopSummary;
    private Double shopStar;
    private String shopLogo;
+    private Integer shopTemplateId;
    private Double userEvaluate;
    private Integer isOpen;
    private String openDate;
@ -66,6 +67,14 @@ public class ShopPO {
        this.shopLogo = shopLogo;
    }

+    public Integer getShopTemplateId() {
+        return shopTemplateId;
+    }
+
+    public void setShopTemplateId(Integer shopTemplateId) {
+        this.shopTemplateId = shopTemplateId;
+    }
+
    public Double getUserEvaluate() {
        return userEvaluate == null ? 0D : userEvaluate;
    }
--- a/src/main/java/cn/com/tenlion/pojo/vos/shop/ShopVO.java
+++ b/src/main/java/cn/com/tenlion/pojo/vos/shop/ShopVO.java
@ -30,6 +30,11 @@ public class ShopVO {
    @ApiModelProperty(name = "shopLogo", value = "店铺LOGO文件ID")
    @CheckEmptyAnnotation(name = "店铺LOGO文件ID", verifyType = "string")
    private String shopLogo;
+
+    @ApiModelProperty(name = "shopTemplateId", value = "模板ID")
+    @CheckNumberAnnotation(name = "模板ID")
+    private Integer shopTemplateId;
+
    @ApiModelProperty(name = "isOpen", value = "是否营业0:未开业，1:开业中")
    @CheckNumberAnnotation(name = "是否营业0:未开业，1:开业中")
    private Integer isOpen;
@ -80,6 +85,13 @@ public class ShopVO {
        this.shopLogo = shopLogo;
    }

+    public Integer getShopTemplateId() {
+        return shopTemplateId;
+    }
+
+    public void setShopTemplateId(Integer shopTemplateId) {
+        this.shopTemplateId = shopTemplateId;
+    }

    public Integer getIsOpen() {
        return isOpen == null ? 0 : isOpen;
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@ -1,11 +1,6 @@
 server:
-<<<<<<< HEAD
-  port: 8090
-  url: http://127.0.0.1:8090/businesscard
-=======
-  port: 8088
-  url: http://192.168.0.111:8088/businesscard
->>>>>>> 5a94052e7f98f2f26229a8ea58ceffc20b2b0ed6
+  port: 8080
+  url: http://127.0.0.1:8080/businesscard
  system-title: 名片管理系统
  system-sub-title: 名片系统
  servlet:
@ -34,11 +29,7 @@ spring:
      db-type: mysql
      driver-class-name: com.mysql.cj.jdbc.Driver
      username: root
-<<<<<<< HEAD
-      password: admin
-=======
      password: 123456
->>>>>>> 5a94052e7f98f2f26229a8ea58ceffc20b2b0ed6
      initial-size: 2
      min-idle: 2
      max-active: 10
--- a/src/main/resources/mybatis/mapper/shop/shop-mapper.xml
+++ b/src/main/resources/mybatis/mapper/shop/shop-mapper.xml
@ -9,6 +9,8 @@
        <result column="shop_address" property="shopAddress"/>
        <result column="shop_star" property="shopStar"/>
        <result column="shop_logo" property="shopLogo"/>
+        <result column="shop_template_id" property="shopTemplateId"/>
+
        <result column="user_evaluate" property="userEvaluate"/>
        <result column="is_open" property="isOpen"/>
        <result column="open_date" property="openDate"/>
@ -25,6 +27,7 @@
        <result column="shop_summary" property="shopSummary"/>
        <result column="shop_star" property="shopStar"/>
        <result column="shop_logo" property="shopLogo"/>
+        <result column="shop_template_id" property="shopTemplateId"/>
        <result column="user_evaluate" property="userEvaluate"/>
        <result column="is_open" property="isOpen"/>
        <result column="open_date" property="openDate"/>
@ -43,6 +46,7 @@
        <result column="shop_summary" property="shopSummary"/>
        <result column="shop_star" property="shopStar"/>
        <result column="shop_logo" property="shopLogo"/>
+        <result column="shop_template_id" property="shopTemplateId"/>
        <result column="user_evaluate" property="userEvaluate"/>
        <result column="is_open" property="isOpen"/>
        <result column="open_date" property="openDate"/>
@ -64,6 +68,7 @@
            shop_address,
            shop_star,
            shop_logo,
+            shop_template_id,
            user_evaluate,
            is_open,
            open_date,
@ -81,6 +86,7 @@
            #{shopAddress},
            #{shopStar},
            #{shopLogo},
+            #{shopTemplateId},
            #{userEvaluate},
            #{isOpen},
            #{openDate},
@ -143,6 +149,9 @@
            <if test="shopLogo != null and shopLogo != ''">
            shop_logo = #{shopLogo},
            </if>
+            <if test="shopTemplateId != null and shopTemplateId != ''">
+            shop_template_id = #{shopTemplateId},
+            </if>
            <if test="userEvaluate != null">
            user_evaluate = #{userEvaluate},
            </if>
@ -183,6 +192,7 @@
            t1.shop_address,
            t1.shop_star,
            t1.shop_logo,
+            t1.shop_template_id,
            t1.user_evaluate,
            t1.is_open,
            t1.open_date,
@ -207,6 +217,7 @@
            t1.shop_summary,
            t1.shop_star,
            t1.shop_logo,
+            t1.shop_template_id,
            t1.user_evaluate,
            t1.audit_result,
            t1.is_open,
@ -236,6 +247,7 @@
            t1.shop_summary,
            t1.shop_star,
            t1.shop_logo,
+            t1.shop_template_id,
            t1.user_evaluate,
            t1.is_open,
            t1.open_date,
@ -264,6 +276,7 @@
            t1.shop_summary,
            t1.shop_star,
            t1.shop_logo,
+            t1.shop_template_id,
            t1.user_evaluate,
            t1.is_open,
            t1.open_date,
@ -277,7 +290,7 @@
            t1.is_delete = 0
        <if test="keywords != null and keywords != ''">
        AND (
-            t1.id LIKE CONCAT('%', #{keywords}, '%')
+            t1.shop_name LIKE CONCAT('%', #{keywords}, '%')
        )
        </if>
        <if test="startTime != null and startTime != ''">
@ -303,6 +316,7 @@
            t1.shop_summary,
            t1.shop_star,
            t1.shop_logo,
+            t1.shop_template_id,
            t1.user_evaluate,
            t1.is_open,
            t1.open_date,
@ -348,6 +362,7 @@
            t1.shop_summary,
            t1.shop_star,
            t1.shop_logo,
+            t1.shop_template_id,
            t1.user_evaluate,
            t1.is_open,
            t1.open_date,
--- a/src/main/resources/static/route/shop/list.html
+++ b/src/main/resources/static/route/shop/list.html
@ -9,6 +9,7 @@
    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+    <link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
 </head>
 <body>
 <div class="layui-fluid layui-anim layui-anim-fadein">
@ -21,10 +22,10 @@
                            <input type="text" id="keywords" class="layui-input search-item" placeholder="输入关键字">
                        </div>
                        <div class="layui-inline">
-                            <input type="text" id="startTime" class="layui-input search-item" placeholder="开始时间" readonly>
+                            <input type="text" id="startTime" class="layui-input search-item" placeholder="注册开始时间" readonly>
                        </div>
                        <div class="layui-inline">
-                            <input type="text" id="endTime" class="layui-input search-item" placeholder="结束时间" readonly>
+                            <input type="text" id="endTime" class="layui-input search-item" placeholder="注册结束时间" readonly>
                        </div>
                        <button type="button" id="search" class="layui-btn layui-btn-sm">
                            <i class="fa fa-lg fa-search"></i> 搜索
@ -81,7 +82,12 @@
                        {field: 'shopLogo', width: 180, title: '店铺LOGO', align:'center',
                            templet: function(row) {
                                var rowData = row[this.field];
-                                return  '<div id="imgShow"><img src="route/file/download/true/'+rowData+'"></div>';
+                                var value='<div id="imgShow'+row.shopId+'"><img style="height: 30px;width: 30px;" src="route/file/download/true/'+rowData+'"></div>';
+                                setTimeout(function() {
+                                    new Viewer(document.getElementById('imgShow'+ row.shopId));
+                                }, 50);
+                                return value;
+
                            }
                        },
                        {field: 'shopName', width: 180, title: '店铺名称', align:'center',
@ -135,7 +141,6 @@
                        {field: 'isCertification', width: 180, title: '是否认证', align:'center',
                            templet: function(row) {
                                var rowData = row[this.field];
-                                console.log(rowData)
                                if(rowData == 0){
                                    return "未认证";
                                }
@ -155,6 +160,8 @@
                    'count': data.total,
                    'data': data.rows
                };
+            },done:function(){
+
            }
        });
        }
@ -220,6 +227,11 @@
        $(document).on('click', '#search', function() {
            reloadTable(1);
        });
+
+        $(document).on('click', '.imgShow', function() {
+
+        });
+
        // 事件 - 增删改
        table.on('toolbar(dataTable)', function(obj) {
            var layEvent = obj.event;