From cfd594072d3e5cd799bf6a9f2fd9cdeb3fce6251 Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Mon, 22 Mar 2021 17:53:45 +0800 Subject: [PATCH 1/2] Merge branch 'main' of D:\CF_work\ideaWorkSpace\business-card with conflicts. --- src/main/resources/application.yml | 13 ++----------- src/main/resources/static/route/shop/list.html | 10 ++++++++-- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index a70e400..acbcb91 100644 --- 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 diff --git a/src/main/resources/static/route/shop/list.html b/src/main/resources/static/route/shop/list.html index 8cc1ad4..b29060c 100644 --- a/src/main/resources/static/route/shop/list.html +++ b/src/main/resources/static/route/shop/list.html @@ -81,7 +81,7 @@ {field: 'shopLogo', width: 180, title: '店铺LOGO', align:'center', templet: function(row) { var rowData = row[this.field]; - return '
'; + return '
'; } }, {field: 'shopName', width: 180, title: '店铺名称', align:'center', @@ -135,7 +135,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 +154,8 @@ 'count': data.total, 'data': data.rows }; + },done:function(){ + } }); } @@ -220,6 +221,11 @@ $(document).on('click', '#search', function() { reloadTable(1); }); + + $(document).on('click', '.imgShow', function() { + + }); + // 事件 - 增删改 table.on('toolbar(dataTable)', function(obj) { var layEvent = obj.event; From d8b6f4b3bbd58554560fe39362ac2316e4d79358 Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Mon, 22 Mar 2021 17:54:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BA=97=E9=93=BA=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/com/tenlion/pojo/bos/shop/ShopBO.java | 9 +++++++++ .../cn/com/tenlion/pojo/dtos/shop/ShopDTO.java | 13 +++++++++++++ .../cn/com/tenlion/pojo/pos/shop/ShopPO.java | 9 +++++++++ .../cn/com/tenlion/pojo/vos/shop/ShopVO.java | 12 ++++++++++++ .../mybatis/mapper/shop/shop-mapper.xml | 17 ++++++++++++++++- src/main/resources/static/route/shop/list.html | 12 +++++++++--- 6 files changed, 68 insertions(+), 4 deletions(-) diff --git a/src/main/java/cn/com/tenlion/pojo/bos/shop/ShopBO.java b/src/main/java/cn/com/tenlion/pojo/bos/shop/ShopBO.java index 5b207bb..e5384d4 100644 --- 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; } diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/shop/ShopDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/shop/ShopDTO.java index 6783244..583e0a4 100644 --- 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; } diff --git a/src/main/java/cn/com/tenlion/pojo/pos/shop/ShopPO.java b/src/main/java/cn/com/tenlion/pojo/pos/shop/ShopPO.java index 85e3d70..61404be 100644 --- 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; } diff --git a/src/main/java/cn/com/tenlion/pojo/vos/shop/ShopVO.java b/src/main/java/cn/com/tenlion/pojo/vos/shop/ShopVO.java index 64e2372..1fd58bc 100644 --- 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; diff --git a/src/main/resources/mybatis/mapper/shop/shop-mapper.xml b/src/main/resources/mybatis/mapper/shop/shop-mapper.xml index 0b035e8..8821d56 100644 --- a/src/main/resources/mybatis/mapper/shop/shop-mapper.xml +++ b/src/main/resources/mybatis/mapper/shop/shop-mapper.xml @@ -9,6 +9,8 @@ + + @@ -25,6 +27,7 @@ + @@ -43,6 +46,7 @@ + @@ -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 @@ shop_logo = #{shopLogo}, + + shop_template_id = #{shopTemplateId}, + user_evaluate = #{userEvaluate}, @@ -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 AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.shop_name LIKE CONCAT('%', #{keywords}, '%') ) @@ -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, diff --git a/src/main/resources/static/route/shop/list.html b/src/main/resources/static/route/shop/list.html index b29060c..6d76081 100644 --- a/src/main/resources/static/route/shop/list.html +++ b/src/main/resources/static/route/shop/list.html @@ -9,6 +9,7 @@ +
@@ -21,10 +22,10 @@
- +
- +