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-27 09:24:07 +08:00
parent 4b08359ddd 6c3f5e22d7
commit d685d437aa
15 changed files with 588 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java
View File

@@ -188,7 +188,7 @@ public class UShopUserServiceImpl implements UShopUserService {
@Override
public ShopUserDetailDTO getInfo(Long shopId, long userId) {
Long mainId = shopInfoService.getMainIdByShopId(shopId);
ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getMainShopId, mainId).eq(ShopUser::getUserId, userId));
ShopUser shopUser = shopUserService.getShopUserInfo(mainId, shopId);
UserInfo userInfo = userInfoService.getById(userId);
if (userInfo == null) {
throw new ApiNotPrintException("用户信息不存在");

14
cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkDistributionConfigMapper.java Normal file
View File

@@ -0,0 +1,14 @@
package com.czg.service.market.mapper;
import com.mybatisflex.core.BaseMapper;
import com.czg.market.entity.MkDistributionConfig;
/**
* 分销配置 映射层。
*
* @author ww
* @since 2025-10-25
*/
public interface MkDistributionConfigMapper extends BaseMapper<MkDistributionConfig> {
}

14
cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkDistributionLevelConfigMapper.java Normal file
View File

@@ -0,0 +1,14 @@
package com.czg.service.market.mapper;
import com.mybatisflex.core.BaseMapper;
import com.czg.market.entity.MkDistributionLevelConfig;
/**
* 分销员等级配置 映射层。
*
* @author ww
* @since 2025-10-25
*/
public interface MkDistributionLevelConfigMapper extends BaseMapper<MkDistributionLevelConfig> {
}

53
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionConfigServiceImpl.java Normal file
View File

@@ -0,0 +1,53 @@
package com.czg.service.market.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.czg.market.dto.MkDistributionConfigDTO;
import com.czg.market.entity.MkDistributionLevelConfig;
import com.czg.market.service.MkDistributionLevelConfigService;
import com.czg.market.vo.MkDistributionConfigVO;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.czg.market.entity.MkDistributionConfig;
import com.czg.market.service.MkDistributionConfigService;
import com.czg.service.market.mapper.MkDistributionConfigMapper;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
/**
* 分销配置 服务层实现。
*
* @author ww
* @since 2025-10-25
*/
@Service
public class MkDistributionConfigServiceImpl extends ServiceImpl<MkDistributionConfigMapper, MkDistributionConfig> implements MkDistributionConfigService{
@Resource
private MkDistributionLevelConfigService levelConfigService;
@Override
public MkDistributionConfigVO detail(Long mainShopId) {
MkDistributionConfig config = getOne(new QueryWrapper().eq(MkDistributionConfig::getMainShopId, mainShopId));
if (config == null) {
config = new MkDistributionConfig().setMainShopId(mainShopId);
save(config);
config = getOne(new QueryWrapper().eq(MkDistributionConfig::getMainShopId, mainShopId));
}
MkDistributionConfigVO configVO = BeanUtil.copyProperties(config, MkDistributionConfigVO.class);
configVO.setLevelConfigList(levelConfigService.list(new QueryWrapper().eq(MkDistributionLevelConfig::getDistributionConfigId, config.getId())));
return configVO;
}
@Override
public Boolean edit(Long shopId, MkDistributionConfigDTO dto) {
MkDistributionConfig config = getOne(new QueryWrapper().eq(MkDistributionConfig::getMainShopId, shopId));
BeanUtil.copyProperties(dto, config);
if (dto.getLevelConfigList() != null) {
levelConfigService.updateByShopId(dto.getLevelConfigList(), config.getMainShopId(), config.getId());
}
return updateById(config);
}
}

37
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionLevelConfigServiceImpl.java Normal file
View File

@@ -0,0 +1,37 @@
package com.czg.service.market.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.czg.market.dto.MkDistributionLevelConfigDTO;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.czg.market.entity.MkDistributionLevelConfig;
import com.czg.market.service.MkDistributionLevelConfigService;
import com.czg.service.market.mapper.MkDistributionLevelConfigMapper;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 分销员等级配置 服务层实现。
*
* @author ww
* @since 2025-10-25
*/
@Service
public class MkDistributionLevelConfigServiceImpl extends ServiceImpl<MkDistributionLevelConfigMapper, MkDistributionLevelConfig> implements MkDistributionLevelConfigService{
@Override
public void updateByShopId(List<MkDistributionLevelConfigDTO> levelConfigList, Long mainShopId, Long id) {
if (levelConfigList.isEmpty()) {
remove(new QueryWrapper().eq(MkDistributionLevelConfig::getDistributionConfigId, id));
return;
}
levelConfigList.forEach(item -> {
MkDistributionLevelConfig config = BeanUtil.copyProperties(item, MkDistributionLevelConfig.class);
config.setDistributionConfigId(id);
config.setMainShopId(mainShopId);
saveOrUpdate(config);
});
}
}

7
cash-service/market-service/src/main/resources/mapper/MkDistributionConfigMapper.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.czg.service.market.mapper.MkDistributionConfigMapper">
</mapper>

7
cash-service/market-service/src/main/resources/mapper/MkDistributionLevelConfigMapper.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.czg.service.market.mapper.MkDistributionLevelConfigMapper">
</mapper>