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

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg

Browse Source
This commit is contained in:
paulGao 2021-09-22 09:50:42 +08:00
commit 6fb9afd411
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java
View File

@ -8,6 +8,7 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
@ -37,6 +38,7 @@ public class Category extends BaseEntity {
private String parentId;
@NotNull(message = "层级不能为空")
@Min(value = 0,message = "层级需要大于0")
@ApiModelProperty(value = "层级, 从0开始")
private Integer level;

4
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java
View File

@ -91,8 +91,8 @@ public class MemberCouponServiceImpl extends ServiceImpl<MemberCouponMapper, Mem
QueryWrapper<MemberCoupon> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("member_id", UserContext.getCurrentUser().getId());
queryWrapper.ge("member_coupon_status", MemberCouponStatusEnum.NEW.name());
queryWrapper.ge("start_time", System.currentTimeMillis());
queryWrapper.le("end_time", System.currentTimeMillis());
queryWrapper.le("start_time", new Date());
queryWrapper.ge("end_time", new Date());
return this.list(queryWrapper);
}

2
manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java
View File

@ -89,7 +89,7 @@ public class CategoryManagerController {
}
@DeleteMapping(value = "/{id}")
@ApiImplicitParam(name = "goodsId", value = "分类ID", required = true, paramType = "path", dataType = "String")
@ApiImplicitParam(name = "id", value = "分类ID", required = true, paramType = "path", dataType = "String")
@ApiOperation(value = "通过id删除分类")
public ResultMessage<Category> delAllByIds(@NotNull @PathVariable String id) {
Category category = new Category();