suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
苏竹红
2025-12-04 18:22:25 +08:00
parent 26d9dd7800 9a62d2e0c0
commit 7b8f220c26
24 changed files with 439 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleDao.java
View File

@@ -60,4 +60,21 @@ public class SysRoleDao {
return sysRoleDOS.stream().collect(Collectors.toMap(k->k.getId(), v->v.getRoleName(), (k1, k2)->k1));
}
/**
* 查询优先级最高的角色
* @param userId 用户id
* @return 角色
*/
public SysRoleDO getHighestPrioritySysRoleDoByUserId(String userId) {
return sysRoleMapper.getHighestPrioritySysRoleDoByUserId(userId);
}
/**
* 根据角色枚举查询角色
* @param roleEnum 角色枚举
* @return 角色
*/
public SysRoleDO getRoleByRoleEnum(String roleEnum) {
return sysRoleMapper.getRoleByRoleEnum(roleEnum);
}
}

31
coolstore-partner-dao/src/main/java/com/cool/store/dao/menu/MiniMenuConfigDAO.java Normal file
View File

@@ -0,0 +1,31 @@
package com.cool.store.dao.menu;
import com.cool.store.entity.menu.MiniMenuConfigDO;
import com.cool.store.mapper.menu.MiniMenuConfigMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* <p>
* 小程序菜单配置
* </p>
*
* @author wangff
* @since 2025/10/31
*/
@Repository
@RequiredArgsConstructor
public class MiniMenuConfigDAO {
private final MiniMenuConfigMapper miniMenuConfigMapper;
/**
* 根据角色id查询
* @param roleId 角色id
* @return 菜单配置列表
*/
public List<MiniMenuConfigDO> getListByRoleId(Long roleId) {
return miniMenuConfigMapper.select(MiniMenuConfigDO.builder().roleId(roleId).build());
}
}

34
coolstore-partner-dao/src/main/java/com/cool/store/dao/menu/MiniMenuDAO.java Normal file
View File

@@ -0,0 +1,34 @@
package com.cool.store.dao.menu;
import com.cool.store.entity.menu.MiniMenuDO;
import com.cool.store.mapper.menu.MiniMenuMapper;
import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Repository;
import tk.mybatis.mapper.entity.Example;
import java.util.Collections;
import java.util.List;
/**
* <p>
* 小程序菜单DAO
* </p>
*
* @author wangff
* @since 2025/11/28
*/
@Repository
@RequiredArgsConstructor
public class MiniMenuDAO {
private final MiniMenuMapper miniMenuMapper;
public List<MiniMenuDO> getByIds(List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
return Collections.emptyList();
}
Example example = new Example(MiniMenuDO.class);
example.createCriteria().andIn("id", ids);
return miniMenuMapper.selectByExample(example);
}
}

7
coolstore-partner-dao/src/main/java/com/cool/store/mapper/menu/MiniMenuConfigMapper.java Normal file
View File

@@ -0,0 +1,7 @@
package com.cool.store.mapper.menu;
import com.cool.store.entity.menu.MiniMenuConfigDO;
import tk.mybatis.mapper.common.Mapper;
public interface MiniMenuConfigMapper extends Mapper<MiniMenuConfigDO> {
}

7
coolstore-partner-dao/src/main/java/com/cool/store/mapper/menu/MiniMenuMapper.java Normal file
View File

@@ -0,0 +1,7 @@
package com.cool.store.mapper.menu;
import com.cool.store.entity.menu.MiniMenuDO;
import tk.mybatis.mapper.common.Mapper;
public interface MiniMenuMapper extends Mapper<MiniMenuDO> {
}

12
coolstore-partner-dao/src/main/resources/mapper/menu/MiniMenuConfigMapper.xml Normal file
View File

@@ -0,0 +1,12 @@
<?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.cool.store.mapper.menu.MiniMenuConfigMapper">
<resultMap id="BaseResultMap" type="com.cool.store.entity.menu.MiniMenuConfigDO">
<!--
WARNING - @mbg.generated
-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="role_id" jdbcType="BIGINT" property="roleId" />
<result column="menu_id" jdbcType="BIGINT" property="menuId" />
</resultMap>
</mapper>

12
coolstore-partner-dao/src/main/resources/mapper/menu/MiniMenuMapper.xml Normal file
View File

@@ -0,0 +1,12 @@
<?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.cool.store.mapper.menu.MiniMenuMapper">
<resultMap id="BaseResultMap" type="com.cool.store.entity.menu.MiniMenuDO">
<!--
WARNING - @mbg.generated
-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="menu_key" jdbcType="VARCHAR" property="menuKey" />
</resultMap>
</mapper>

