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

分销更名 全民股东

Browse Source 
新增全民股东群聊配置
This commit is contained in:
wangw
2026-01-28 10:54:58 +08:00
parent ae67fb6f8e
commit 6cd6ac74ea
11 changed files with 219 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkDistributionGroupMapper.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.MkDistributionGroup;
/**
* 分销员管理群(全民股东管理) 映射层。
*
* @author ww
* @since 2026-01-28
*/
public interface MkDistributionGroupMapper extends BaseMapper<MkDistributionGroup> {
}

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

@@ -0,0 +1,18 @@
package com.czg.service.market.service.impl;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.czg.market.entity.MkDistributionGroup;
import com.czg.market.service.MkDistributionGroupService;
import com.czg.service.market.mapper.MkDistributionGroupMapper;
import org.springframework.stereotype.Service;
/**
* 分销员管理群(全民股东管理) 服务层实现。
*
* @author ww
* @since 2026-01-28
*/
@Service
public class MkDistributionGroupServiceImpl extends ServiceImpl<MkDistributionGroupMapper, MkDistributionGroup> implements MkDistributionGroupService{
}

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

@@ -61,6 +61,8 @@ import java.util.stream.Collectors;
@Service
public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUserMapper, MkDistributionUser> implements MkDistributionUserService {
@Resource
private MkDistributionGroupService mkDistributionGroupService;
@Resource
private MkDistributionConfigService mkDistributionConfigService;
@Resource
@@ -156,6 +158,9 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
}
MkDistributionUser mkDistributionUser = getMkDistributionUserByIdAndShopId(shopUser.getId(), shopId);
MkDistributionConfigVO mkDistributionConfigVO = mkDistributionConfigService.detail(shopId);
MkDistributionGroup group = mkDistributionGroupService.getById(shopId);
result.put("config", mkDistributionConfigVO);
result.put("group", group);
if (mkDistributionUser != null) {
Map<String, Object> distributionUser = new HashMap<>();
distributionUser.put("distributionId", mkDistributionUser.getId());
@@ -165,6 +170,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
distributionUser.put("totalIncome", mkDistributionUser.getTotalIncome());
distributionUser.put("pendingIncome", mkDistributionUser.getPendingIncome());
distributionUser.put("isAssignLevel", mkDistributionUser.getIsAssignLevel());
distributionUser.put("firstIn", mkDistributionUser.getFirstIn());
if (mkDistributionUser.getDistributionLevelId() != null) {
List<MkDistributionLevelConfig> levelConfigList = mkDistributionConfigVO.getLevelConfigList();
@@ -186,8 +192,6 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
distributionUser.put("levelName", "无");
}
result.put("distributionUser", distributionUser);
} else {
result.put("config", mkDistributionConfigVO);
}
return result;
}

7
cash-service/market-service/src/main/resources/mapper/MkDistributionGroupMapper.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.MkDistributionGroupMapper">
</mapper>

4
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java
View File

@@ -668,7 +668,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
@Override
public void stockWarning(Integer warnLine) {
Long shopId = StpKit.USER.getShopId(0L);
Long shopId = StpKit.USER.getShopId();
UpdateChain.of(Product.class)
.set(Product::getWarnLine, warnLine)
.eq(Product::getShopId, shopId)
@@ -678,7 +678,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
@Override
@Transactional(rollbackFor = Exception.class)
public void reportDamage(ProductReportDamageParam param) {
Long shopId = StpKit.USER.getShopId(0L);
Long shopId = StpKit.USER.getShopId();
Long createUserId = StpKit.USER.getLoginIdAsLong();
String createUserName = StpKit.USER.getAccount();
Product product = mapper.selectOneById(param.getProductId());