czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
wangw
2025-10-28 14:12:36 +08:00
parent 4c7cc285ea 727beadca3
commit 1b47bdd8f3
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserInfoServiceImpl.java
View File

@@ -13,6 +13,7 @@ import com.czg.account.entity.UserInfo;
import com.czg.account.service.UserInfoService;
import com.czg.config.RedisCst;
import com.czg.exception.ApiNotPrintException;
import com.czg.exception.CzgException;
import com.czg.service.RedisService;
import com.czg.service.account.mapper.ShopUserMapper;
import com.czg.service.account.mapper.UserInfoMapper;
@@ -98,4 +99,12 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
}
return b;
}
@Override
public void updateDistributionAmount(long userId, BigDecimal amount) {
boolean b = mapper.updateAmount(userId, amount);
if (!b) {
throw new CzgException("更新分销金额失败");
}
}
}

4
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionWithdrawFlowServiceImpl.java
View File

@@ -34,12 +34,12 @@ public class MkDistributionWithdrawFlowServiceImpl extends ServiceImpl<MkDistrib
}
@Override
public Page<MkDistributionWithdrawFlow> withdrawPageInfo(Long shopId, Long userId, LocalDateTime startTime, LocalDateTime endTime, String key) {
public Page<MkDistributionWithdrawFlow> withdrawPageInfo(Long userId, LocalDateTime startTime, LocalDateTime endTime, String key) {
QueryWrapper queryWrapper = new MyQueryWrapper()
.selectAll(MkDistributionWithdrawFlow.class)
.leftJoin(UserInfo.class).on(UserInfo::getId, MkDistributionWithdrawFlow::getUserId)
.select(UserInfo::getNickName, UserInfo::getPhone)
.eq(MkDistributionWithdrawFlow::getShopId, shopId).eq(MkDistributionWithdrawFlow::getUserId, userId)
.eq(MkDistributionWithdrawFlow::getUserId, userId)
.ge(MkDistributionWithdrawFlow::getCreateTime, startTime)
.le(MkDistributionWithdrawFlow::getCreateTime, endTime);
if (StrUtil.isNotBlank(key)){