3
coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/LaunchDataDTO.java
View File

@@ -18,4 +18,7 @@ public class LaunchDataDTO {
@ApiModelProperty("上新时间，yyyy-MM-dd")
private String upSaleDate;
@ApiModelProperty("")
private String upSaleTime;
}

3
coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java
View File

@@ -40,5 +40,8 @@ public class RevenueDataDTO {
@ApiModelProperty("菜品列表")
private List<LaunchDataDTO> otherRecipeLaunchDates;
@ApiModelProperty("下架")
private List<LaunchDataDTO> otherDownDates;
}

25
coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/SalesVolumeDayQueryDTO.java Normal file
View File

@@ -0,0 +1,25 @@
package com.cool.store.dto.recipe;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* <p>
* 门店日销量查询DTO
* </p>
*
* @author wangff
* @since 2025/12/3
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class SalesVolumeDayQueryDTO {
@ApiModelProperty("日期，yyyy-MM-dd")
private String businessDate;
@ApiModelProperty("门店编码")
private String storeCode;
}

34
coolstore-partner-model/src/main/java/com/cool/store/entity/menu/MiniMenuConfigDO.java Normal file
View File

@@ -0,0 +1,34 @@
package com.cool.store.entity.menu;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.*;
/**
* 小程序菜单配置
*/
@Table(name = "zxjp_mini_menu_config")
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class MiniMenuConfigDO {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
/**
* 角色id
*/
@Column(name = "role_id")
private Long roleId;
/**
* 菜单
*/
@Column(name = "menu_id")
private Long menuId;
}

26
coolstore-partner-model/src/main/java/com/cool/store/entity/menu/MiniMenuDO.java Normal file
View File

@@ -0,0 +1,26 @@
package com.cool.store.entity.menu;
import lombok.Data;
import javax.persistence.*;
@Table(name = "zxjp_mini_menu")
@Data
public class MiniMenuDO {
/**
* id
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
/**
* 名称
*/
private String name;
/**
* key
*/
private String menuKey;
}

25
coolstore-partner-model/src/main/java/com/cool/store/request/recipe/SalesVolumeDayRequest.java Normal file
View File

@@ -0,0 +1,25 @@
package com.cool.store.request.recipe;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* <p>
* 门店日销量Request
* </p>
*
* @author wangff
* @since 2025/12/3
*/
@Data
public class SalesVolumeDayRequest {
@ApiModelProperty("日期，yyyy-MM-dd")
@NotBlank(message = "日期不能为空")
private String businessDate;
@ApiModelProperty("门店id")
@NotBlank(message = "门店id不能为空")
private String storeId;
}

19
coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MiniMenuConfigVO.java Normal file
View File

@@ -0,0 +1,19 @@
package com.cool.store.vo.menu;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* <p>
* 小程序菜单配置VO
* </p>
*
* @author wangff
* @since 2025/10/31
*/
@Data
public class MiniMenuConfigVO {
@ApiModelProperty("菜单key")
private String menuKey;
}

3
coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/LaunchDataVO.java
View File

@@ -18,4 +18,7 @@ public class LaunchDataVO {
@ApiModelProperty("上新时间，yyyy-MM-dd")
private String upSaleDate;
@ApiModelProperty("")
private String upSaleTime;
}

3
coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java
View File

