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 13:41:54 +08:00
parent de02f98141 f83945f8f5
commit 7762a5bc36
4 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java
View File

@@ -5,18 +5,15 @@ import cn.hutool.core.util.StrUtil;
import com.czg.annotation.SaAdminCheckPermission;
import com.czg.annotation.SaCheckMainShop;
import com.czg.market.dto.MkDistributionConfigDTO;
import com.czg.market.service.MkDistributionAmountFlowService;
import com.czg.market.service.MkDistributionConfigService;
import com.czg.market.service.MkDistributionFlowService;
import com.czg.market.service.MkDistributionUserService;
import com.czg.market.dto.MkDistributionWithdrawFlowDTO;
import com.czg.market.service.*;
import com.czg.market.vo.*;
import com.czg.order.dto.MkDistributionPayDTO;
import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
import com.czg.utils.AssertUtil;
import com.czg.validator.group.UpdateGroup;
import com.mybatisflex.core.paginate.Page;
import jakarta.annotation.Resource;
import jakarta.validation.groups.Default;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -39,6 +36,8 @@ public class DistributionController {
private MkDistributionAmountFlowService distributionAmountFlowService;
@Resource
private MkDistributionFlowService distributionFlowService;
@Resource
private MkDistributionWithdrawFlowService withdrawFlowService;
/**
* 配置信息详情
@@ -114,6 +113,19 @@ public class DistributionController {
}
/**
* 用户提现列表
* @param shopUserId 用户id
* @param key 搜索
* @param startTime 开始时间
* @param endTime 结束时间
*/
@GetMapping("/withdrawFlow")
public CzgResult<Page<MkDistributionWithdrawFlowDTO>> withdrawPageInfo(@RequestParam(required = false) Long shopUserId, @RequestParam(required = false) String key,
@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) {
return CzgResult.success(withdrawFlowService.withdrawPageInfo(StpKit.USER.getShopId(), shopUserId, StrUtil.isBlank(startTime) ? null : DateUtil.parseLocalDateTime(startTime),
StrUtil.isBlank(endTime) ? null : DateUtil.parseLocalDateTime(endTime), key));
}

4
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionWithdrawFlowService.java
View File

@@ -5,6 +5,8 @@ import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.service.IService;
import com.czg.market.entity.MkDistributionWithdrawFlow;
import java.time.LocalDateTime;
/**
* 提现记录表 服务层。
*
@@ -14,4 +16,6 @@ import com.czg.market.entity.MkDistributionWithdrawFlow;
public interface MkDistributionWithdrawFlowService extends IService<MkDistributionWithdrawFlow> {
Page<MkDistributionWithdrawFlow> pageInfo(long userId, Long shopId);
Page<MkDistributionWithdrawFlowDTO> withdrawPageInfo(Long shopId, Long shopUserId, LocalDateTime startTime, LocalDateTime endTime, String key);
}

8
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionLevelConfigServiceImpl.java
View File

@@ -25,13 +25,17 @@ public class MkDistributionLevelConfigServiceImpl extends ServiceImpl<MkDistribu
if (levelConfigList.isEmpty()) {
remove(new QueryWrapper().eq(MkDistributionLevelConfig::getDistributionConfigId, id));
return;
}else {
remove(new QueryWrapper().eq(MkDistributionLevelConfig::getDistributionConfigId, id).notIn(MkDistributionLevelConfig::getId, levelConfigList.stream().map(MkDistributionLevelConfigDTO::getId).toList()));
}
levelConfigList.forEach(item -> {
int level = 1;
for (MkDistributionLevelConfigDTO item : levelConfigList) {
MkDistributionLevelConfig config = BeanUtil.copyProperties(item, MkDistributionLevelConfig.class);
config.setDistributionConfigId(id);
config.setShopId(shopId);
config.setLevel(level++);
saveOrUpdate(config);
});
}
}
}

1
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java
View File

@@ -434,6 +434,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
// 上上级分销员
if (distributionUser.getParentId() != null) {
MkDistributionUser parent = getOne(new QueryWrapper().eq(MkDistributionUser::getId, distributionUser.getParentId()));
if (parent == null) {
return;
}