zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zenghuapei:a5eb88e029c07109812278007b5c7e66a4cffcf6
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product
...
compare: zenghuapei:77dd2e37a824b10d84244841ea8bc58c14cd0c4c
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product

3 Commits
a5eb88e029 ... 77dd2e37a8

Author SHA1 Message Date
tangqian 77dd2e37a8 Merge remote-tracking branch 'origin/master' 2023-06-08 11:49:59 +08:00
tangqian 81f1fb70b9 fix: 只查询已付款的订单 2023-06-08 11:48:56 +08:00
tangqian d471605d9b fix: 新增推广员注册来源 2023-06-07 14:48:47 +08:00
2 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
View File

@ -202,7 +202,7 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
Assert.notNull(loginUser, "登录失效,请重新登录!"); Assert.notNull(loginUser, "登录失效,请重新登录!");
List<RechargeOrderDO> orderDOS = rechargeOrderMapper.selectList(Wrappers.<RechargeOrderDO>lambdaQuery() List<RechargeOrderDO> orderDOS = rechargeOrderMapper.selectList(Wrappers.<RechargeOrderDO>lambdaQuery()
.eq(RechargeOrderDO::getUid, loginUser.getId()) .eq(RechargeOrderDO::getUid, loginUser.getId())
.ne(RechargeOrderDO::getPaid, 0) .ne(RechargeOrderDO::getPaid, 1)
.orderByDesc(RechargeOrderDO::getCreateTime)); .orderByDesc(RechargeOrderDO::getCreateTime));
if (!CollectionUtils.isEmpty(orderDOS)) { if (!CollectionUtils.isEmpty(orderDOS)) {
List<RechargeOrderRespVO> rechargeOrderRespVOS = RechargeOrderConvert.INSTANCE.convertList(orderDOS); List<RechargeOrderRespVO> rechargeOrderRespVOS = RechargeOrderConvert.INSTANCE.convertList(orderDOS);

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java
View File

@ -225,7 +225,7 @@ public class PromoterServiceImpl implements PromoterService {
Set<String> collect = importUsers.stream().map(PromoterImportExcelVO::getMobile).collect(Collectors.toSet()); Set<String> collect = importUsers.stream().map(PromoterImportExcelVO::getMobile).collect(Collectors.toSet());
List<String> collect2 = importUsers.stream().map(PromoterImportExcelVO::getMobile).collect(Collectors.toList()); List<String> collect2 = importUsers.stream().map(PromoterImportExcelVO::getMobile).collect(Collectors.toList());
if (collect.size() != collect2.size()) { if (collect.size() != collect2.size()) {
respVO.getFailureUsernames().put("导入文件电话号码存在重复请检查!", "电话号码" + collect); respVO.getFailureUsernames().put("导入文件电话号码存在重复请检查!", "");
return respVO; return respVO;
} }