@@ -34,6 +34,9 @@ public class RevenueDataVO {
@ApiModelProperty("菜品列表")
private List<LaunchDataVO> otherRecipeLaunchDates;
@ApiModelProperty("下架")
private List<LaunchDataVO> otherDownDates;
@ApiModelProperty("外卖实收")
private BigDecimal takeoutReceivedAmt;

2
coolstore-partner-service/src/main/java/com/cool/store/config/rest/JacksonConfig.java
View File

@@ -1,5 +1,6 @@
package com.cool.store.config.rest;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -15,6 +16,7 @@ public class JacksonConfig {
@Bean
public ObjectMapper objectMapper() {
ObjectMapper mapper = new ObjectMapper();
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
return mapper;
}
}

9
coolstore-partner-service/src/main/java/com/cool/store/service/ThirdFoodService.java
View File

@@ -4,6 +4,7 @@ import com.cool.store.dto.FoodTokenDTO;
import com.cool.store.dto.recipe.RecipeSpLaunchDTO;
import com.cool.store.dto.store.StoreUserUpdateDTO;
import com.cool.store.request.recipe.RevenueDataRequest;
import com.cool.store.request.recipe.SalesVolumeDayRequest;
import com.cool.store.response.caipin.StoreUserResponse;
import com.cool.store.vo.recipe.RevenueDataVO;
@@ -45,4 +46,12 @@ public interface ThirdFoodService {
* @return 服务包菜品上新DTO
*/
RecipeSpLaunchDTO getRecipeServiceLaunch(RevenueDataRequest request);
/**
* 门店销量日视图
* @param request 请求request
* @return 营收数据VO列表
*/
List<RevenueDataVO> storeSalesVolumeDay(SalesVolumeDayRequest request);
}

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java
View File

@@ -185,8 +185,8 @@ public class SyncMainSysServerImpl implements SyncMainSysServer {
}
storeMasterDTO.setSignerInfo(signerInfo);
simpleMessageService.send(JSONObject.toJSONString(storeMasterDTO), RocketMqTagEnum.ZXJP_CREATE_STORE);
// 推送营帐通
pushStoreToYzt(shopInfo, lineInfoDO);
// TODO: 临时关闭，推送营帐通
// pushStoreToYzt(shopInfo, lineInfoDO);
} catch (Exception e) {
log.info("asdStore_error:{},shopId:{}", e.getMessage(), shopId.toString());
}

13
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdFoodServiceImpl.java
View File

