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

merge master

Browse Source
This commit is contained in:
lifenlong 2021-05-19 14:26:35 +08:00
commit 48f24b675b
4 changed files with 2 additions and 5 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/MemberAddDTO.java
View File

@ -15,9 +15,8 @@ import javax.validation.constraints.Size;
*/ */
@Data @Data
public class MemberAddDTO { public class MemberAddDTO {
@NotEmpty(message = "会员用户名必填") @NotEmpty(message = "会员用户名必填")
@Size(min = 6, max = 30) @Size(max = 30,message = "会员用户名最长30位")
@ApiModelProperty(value = "会员用户名") @ApiModelProperty(value = "会员用户名")
private String username; private String username;

1
framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java
View File

@ -31,5 +31,4 @@ public interface MemberPointsHistoryService extends IService<MemberPointsHistory
*/ */
IPage<MemberPointsHistory> MemberPointsHistoryList(PageVO page, String memberId, String memberName); IPage<MemberPointsHistory> MemberPointsHistoryList(PageVO page, String memberId, String memberName);
} }

1
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java
View File

@ -24,7 +24,6 @@ import org.springframework.transaction.annotation.Transactional;
@Transactional @Transactional
public class MemberPointsHistoryServiceImpl extends ServiceImpl<MemberPointsHistoryMapper, MemberPointsHistory> implements MemberPointsHistoryService { public class MemberPointsHistoryServiceImpl extends ServiceImpl<MemberPointsHistoryMapper, MemberPointsHistory> implements MemberPointsHistoryService {
@Override @Override
public MemberPointsHistoryVO getMemberPointsHistoryVO(String memberId) { public MemberPointsHistoryVO getMemberPointsHistoryVO(String memberId) {
MemberPointsHistoryVO memberPointsHistoryVO = new MemberPointsHistoryVO(); MemberPointsHistoryVO memberPointsHistoryVO = new MemberPointsHistoryVO();

2
framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java
View File

@ -114,7 +114,7 @@ public class IndexStatisticsServiceImpl implements IndexStatisticsService {
IndexNoticeVO indexNoticeVO = new IndexNoticeVO(); IndexNoticeVO indexNoticeVO = new IndexNoticeVO();
//商品审核 //商品审核
indexNoticeVO.setGoods(goodsService.goodsNum(GoodsStatusEnum.UPPER, GoodsAuthEnum.TOBEAUDITED)); indexNoticeVO.setGoods(goodsService.goodsNum(null, GoodsAuthEnum.TOBEAUDITED));
//店铺入驻审核 //店铺入驻审核
indexNoticeVO.setStore(storeService.auditNum()); indexNoticeVO.setStore(storeService.auditNum());
//售后申请 //售后申请