From 63802a596b6570e95a4dcda1a630f6b0da3e8b4c Mon Sep 17 00:00:00 2001
From: lifenlong <pikachu1995@126.com>
Date: Mon, 28 Jun 2021 11:30:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=92=E6=9D=80=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/member/entity/dto/EvaluationQueryParams.java     | 3 ---
 .../cn/lili/modules/store/entity/dto/StoreCompanyDTO.java    | 5 +++++
 .../controller/trade/MemberEvaluationStoreController.java    | 3 +++
 update-sql/version4.0to4.1.sql                               | 4 +++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/EvaluationQueryParams.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/EvaluationQueryParams.java
index 0e8f093a..5ff36340 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dto/EvaluationQueryParams.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/EvaluationQueryParams.java
@@ -87,9 +87,6 @@ public class EvaluationQueryParams extends PageVO {
         if (StringUtils.isNotEmpty(status)) {
             queryWrapper.eq("status", status);
         }
-        if (UserContext.getCurrentUser().getRole().equals(UserEnums.STORE)) {
-            queryWrapper.eq("store_id", UserContext.getCurrentUser().getStoreId());
-        }
         queryWrapper.eq("delete_flag", false);
         queryWrapper.orderByDesc("create_time");
         return queryWrapper;
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreCompanyDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreCompanyDTO.java
index 90b62404..3219f465 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreCompanyDTO.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreCompanyDTO.java
@@ -1,5 +1,6 @@
 package cn.lili.modules.store.entity.dto;
 
+import cn.lili.common.validation.Mobile;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
@@ -38,6 +39,10 @@ public class StoreCompanyDTO {
     @ApiModelProperty(value = "公司地址")
     private String companyAddress;
 
+    @Mobile
+    @ApiModelProperty(value = "公司电话")
+    private String companyPhone;
+
     @Email
     @ApiModelProperty(value = "电子邮箱")
     private String companyEmail;
diff --git a/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java
index 71b77c08..79279fc3 100644
--- a/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java
@@ -1,6 +1,8 @@
 package cn.lili.controller.trade;
 
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.security.context.UserContext;
+import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.member.entity.dto.EvaluationQueryParams;
 import cn.lili.modules.member.entity.vo.MemberEvaluationListVO;
@@ -31,6 +33,7 @@ public class MemberEvaluationStoreController {
     @ApiOperation(value = "分页获取会员评论列表")
     @GetMapping
     public ResultMessage<IPage<MemberEvaluationListVO>> getByPage(EvaluationQueryParams evaluationQueryParams) {
+        evaluationQueryParams.setStoreId(UserContext.getCurrentUser().getStoreId());
         return ResultUtil.data(memberEvaluationService.queryPage(evaluationQueryParams));
     }
 
diff --git a/update-sql/version4.0to4.1.sql b/update-sql/version4.0to4.1.sql
index 3bb510a4..a9a48e72 100644
--- a/update-sql/version4.0to4.1.sql
+++ b/update-sql/version4.0to4.1.sql
@@ -116,4 +116,6 @@ CREATE TABLE `li_coupon_activity_item` (
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 /** 修改商品模板详情字段类型**/
-ALTER TABLE `li_draft_goods` MODIFY COLUMN `intro` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL;
\ No newline at end of file
+ALTER TABLE `li_draft_goods` MODIFY COLUMN `intro` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL;
+/** 添加秒杀设置**/
+INSERT INTO `li_setting` ( `id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `setting_value` ) VALUES ( 'SECKILL_SETTING', NULL, NULL, NULL, 'admin', '2021-06-04 09:58:39.384000', '{\"seckillRule\":\"秒杀规则\",\"hours\":\"9,10,11,12,13,14,15,21,22,23\"}' );
\ No newline at end of file