caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加秒杀设置

Browse Source
This commit is contained in:
lifenlong 2021-06-28 11:30:37 +08:00
parent 1cbab4a219
commit 63802a596b
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
framework/src/main/java/cn/lili/modules/member/entity/dto/EvaluationQueryParams.java
View File

@ -87,9 +87,6 @@ public class EvaluationQueryParams extends PageVO {
if (StringUtils.isNotEmpty(status)) { if (StringUtils.isNotEmpty(status)) {
queryWrapper.eq("status", 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.eq("delete_flag", false);
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc("create_time");
return queryWrapper; return queryWrapper;

5
framework/src/main/java/cn/lili/modules/store/entity/dto/StoreCompanyDTO.java
View File

@ -1,5 +1,6 @@
package cn.lili.modules.store.entity.dto; package cn.lili.modules.store.entity.dto;
import cn.lili.common.validation.Mobile;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
@ -38,6 +39,10 @@ public class StoreCompanyDTO {
@ApiModelProperty(value = "公司地址") @ApiModelProperty(value = "公司地址")
private String companyAddress; private String companyAddress;
@Mobile
@ApiModelProperty(value = "公司电话")
private String companyPhone;
@Email @Email
@ApiModelProperty(value = "电子邮箱") @ApiModelProperty(value = "电子邮箱")
private String companyEmail; private String companyEmail;

3
seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java
View File

@ -1,6 +1,8 @@
package cn.lili.controller.trade; package cn.lili.controller.trade;
import cn.lili.common.enums.ResultUtil; 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.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dto.EvaluationQueryParams; import cn.lili.modules.member.entity.dto.EvaluationQueryParams;
import cn.lili.modules.member.entity.vo.MemberEvaluationListVO; import cn.lili.modules.member.entity.vo.MemberEvaluationListVO;
@ -31,6 +33,7 @@ public class MemberEvaluationStoreController {
@ApiOperation(value = "分页获取会员评论列表") @ApiOperation(value = "分页获取会员评论列表")
@GetMapping @GetMapping
public ResultMessage<IPage<MemberEvaluationListVO>> getByPage(EvaluationQueryParams evaluationQueryParams) { public ResultMessage<IPage<MemberEvaluationListVO>> getByPage(EvaluationQueryParams evaluationQueryParams) {
evaluationQueryParams.setStoreId(UserContext.getCurrentUser().getStoreId());
return ResultUtil.data(memberEvaluationService.queryPage(evaluationQueryParams)); return ResultUtil.data(memberEvaluationService.queryPage(evaluationQueryParams));
} }

4
update-sql/version4.0to4.1.sql
View File

@ -116,4 +116,6 @@ CREATE TABLE `li_coupon_activity_item` (
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; ) 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; 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\"}' );