@@ -7,11 +7,13 @@ import com.cool.store.dto.FoodTokenDTO;
import com.cool.store.dto.recipe.RecipeSpLaunchDTO;
import com.cool.store.dto.recipe.RevenueDataDTO;
import com.cool.store.dto.recipe.RevenueDataQueryDTO;
import com.cool.store.dto.recipe.SalesVolumeDayQueryDTO;
import com.cool.store.dto.store.StoreUserUpdateDTO;
import com.cool.store.entity.StoreDO;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.request.recipe.RevenueDataRequest;
import com.cool.store.request.recipe.SalesVolumeDayRequest;
import com.cool.store.response.caipin.StoreUserResponse;
import com.cool.store.response.oppty.OpportunityApiResponse;
import com.cool.store.service.ThirdFoodService;
@@ -91,6 +93,17 @@ public class ThirdFoodServiceImpl implements ThirdFoodService {
return executeApiCall(url, queryDTO, RecipeSpLaunchDTO.class);
}
@Override
public List<RevenueDataVO> storeSalesVolumeDay(SalesVolumeDayRequest request) {
StoreDO storeDO = storeDao.getByStoreId(request.getStoreId());
if (Objects.isNull(storeDO)) {
throw new ServiceException(ErrorCodeEnum.STORE_NOT_FIND);
}
SalesVolumeDayQueryDTO queryDTO = new SalesVolumeDayQueryDTO(request.getBusinessDate(), storeDO.getStoreNum());
String url = "/v1/store/business/day";
List<RevenueDataDTO> list = executeApiCall(url, queryDTO, List.class);
return BeanUtil.toList(list, RevenueDataVO.class, CopyOptions.create().setFieldMapping(Collections.singletonMap("storeCode", "storeNum")));
}
private <T> T executeApiCall(String url, Object requestBody, Class<T> responseType) {
// 1. 打印请求前日志

22
coolstore-partner-service/src/main/java/com/cool/store/service/menu/MiniMenuService.java Normal file
View File

@@ -0,0 +1,22 @@
package com.cool.store.service.menu;
import com.cool.store.vo.menu.MiniMenuConfigVO;
import java.util.List;
/**
* <p>
* 小程序菜单配置
* </p>
*
* @author wangff
* @since 2025/10/31
*/
public interface MiniMenuService {
/**
* 获取用户小程序菜单配置
* @return 小程序菜单配置
*/
List<MiniMenuConfigVO> getUserMiniMenu();
}

88
coolstore-partner-service/src/main/java/com/cool/store/service/menu/impl/MiniMenuServiceImpl.java Normal file
View File

@@ -0,0 +1,88 @@
package com.cool.store.service.menu.impl;
import cn.hutool.core.collection.CollStreamUtil;
import com.cool.store.context.PartnerUserHolder;
import com.cool.store.dao.EnterpriseUserDAO;
import com.cool.store.dao.SysRoleDao;
import com.cool.store.dao.menu.MiniMenuConfigDAO;
import com.cool.store.dao.menu.MiniMenuDAO;
import com.cool.store.entity.EnterpriseUserDO;
import com.cool.store.entity.SysRoleDO;
import com.cool.store.entity.menu.MiniMenuConfigDO;
import com.cool.store.entity.menu.MiniMenuDO;
import com.cool.store.enums.AIEnum;
import com.cool.store.enums.Role;
import com.cool.store.service.menu.MiniMenuService;
import com.cool.store.utils.BeanUtil;
import com.cool.store.vo.PartnerUserInfoVO;
import com.cool.store.vo.menu.MiniMenuConfigVO;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
/**
* <p>
* 小程序菜单配置 服务实现类
* </p>
*
* @author wangff
* @since 2025/10/31
*/
@Service
@RequiredArgsConstructor
public class MiniMenuServiceImpl implements MiniMenuService {
private final MiniMenuConfigDAO miniMenuConfigDAO;
private final SysRoleDao sysRoleDao;
private final EnterpriseUserDAO enterpriseUserDAO;
private final MiniMenuDAO miniMenuDAO;
@Override
public List<MiniMenuConfigVO> getUserMiniMenu() {
PartnerUserInfoVO user = PartnerUserHolder.getUser();
if (StringUtils.isBlank(user.getMobile())) {
return Collections.emptyList();
}
SysRoleDO highestRole = getHighestRoleByMobile(user.getMobile());
if (Objects.isNull(highestRole)) {
return Collections.emptyList();
}
List<MiniMenuConfigDO> list = miniMenuConfigDAO.getListByRoleId(highestRole.getId());
List<Long> menuIds = CollStreamUtil.toList(list, MiniMenuConfigDO::getMenuId);
List<MiniMenuDO> menuList = miniMenuDAO.getByIds(menuIds);
return BeanUtil.toList(menuList, MiniMenuConfigVO.class);
}
/**
* 根据手机号查询用户优先级最高的角色
* @param mobile 手机号
* @return 角色信息
*/
private SysRoleDO getHighestRoleByMobile(String mobile) {
if (StringUtils.isBlank(mobile)) {
return null;
}
EnterpriseUserDO userDO = enterpriseUserDAO.selectByMobile(mobile);
if (Objects.isNull(userDO)) {
return null;
}
return getHighestRole(userDO.getUserId());
}
/**
* 查询当前用户优先级最高的角色
* @param userId 用户id
* @return 角色信息
*/
private SysRoleDO getHighestRole(String userId) {
if(AIEnum.AI_USERID.getCode().equals(userId)){
return sysRoleDao.getRoleByRoleEnum(Role.MASTER.getRoleEnum());
}
return sysRoleDao.getHighestPrioritySysRoleDoByUserId(userId);
}
}

7
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDataBoardController.java
View File

@@ -2,6 +2,7 @@ package com.cool.store.controller.webc;
import com.cool.store.dto.recipe.RecipeSpLaunchDTO;
import com.cool.store.request.recipe.RevenueDataRequest;
import com.cool.store.request.recipe.SalesVolumeDayRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.ThirdFoodService;
import com.cool.store.vo.recipe.RevenueDataVO;
@@ -44,4 +45,10 @@ public class MiniDataBoardController {
public ResponseResult<RecipeSpLaunchDTO> getRecipeSpLaunchData(@RequestBody @Valid RevenueDataRequest request) {
return ResponseResult.success(thirdFoodService.getRecipeServiceLaunch(request));
}
@ApiOperation("门店日销量")
@PostMapping("/storeSalesVolumeDay")
public ResponseResult<List<RevenueDataVO>> getStoreSalesVolumeDay(@RequestBody @Valid SalesVolumeDayRequest request) {
return ResponseResult.success(thirdFoodService.storeSalesVolumeDay(request));
}
}

35
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniMenuController.java Normal file
View File

@@ -0,0 +1,35 @@
package com.cool.store.controller.webc;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.menu.MiniMenuService;
import com.cool.store.vo.menu.MiniMenuConfigVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* <p>
* 小程序菜单配置 前端控制器
* </p>
*
* @author wangff
* @since 2025/10/31
*/
@RestController
@RequestMapping({"/mini/menu"})
@Api(tags = "Mini菜单配置")
@RequiredArgsConstructor
public class MiniMenuController {
private final MiniMenuService miniMenuService;
@ApiOperation("当前用户菜单配置")
@GetMapping("/userConfig")
public ResponseResult<List<MiniMenuConfigVO>> getCurrentUserConfig() {
return ResponseResult.success(miniMenuService.getUserMiniMenu());
}
}