irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

代码优化

Browse Source
This commit is contained in:
admin
2024-08-22 20:48:51 +08:00
parent 3dcaaa66b4
commit fc59148185
103 changed files with 180 additions and 1523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkLevelInfoService.java
View File

@@ -3,7 +3,7 @@ package com.starry.admin.modules.clerk.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity;
import com.starry.admin.modules.platform.entity.SysTenantEntity;
import com.starry.admin.modules.system.entity.SysTenantEntity;
import java.util.List;

2
play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkClassificationInfoServiceImpl.java
View File

@@ -1,6 +1,5 @@
package com.starry.admin.modules.clerk.service.impl;
import com.starry.common.utils.IdUtils;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.starry.admin.modules.clerk.mapper.PlayClerkClassificationInfoMapper;
import com.starry.admin.modules.clerk.module.entity.PlayClerkClassificationInfoEntity;
import com.starry.admin.modules.clerk.service.IPlayClerkClassificationInfoService;
import com.starry.common.utils.IdUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;

2
play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkLevelInfoServiceImpl.java
View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.starry.admin.modules.clerk.mapper.PlayClerkLevelInfoMapper;
import com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity;
import com.starry.admin.modules.clerk.service.IPlayClerkLevelInfoService;
import com.starry.admin.modules.platform.entity.SysTenantEntity;
import com.starry.admin.modules.system.entity.SysTenantEntity;
import com.starry.common.utils.IdUtils;
import org.springframework.stereotype.Service;

6
play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java
View File

@@ -10,7 +10,6 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.starry.admin.common.component.JwtToken;
import com.starry.admin.common.domain.LoginUser;
import com.starry.admin.common.exception.CustomException;
import com.starry.admin.modules.balance.service.IPlayBalanceDetailsInfoService;
import com.starry.admin.modules.clerk.mapper.PlayClerkUserInfoMapper;
import com.starry.admin.modules.clerk.module.entity.*;
import com.starry.admin.modules.clerk.module.vo.PlayClerkCommodityQueryVo;
@@ -18,13 +17,14 @@ import com.starry.admin.modules.clerk.module.vo.PlayClerkUnsettledWagesInfoQuery
import com.starry.admin.modules.clerk.module.vo.PlayClerkUnsettledWagesInfoReturnVo;
import com.starry.admin.modules.clerk.service.IPlayClerkCommodityService;
import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
import com.starry.admin.modules.follow.module.entity.PlayCustomFollowInfoEntity;
import com.starry.admin.modules.follow.service.IPlayCustomFollowInfoService;
import com.starry.admin.modules.custom.entity.PlayCustomFollowInfoEntity;
import com.starry.admin.modules.custom.service.IPlayCustomFollowInfoService;
import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
import com.starry.admin.modules.order.service.IPlayOrderInfoService;
import com.starry.admin.modules.personnel.module.entity.PlayPersonnelAdminInfoEntity;
import com.starry.admin.modules.personnel.module.entity.PlayPersonnelGroupInfoEntity;
import com.starry.admin.modules.personnel.module.entity.PlayPersonnelWaiterInfoEntity;
import com.starry.admin.modules.personnel.service.IPlayBalanceDetailsInfoService;
import com.starry.admin.modules.personnel.service.IPlayPersonnelAdminInfoService;
import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService;
import com.starry.admin.modules.personnel.service.IPlayPersonnelWaiterInfoService;

1
play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserReviewInfoServiceImpl.java
View File

@@ -16,7 +16,6 @@ import com.starry.admin.modules.clerk.module.vo.PlayClerkUserReviewStateEditVo;
import com.starry.admin.modules.clerk.service.IPlayClerkCommodityService;
import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
import com.starry.admin.modules.clerk.service.IPlayClerkUserReviewInfoService;
import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService;
import com.starry.admin.modules.weichat.service.WxCustomMpService;
import com.starry.common.utils.IdUtils;
import org.springframework.beans.BeanUtils;

79
play-admin/src/main/java/com/starry/admin/modules/commodity/controller/PlayServiceInfoController.java
View File

@@ -1,79 +0,0 @@
package com.starry.admin.modules.commodity.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.starry.admin.modules.commodity.module.entity.PlayServiceInfoEntity;
import com.starry.admin.modules.commodity.service.IPlayServiceInfoService;
import com.starry.common.annotation.Log;
import com.starry.common.enums.BusinessType;
import com.starry.common.result.R;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* 服务项目列表Controller
*
* @author admin
* @since 2024-03-28
*/
@RestController
@RequestMapping("/commodity/info")
public class PlayServiceInfoController {
@Resource
private IPlayServiceInfoService playServiceInfoService;
/**
* 查询服务项目列表列表
*/
@GetMapping("/list")
public R list(PlayServiceInfoEntity playServiceInfo) {
IPage<PlayServiceInfoEntity> list = playServiceInfoService.selectPlayServiceInfoByPage(playServiceInfo);
return R.ok(list);
}
/**
* 获取服务项目列表详细信息
*/
@GetMapping(value = "/{id}")
public R getInfo(@PathVariable("id") String id) {
return R.ok(playServiceInfoService.selectPlayServiceInfoById(id));
}
/**
* 新增服务项目列表
*/
@Log(title = "服务项目列表", businessType = BusinessType.INSERT)
@PostMapping("/create")
public R create(@RequestBody PlayServiceInfoEntity playServiceInfo) {
boolean success = playServiceInfoService.create(playServiceInfo);
if (success) {
return R.ok();
}
return R.error("添加失败");
}
/**
* 修改服务项目列表
*/
@Log(title = "服务项目列表", businessType = BusinessType.UPDATE)
@PostMapping(value = "/update/{id}")
public R update(@PathVariable String id, @RequestBody PlayServiceInfoEntity playServiceInfo) {
playServiceInfo.setId(id);
boolean success = playServiceInfoService.update(playServiceInfo);
if (success) {
return R.ok();
}
return R.error("修改失败");
}
/**
* 删除服务项目列表
*/
@Log(title = "服务项目列表", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R remove(@PathVariable String[] ids) {
return R.ok(playServiceInfoService.deletePlayServiceInfoByIds(ids));
}
}

17
play-admin/src/main/java/com/starry/admin/modules/commodity/mapper/PlayClerkServiceMapper.java
View File

@@ -1,17 +0,0 @@
package com.starry.admin.modules.commodity.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.starry.admin.modules.commodity.module.entity.PlayClerkServiceEntity;
/**
* 陪聊引用服务项目Mapper接口
*
* @author admin
* @since 2024-03-28
*/
public interface PlayClerkServiceMapper extends BaseMapper<PlayClerkServiceEntity> {
}

17
play-admin/src/main/java/com/starry/admin/modules/commodity/mapper/PlayServiceInfoMapper.java
View File

@@ -1,17 +0,0 @@
package com.starry.admin.modules.commodity.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.starry.admin.modules.commodity.module.entity.PlayServiceInfoEntity;
/**
* 服务项目列表Mapper接口
*
* @author admin
* @since 2024-03-28
*/
public interface PlayServiceInfoMapper extends BaseMapper<PlayServiceInfoEntity> {
}

51
play-admin/src/main/java/com/starry/admin/modules/commodity/module/entity/PlayClerkServiceEntity.java
View File

@@ -1,51 +0,0 @@
package com.starry.admin.modules.commodity.module.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.starry.common.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 陪聊引用服务项目对象 play_clerk_service
*
* @author admin
* @since 2024-03-28
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("play_clerk_service")
public class PlayClerkServiceEntity extends BaseEntity<PlayClerkServiceEntity> {
/**
* UUID
*/
private String id;
/**
* 租户ID
*/
private String tenantId;
/**
* 店员用户ID
*/
private String playUserId;
/**
* 服务项目ID
*/
private String serviceId;
/**
* 项目启用状态
* 1:启用
* 0:停用
*
* @since 2024/3/28 11:20
**/
private String enablingState;
}

46
play-admin/src/main/java/com/starry/admin/modules/commodity/module/entity/PlayServiceInfoEntity.java
View File

@@ -1,46 +0,0 @@
package com.starry.admin.modules.commodity.module.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.starry.common.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 服务项目信息对象 play_service_info
*
* @author admin
* @since 2024-03-28
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("play_service_info")
public class PlayServiceInfoEntity extends BaseEntity<PlayServiceInfoEntity> {
/**
* UUID
*/
private String id;
/**
* 租户ID
*/
private String tenantId;
/**
* 项目名称
*/
private String itemName;
/**
* 服务时长（文字描述信息,不参与订单计算）
*/
private String serviceDuration;
/**
* 服务单价
*/
private String price;
}

84
play-admin/src/main/java/com/starry/admin/modules/commodity/service/IPlayClerkServiceService.java
View File

@@ -1,84 +0,0 @@
package com.starry.admin.modules.commodity.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.starry.admin.modules.commodity.module.entity.PlayClerkServiceEntity;
/**
* 陪聊引用服务项目Service接口
*
* @author admin
* @since 2024-03-28
*/
public interface IPlayClerkServiceService extends IService<PlayClerkServiceEntity> {
/**
* 初始化陪聊的服务项目
*
* @param playUserId 陪聊用户ID
* @author admin
* @since 2024/3/28 11:13
**/
void initPlayService(String playUserId);
/**
* 查询陪聊引用服务项目
*
* @param id 陪聊引用服务项目主键
* @return 陪聊引用服务项目
*/
PlayClerkServiceEntity selectPlayClerkServiceById(String id);
/**
* 查询陪聊引用服务项目列表
*
* @param playClerkService 陪聊引用服务项目
* @return 陪聊引用服务项目集合
*/
IPage<PlayClerkServiceEntity> selectPlayClerkServiceByPage(PlayClerkServiceEntity playClerkService);
/**
* 新增陪聊引用服务项目
*
* @param playClerkService 陪聊引用服务项目
* @return 结果
*/
boolean create(PlayClerkServiceEntity playClerkService);
/**
* 修改陪聊服务启停状态
*
* @param playUserId 陪聊用户ID
* @param serviceId 服务ID
* @param enablingState * 项目启用状态【0:停用，1：启用】
* @author admin
* @since 2024/3/28 11:35
**/
void updateServiceEnablingState(String playUserId, String serviceId, String enablingState);
/**
* 修改陪聊引用服务项目
*
* @param playClerkService 陪聊引用服务项目
* @return 结果
*/
boolean update(PlayClerkServiceEntity playClerkService);
/**
* 批量删除陪聊引用服务项目
*
* @param ids 需要删除的陪聊引用服务项目主键集合
* @return 结果
*/
int deletePlayClerkServiceByIds(String[] ids);
/**
* 删除陪聊引用服务项目信息
*
* @param id 陪聊引用服务项目主键
* @return 结果
*/
int deletePlayClerkServiceById(String id);
}

74
play-admin/src/main/java/com/starry/admin/modules/commodity/service/IPlayServiceInfoService.java
View File

@@ -1,74 +0,0 @@
package com.starry.admin.modules.commodity.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.starry.admin.modules.commodity.module.entity.PlayServiceInfoEntity;
import java.util.List;
/**
* 服务项目列表Service接口
*
* @author admin
* @since 2024-03-28
*/
public interface IPlayServiceInfoService extends IService<PlayServiceInfoEntity> {
/**
* 查询服务项目列表
*
* @param id 服务项目列表主键
* @return 服务项目列表
*/
PlayServiceInfoEntity selectPlayServiceInfoById(String id);
/**
* 查询所有的服务项目
*
* @return List<PlayServiceInfoEntity>
* @author admin
* @since 2024/3/28 11:18
**/
List<PlayServiceInfoEntity> selectPlayServiceInfoAll();
/**
* 查询服务项目列表列表
*
* @param playServiceInfo 服务项目列表
* @return 服务项目列表集合
*/
IPage<PlayServiceInfoEntity> selectPlayServiceInfoByPage(PlayServiceInfoEntity playServiceInfo);
/**
* 新增服务项目列表
*
* @param playServiceInfo 服务项目列表
* @return 结果
*/
boolean create(PlayServiceInfoEntity playServiceInfo);
/**
* 修改服务项目列表
*
* @param playServiceInfo 服务项目列表
* @return 结果
*/
boolean update(PlayServiceInfoEntity playServiceInfo);
/**
* 批量删除服务项目列表
*
* @param ids 需要删除的服务项目列表主键集合
* @return 结果
*/
int deletePlayServiceInfoByIds(String[] ids);
/**
* 删除服务项目列表信息
*
* @param id 服务项目列表主键
* @return 结果
*/
int deletePlayServiceInfoById(String id);
}

134
play-admin/src/main/java/com/starry/admin/modules/commodity/service/impl/PlayClerkServiceServiceImpl.java
View File

@@ -1,134 +0,0 @@
package com.starry.admin.modules.commodity.service.impl;
import com.starry.common.utils.IdUtils;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.starry.admin.common.exception.CustomException;
import com.starry.admin.modules.commodity.mapper.PlayClerkServiceMapper;
import com.starry.admin.modules.commodity.module.entity.PlayClerkServiceEntity;
import com.starry.admin.modules.commodity.module.entity.PlayServiceInfoEntity;
import com.starry.admin.modules.commodity.service.IPlayClerkServiceService;
import com.starry.admin.modules.commodity.service.IPlayServiceInfoService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
/**
* 陪聊引用服务项目Service业务层处理
*
* @author admin
* @since 2024-03-28
*/
@Service
public class PlayClerkServiceServiceImpl extends ServiceImpl<PlayClerkServiceMapper, PlayClerkServiceEntity> implements IPlayClerkServiceService {
@Resource
private PlayClerkServiceMapper playClerkServiceMapper;
@Resource
private IPlayServiceInfoService playServiceInfoService;
@Override
public void initPlayService(String playUserId) {
for (PlayServiceInfoEntity playServiceInfoEntity : playServiceInfoService.selectPlayServiceInfoAll()) {
PlayClerkServiceEntity entity = new PlayClerkServiceEntity();
entity.setServiceId(playServiceInfoEntity.getId());
entity.setTenantId(playServiceInfoEntity.getTenantId());
entity.setPlayUserId(playUserId);
entity.setEnablingState("0");
this.create(entity);
}
}
/**
* 查询陪聊引用服务项目
*
* @param id 陪聊引用服务项目主键
* @return 陪聊引用服务项目
*/
@Override
public PlayClerkServiceEntity selectPlayClerkServiceById(String id) {
return this.baseMapper.selectById(id);
}
/**
* 查询陪聊引用服务项目列表
*
* @param playClerkService 陪聊引用服务项目
* @return 陪聊引用服务项目
*/
@Override
public IPage<PlayClerkServiceEntity> selectPlayClerkServiceByPage(PlayClerkServiceEntity playClerkService) {
Page<PlayClerkServiceEntity> page = new Page<>(1, 10);
return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>());
}
/**
* 新增陪聊引用服务项目
*
* @param playClerkService 陪聊引用服务项目
* @return 结果
*/
@Override
public boolean create(PlayClerkServiceEntity playClerkService) {
if (StrUtil.isBlankIfStr(playClerkService.getId())) {
playClerkService.setId(IdUtils.getUuid());
}
return save(playClerkService);
}
@Override
public void updateServiceEnablingState(String playUserId, String serviceId, String enablingState) {
LambdaQueryWrapper<PlayClerkServiceEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(PlayClerkServiceEntity::getServiceId, serviceId);
lambdaQueryWrapper.eq(PlayClerkServiceEntity::getPlayUserId, playUserId);
List<PlayClerkServiceEntity> list = this.baseMapper.selectList(lambdaQueryWrapper);
if (list.size() != 1) {
throw new CustomException("服务不存在，请查证");
}
// 更新服务状态
PlayClerkServiceEntity item = list.get(0);
item.setEnablingState(enablingState);
this.update(item);
}
/**
* 修改陪聊引用服务项目
*
* @param playClerkService 陪聊引用服务项目
* @return 结果
*/
@Override
public boolean update(PlayClerkServiceEntity playClerkService) {
return updateById(playClerkService);
}
/**
* 批量删除陪聊引用服务项目
*
* @param ids 需要删除的陪聊引用服务项目主键
* @return 结果
*/
@Override
public int deletePlayClerkServiceByIds(String[] ids) {
return playClerkServiceMapper.deleteBatchIds(Arrays.asList(ids));
}
/**
* 删除陪聊引用服务项目信息
*
* @param id 陪聊引用服务项目主键
* @return 结果
*/
@Override
public int deletePlayClerkServiceById(String id) {
return playClerkServiceMapper.deleteById(id);
}
}

105
play-admin/src/main/java/com/starry/admin/modules/commodity/service/impl/PlayServiceInfoServiceImpl.java
View File

@@ -1,105 +0,0 @@
package com.starry.admin.modules.commodity.service.impl;
import com.starry.common.utils.IdUtils;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.starry.admin.modules.commodity.mapper.PlayServiceInfoMapper;
import com.starry.admin.modules.commodity.module.entity.PlayServiceInfoEntity;
import com.starry.admin.modules.commodity.service.IPlayServiceInfoService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
/**
* 服务项目列表Service业务层处理
*
* @author admin
* @since 2024-03-28
*/
@Service
public class PlayServiceInfoServiceImpl extends ServiceImpl<PlayServiceInfoMapper, PlayServiceInfoEntity> implements IPlayServiceInfoService {
@Resource
private PlayServiceInfoMapper playServiceInfoMapper;
/**
* 查询服务项目列表
*
* @param id 服务项目列表主键
* @return 服务项目列表
*/
@Override
public PlayServiceInfoEntity selectPlayServiceInfoById(String id) {
return this.baseMapper.selectById(id);
}
@Override
public List<PlayServiceInfoEntity> selectPlayServiceInfoAll() {
return this.baseMapper.selectList(new LambdaQueryWrapper<>());
}
/**
* 查询服务项目列表列表
*
* @param playServiceInfo 服务项目列表
* @return 服务项目列表
*/
@Override
public IPage<PlayServiceInfoEntity> selectPlayServiceInfoByPage(PlayServiceInfoEntity playServiceInfo) {
Page<PlayServiceInfoEntity> page = new Page<>(1, 10);
return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>());
}
/**
* 新增服务项目列表
*
* @param playServiceInfo 服务项目列表
* @return 结果
*/
@Override
public boolean create(PlayServiceInfoEntity playServiceInfo) {
if (StrUtil.isBlankIfStr(playServiceInfo.getId())) {
playServiceInfo.setId(IdUtils.getUuid());
}
return save(playServiceInfo);
}
/**
* 修改服务项目列表
*
* @param playServiceInfo 服务项目列表
* @return 结果
*/
@Override
public boolean update(PlayServiceInfoEntity playServiceInfo) {
return updateById(playServiceInfo);
}
/**
* 批量删除服务项目列表
*
* @param ids 需要删除的服务项目列表主键
* @return 结果
*/
@Override
public int deletePlayServiceInfoByIds(String[] ids) {
return playServiceInfoMapper.deleteBatchIds(Arrays.asList(ids));
}
/**
* 删除服务项目列表信息
*
* @param id 服务项目列表主键
* @return 结果
*/
@Override
public int deletePlayServiceInfoById(String id) {
return playServiceInfoMapper.deleteById(id);
}
}

6
play-admin/src/main/java/com/starry/admin/modules/follow/controller/PlayCustomFollowInfoController.java → play-admin/src/main/java/com/starry/admin/modules/custom/controller/PlayCustomFollowInfoController.java
View File

@@ -1,8 +1,8 @@
package com.starry.admin.modules.follow.controller;
package com.starry.admin.modules.custom.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.starry.admin.modules.follow.module.entity.PlayCustomFollowInfoEntity;
import com.starry.admin.modules.follow.service.IPlayCustomFollowInfoService;
import com.starry.admin.modules.custom.entity.PlayCustomFollowInfoEntity;
import com.starry.admin.modules.custom.service.IPlayCustomFollowInfoService;
import com.starry.common.annotation.Log;
import com.starry.common.enums.BusinessType;
import com.starry.common.result.R;

2
play-admin/src/main/java/com/starry/admin/modules/follow/module/entity/PlayCustomFollowInfoEntity.java → play-admin/src/main/java/com/starry/admin/modules/custom/entity/PlayCustomFollowInfoEntity.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.follow.module.entity;
package com.starry.admin.modules.custom.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.starry.common.domain.BaseEntity;

4
play-admin/src/main/java/com/starry/admin/modules/follow/mapper/PlayCustomFollowInfoMapper.java → play-admin/src/main/java/com/starry/admin/modules/custom/mapper/PlayCustomFollowInfoMapper.java
View File

@@ -1,8 +1,8 @@
package com.starry.admin.modules.follow.mapper;
package com.starry.admin.modules.custom.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.starry.admin.modules.follow.module.entity.PlayCustomFollowInfoEntity;
import com.starry.admin.modules.custom.entity.PlayCustomFollowInfoEntity;
/**
* 顾客关注陪聊信息Mapper接口

4
play-admin/src/main/java/com/starry/admin/modules/follow/service/IPlayCustomFollowInfoService.java → play-admin/src/main/java/com/starry/admin/modules/custom/service/IPlayCustomFollowInfoService.java
View File

@@ -1,8 +1,8 @@
package com.starry.admin.modules.follow.service;
package com.starry.admin.modules.custom.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.starry.admin.modules.follow.module.entity.PlayCustomFollowInfoEntity;
import com.starry.admin.modules.custom.entity.PlayCustomFollowInfoEntity;
import com.starry.admin.modules.weichat.entity.PlayClerkFollowQueryVo;
import com.starry.admin.modules.weichat.entity.PlayClerkFollowReturnVo;

2
play-admin/src/main/java/com/starry/admin/modules/custom/service/IPlayCustomLevelInfoService.java
View File

@@ -2,7 +2,7 @@ package com.starry.admin.modules.custom.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.starry.admin.modules.custom.module.entity.PlayCustomLevelInfoEntity;
import com.starry.admin.modules.platform.entity.SysTenantEntity;
import com.starry.admin.modules.system.entity.SysTenantEntity;
import java.util.List;

10
play-admin/src/main/java/com/starry/admin/modules/follow/service/impl/PlayCustomFollowInfoServiceImpl.java → play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomFollowInfoServiceImpl.java
View File

@@ -1,6 +1,5 @@
package com.starry.admin.modules.follow.service.impl;
package com.starry.admin.modules.custom.service.impl;
import com.starry.common.utils.IdUtils;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,11 +7,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
import com.starry.admin.modules.follow.mapper.PlayCustomFollowInfoMapper;
import com.starry.admin.modules.follow.module.entity.PlayCustomFollowInfoEntity;
import com.starry.admin.modules.follow.service.IPlayCustomFollowInfoService;
import com.starry.admin.modules.custom.entity.PlayCustomFollowInfoEntity;
import com.starry.admin.modules.custom.mapper.PlayCustomFollowInfoMapper;
import com.starry.admin.modules.custom.service.IPlayCustomFollowInfoService;
import com.starry.admin.modules.weichat.entity.PlayClerkFollowQueryVo;
import com.starry.admin.modules.weichat.entity.PlayClerkFollowReturnVo;
import com.starry.common.utils.IdUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;

2
play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomLeaveMsgServiceImpl.java
View File

@@ -1,6 +1,5 @@
package com.starry.admin.modules.custom.service.impl;
import com.starry.common.utils.IdUtils;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,6 +14,7 @@ import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity;
import com.starry.admin.modules.custom.module.vo.PlayCustomLeaveMsgQueryVo;
import com.starry.admin.modules.custom.module.vo.PlayCustomLeaveMsgReturnVo;
import com.starry.admin.modules.custom.service.IPlayCustomLeaveMsgService;
import com.starry.common.utils.IdUtils;
import com.starry.common.utils.StringUtils;
import org.springframework.stereotype.Service;

2
play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomLevelInfoServiceImpl.java
View File

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.starry.admin.modules.custom.mapper.PlayCustomLevelInfoMapper;
import com.starry.admin.modules.custom.module.entity.PlayCustomLevelInfoEntity;
import com.starry.admin.modules.custom.service.IPlayCustomLevelInfoService;
import com.starry.admin.modules.platform.entity.SysTenantEntity;
import com.starry.admin.modules.system.entity.SysTenantEntity;
import com.starry.common.utils.IdUtils;
import org.springframework.stereotype.Service;

2
play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomUserInfoServiceImpl.java
View File

@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.starry.admin.common.exception.CustomException;
import com.starry.admin.modules.balance.service.IPlayBalanceDetailsInfoService;
import com.starry.admin.modules.custom.mapper.PlayCustomUserInfoMapper;
import com.starry.admin.modules.custom.module.entity.PlayCustomLevelInfoEntity;
import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity;
@@ -20,6 +19,7 @@ import com.starry.admin.modules.custom.module.vo.PlayCustomUserReturnVo;
import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService;
import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
import com.starry.admin.modules.order.service.impl.PlayOrderInfoServiceImpl;
import com.starry.admin.modules.personnel.service.IPlayBalanceDetailsInfoService;
import com.starry.common.utils.IdUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

1
play-admin/src/main/java/com/starry/admin/modules/order/mapper/PlayOrderRandomInfoMapper.java
View File

@@ -1,7 +1,6 @@
package com.starry.admin.modules.order.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.starry.admin.modules.order.module.entity.PlayOrderRandomInfoEntity;

1
play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderEvaluateInfoService.java
View File

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.starry.admin.modules.order.module.entity.PlayOrderEvaluateInfoEntity;
import com.starry.admin.modules.order.module.vo.PlayOrderEvaluateQueryVo;
import com.starry.admin.modules.order.module.vo.PlayOrderEvaluateReturnVo;
import com.starry.admin.modules.weichat.entity.evaluate.PlayCustomOrderEvaluateReturnVo;
import java.util.List;

2
play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderRefundInfoServiceImpl.java
View File

@@ -1,6 +1,5 @@
package com.starry.admin.modules.order.service.impl;
import com.starry.common.utils.IdUtils;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -12,6 +11,7 @@ import com.starry.admin.modules.order.module.entity.PlayOrderRefundInfoEntity;
import com.starry.admin.modules.order.module.vo.PlayOrderRefundQueryVo;
import com.starry.admin.modules.order.module.vo.PlayOrderRefundReturnVo;
import com.starry.admin.modules.order.service.IPlayOrderRefundInfoService;
import com.starry.common.utils.IdUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;

8
play-admin/src/main/java/com/starry/admin/modules/balance/controller/PlayBalanceDetailsInfoController.java → play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayBalanceDetailsInfoController.java
View File

@@ -1,8 +1,8 @@
package com.starry.admin.modules.balance.controller;
package com.starry.admin.modules.personnel.controller;
import com.starry.admin.modules.balance.module.entity.PlayBalanceDetailsInfoEntity;
import com.starry.admin.modules.balance.module.vo.PlayBalanceDetailsQueryVo;
import com.starry.admin.modules.balance.service.IPlayBalanceDetailsInfoService;
import com.starry.admin.modules.personnel.module.entity.PlayBalanceDetailsInfoEntity;
import com.starry.admin.modules.personnel.module.vo.PlayBalanceDetailsQueryVo;
import com.starry.admin.modules.personnel.service.IPlayBalanceDetailsInfoService;
import com.starry.common.annotation.Log;
import com.starry.common.enums.BusinessType;
import com.starry.common.result.R;

4
play-admin/src/main/java/com/starry/admin/modules/balance/mapper/PlayBalanceDetailsInfoMapper.java → play-admin/src/main/java/com/starry/admin/modules/personnel/mapper/PlayBalanceDetailsInfoMapper.java
View File

@@ -1,8 +1,8 @@
package com.starry.admin.modules.balance.mapper;
package com.starry.admin.modules.personnel.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.starry.admin.modules.balance.module.entity.PlayBalanceDetailsInfoEntity;
import com.starry.admin.modules.personnel.module.entity.PlayBalanceDetailsInfoEntity;
/**
* 余额明细Mapper接口

2
play-admin/src/main/java/com/starry/admin/modules/balance/module/entity/PlayBalanceDetailsInfoEntity.java → play-admin/src/main/java/com/starry/admin/modules/personnel/module/entity/PlayBalanceDetailsInfoEntity.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.balance.module.entity;
package com.starry.admin.modules.personnel.module.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;

2
play-admin/src/main/java/com/starry/admin/modules/balance/module/vo/PlayBalanceDetailsQueryVo.java → play-admin/src/main/java/com/starry/admin/modules/personnel/module/vo/PlayBalanceDetailsQueryVo.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.balance.module.vo;
package com.starry.admin.modules.personnel.module.vo;
import com.starry.common.domain.BasePageEntity;
import lombok.Data;

2
play-admin/src/main/java/com/starry/admin/modules/balance/module/vo/PlayBalanceDetailsReturnVo.java → play-admin/src/main/java/com/starry/admin/modules/personnel/module/vo/PlayBalanceDetailsReturnVo.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.balance.module.vo;
package com.starry.admin.modules.personnel.module.vo;
import lombok.Data;

8
play-admin/src/main/java/com/starry/admin/modules/balance/service/IPlayBalanceDetailsInfoService.java → play-admin/src/main/java/com/starry/admin/modules/personnel/service/IPlayBalanceDetailsInfoService.java
View File

@@ -1,10 +1,10 @@
package com.starry.admin.modules.balance.service;
package com.starry.admin.modules.personnel.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.starry.admin.modules.balance.module.entity.PlayBalanceDetailsInfoEntity;
import com.starry.admin.modules.balance.module.vo.PlayBalanceDetailsQueryVo;
import com.starry.admin.modules.balance.module.vo.PlayBalanceDetailsReturnVo;
import com.starry.admin.modules.personnel.module.entity.PlayBalanceDetailsInfoEntity;
import com.starry.admin.modules.personnel.module.vo.PlayBalanceDetailsQueryVo;
import com.starry.admin.modules.personnel.module.vo.PlayBalanceDetailsReturnVo;
import java.math.BigDecimal;

12
play-admin/src/main/java/com/starry/admin/modules/balance/service/impl/PlayBalanceDetailsInfoServiceImpl.java → play-admin/src/main/java/com/starry/admin/modules/personnel/service/impl/PlayBalanceDetailsInfoServiceImpl.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.balance.service.impl;
package com.starry.admin.modules.personnel.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.starry.admin.modules.balance.mapper.PlayBalanceDetailsInfoMapper;
import com.starry.admin.modules.balance.module.entity.PlayBalanceDetailsInfoEntity;
import com.starry.admin.modules.balance.module.vo.PlayBalanceDetailsQueryVo;
import com.starry.admin.modules.balance.module.vo.PlayBalanceDetailsReturnVo;
import com.starry.admin.modules.balance.service.IPlayBalanceDetailsInfoService;
import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity;
import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
import com.starry.admin.modules.order.service.IPlayOrderInfoService;
import com.starry.admin.modules.personnel.mapper.PlayBalanceDetailsInfoMapper;
import com.starry.admin.modules.personnel.module.entity.PlayBalanceDetailsInfoEntity;
import com.starry.admin.modules.personnel.module.vo.PlayBalanceDetailsQueryVo;
import com.starry.admin.modules.personnel.module.vo.PlayBalanceDetailsReturnVo;
import com.starry.admin.modules.personnel.service.IPlayBalanceDetailsInfoService;
import com.starry.common.utils.IdUtils;
import org.springframework.stereotype.Service;

6
play-admin/src/main/java/com/starry/admin/modules/gift/controller/PlayClerkGiftInfoController.java → play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayClerkGiftInfoController.java
View File

@@ -1,8 +1,8 @@
package com.starry.admin.modules.gift.controller;
package com.starry.admin.modules.shop.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.starry.admin.modules.gift.module.entity.PlayClerkGiftInfoEntity;
import com.starry.admin.modules.gift.service.IPlayClerkGiftInfoService;
import com.starry.admin.modules.shop.module.entity.PlayClerkGiftInfoEntity;
import com.starry.admin.modules.shop.service.IPlayClerkGiftInfoService;
import com.starry.common.annotation.Log;
import com.starry.common.enums.BusinessType;
import com.starry.common.result.R;

6
play-admin/src/main/java/com/starry/admin/modules/gift/controller/PlayGiftInfoController.java → play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayGiftInfoController.java
View File

@@ -1,8 +1,8 @@
package com.starry.admin.modules.gift.controller;
package com.starry.admin.modules.shop.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.starry.admin.modules.gift.module.entity.PlayGiftInfoEntity;
import com.starry.admin.modules.gift.service.IPlayGiftInfoService;
import com.starry.admin.modules.shop.module.entity.PlayGiftInfoEntity;
import com.starry.admin.modules.shop.service.IPlayGiftInfoService;
import com.starry.common.annotation.Log;
import com.starry.common.enums.BusinessType;
import com.starry.common.result.R;

4
play-admin/src/main/java/com/starry/admin/modules/gift/mapper/PlayClerkGiftInfoMapper.java → play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayClerkGiftInfoMapper.java
View File

@@ -1,8 +1,8 @@
package com.starry.admin.modules.gift.mapper;
package com.starry.admin.modules.shop.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.starry.admin.modules.gift.module.entity.PlayClerkGiftInfoEntity;
import com.starry.admin.modules.shop.module.entity.PlayClerkGiftInfoEntity;
/**
* 店员和礼物关系Mapper接口

4
play-admin/src/main/java/com/starry/admin/modules/gift/mapper/PlayGiftInfoMapper.java → play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayGiftInfoMapper.java
View File

@@ -1,8 +1,8 @@
package com.starry.admin.modules.gift.mapper;
package com.starry.admin.modules.shop.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.starry.admin.modules.gift.module.entity.PlayGiftInfoEntity;
import com.starry.admin.modules.shop.module.entity.PlayGiftInfoEntity;
/**
* 礼物Mapper接口

2
play-admin/src/main/java/com/starry/admin/modules/gift/module/constant/GiftConstant.java → play-admin/src/main/java/com/starry/admin/modules/shop/module/constant/GiftConstant.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.gift.module.constant;
package com.starry.admin.modules.shop.module.constant;
/**
* 礼物常量

2
play-admin/src/main/java/com/starry/admin/modules/gift/module/entity/PlayClerkGiftInfoEntity.java → play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayClerkGiftInfoEntity.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.gift.module.entity;
package com.starry.admin.modules.shop.module.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.starry.common.domain.BaseEntity;

2
play-admin/src/main/java/com/starry/admin/modules/gift/module/entity/PlayGiftInfoEntity.java → play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/PlayGiftInfoEntity.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.gift.module.entity;
package com.starry.admin.modules.shop.module.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;

3
play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayCommodityInfoReturnVo.java
View File

@@ -1,10 +1,7 @@
package com.starry.admin.modules.shop.module.vo;
import com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity;
import lombok.Data;
import java.util.List;
/**
* @author admin
* @since 2024/8/18 下午7:59

3
play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopCarouselInfoQueryVo.java
View File

@@ -1,12 +1,9 @@
package com.starry.admin.modules.shop.module.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.starry.common.domain.BasePageEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import java.util.List;
/**

4
play-admin/src/main/java/com/starry/admin/modules/gift/service/IPlayClerkGiftInfoService.java → play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayClerkGiftInfoService.java
View File

@@ -1,8 +1,8 @@
package com.starry.admin.modules.gift.service;
package com.starry.admin.modules.shop.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.starry.admin.modules.gift.module.entity.PlayClerkGiftInfoEntity;
import com.starry.admin.modules.shop.module.entity.PlayClerkGiftInfoEntity;
import java.util.List;

4
play-admin/src/main/java/com/starry/admin/modules/gift/service/IPlayGiftInfoService.java → play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayGiftInfoService.java
View File

@@ -1,8 +1,8 @@
package com.starry.admin.modules.gift.service;
package com.starry.admin.modules.shop.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.starry.admin.modules.gift.module.entity.PlayGiftInfoEntity;
import com.starry.admin.modules.shop.module.entity.PlayGiftInfoEntity;
import com.starry.admin.modules.weichat.entity.gift.PlayClerkGiftReturnVo;
import java.util.List;

8
play-admin/src/main/java/com/starry/admin/modules/gift/service/impl/PlayClerkGiftInfoServiceImpl.java → play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayClerkGiftInfoServiceImpl.java
View File

@@ -1,13 +1,13 @@
package com.starry.admin.modules.gift.service.impl;
package com.starry.admin.modules.shop.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.starry.admin.modules.gift.mapper.PlayClerkGiftInfoMapper;
import com.starry.admin.modules.gift.module.entity.PlayClerkGiftInfoEntity;
import com.starry.admin.modules.gift.service.IPlayClerkGiftInfoService;
import com.starry.admin.modules.shop.mapper.PlayClerkGiftInfoMapper;
import com.starry.admin.modules.shop.module.entity.PlayClerkGiftInfoEntity;
import com.starry.admin.modules.shop.service.IPlayClerkGiftInfoService;
import com.starry.common.utils.IdUtils;
import org.springframework.stereotype.Service;

10
play-admin/src/main/java/com/starry/admin/modules/gift/service/impl/PlayGiftInfoServiceImpl.java → play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayGiftInfoServiceImpl.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.gift.service.impl;
package com.starry.admin.modules.shop.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -9,10 +9,10 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.starry.admin.common.exception.CustomException;
import com.starry.admin.modules.custom.module.entity.PlayCustomGiftInfoEntity;
import com.starry.admin.modules.custom.service.impl.PlayCustomGiftInfoServiceImpl;
import com.starry.admin.modules.gift.mapper.PlayGiftInfoMapper;
import com.starry.admin.modules.gift.module.entity.PlayClerkGiftInfoEntity;
import com.starry.admin.modules.gift.module.entity.PlayGiftInfoEntity;
import com.starry.admin.modules.gift.service.IPlayGiftInfoService;
import com.starry.admin.modules.shop.mapper.PlayGiftInfoMapper;
import com.starry.admin.modules.shop.module.entity.PlayClerkGiftInfoEntity;
import com.starry.admin.modules.shop.module.entity.PlayGiftInfoEntity;
import com.starry.admin.modules.shop.service.IPlayGiftInfoService;
import com.starry.admin.modules.weichat.entity.gift.PlayClerkGiftReturnVo;
import com.starry.common.utils.IdUtils;
import org.springframework.stereotype.Service;

4
play-admin/src/main/java/com/starry/admin/modules/monitor/controller/CacheController.java → play-admin/src/main/java/com/starry/admin/modules/system/controller/CacheController.java
View File

@@ -1,7 +1,7 @@
package com.starry.admin.modules.monitor.controller;
package com.starry.admin.modules.system.controller;
import com.starry.admin.modules.monitor.entity.Cache;
import com.starry.admin.modules.system.entity.Cache;
import com.starry.common.constant.CacheConstants;
import com.starry.common.result.R;
import com.starry.common.utils.StringUtils;

4
play-admin/src/main/java/com/starry/admin/modules/monitor/controller/ServerController.java → play-admin/src/main/java/com/starry/admin/modules/system/controller/ServerController.java
View File

@@ -1,7 +1,7 @@
package com.starry.admin.modules.monitor.controller;
package com.starry.admin.modules.system.controller;
import com.starry.admin.modules.monitor.entity.Server;
import com.starry.admin.modules.system.entity.Server;
import com.starry.common.result.R;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;

4
play-admin/src/main/java/com/starry/admin/modules/system/controller/SysSmsController.java
View File

@@ -1,7 +1,7 @@
package com.starry.admin.modules.system.controller;
import com.starry.admin.modules.platform.entity.SysTenantEntity;
import com.starry.admin.modules.platform.service.ISysTenantService;
import com.starry.admin.modules.system.entity.SysTenantEntity;
import com.starry.admin.modules.system.service.ISysTenantService;
import com.starry.admin.utils.SmsUtils;
import com.starry.common.result.R;
import lombok.extern.slf4j.Slf4j;

12
play-admin/src/main/java/com/starry/admin/modules/platform/controller/SysTenantController.java → play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantController.java
View File

@@ -1,14 +1,14 @@
package com.starry.admin.modules.platform.controller;
package com.starry.admin.modules.system.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
import com.starry.admin.modules.order.service.IPlayOrderInfoService;
import com.starry.admin.modules.platform.entity.SysTenantEntity;
import com.starry.admin.modules.platform.service.ISysTenantService;
import com.starry.admin.modules.platform.vo.SysTenantAddVo;
import com.starry.admin.modules.platform.vo.SysTenantQueryVo;
import com.starry.admin.modules.platform.vo.SysTenantReturnVo;
import com.starry.admin.modules.system.entity.SysTenantEntity;
import com.starry.admin.modules.system.service.ISysTenantService;
import com.starry.admin.modules.system.vo.SysTenantAddVo;
import com.starry.admin.modules.system.vo.SysTenantQueryVo;
import com.starry.admin.modules.system.vo.SysTenantReturnVo;
import com.starry.common.annotation.Log;
import com.starry.common.enums.BusinessType;
import com.starry.common.result.R;

10
play-admin/src/main/java/com/starry/admin/modules/platform/controller/SysTenantPackageController.java → play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantPackageController.java
View File

@@ -1,9 +1,9 @@
package com.starry.admin.modules.platform.controller;
package com.starry.admin.modules.system.controller;
import com.starry.admin.modules.platform.entity.SysTenantPackageEntity;
import com.starry.admin.modules.platform.service.ISysTenantPackageService;
import com.starry.admin.modules.platform.vo.SimplePackage;
import com.starry.admin.modules.platform.vo.SysTenantPackageVo;
import com.starry.admin.modules.system.entity.SysTenantPackageEntity;
import com.starry.admin.modules.system.service.ISysTenantPackageService;
import com.starry.admin.modules.system.vo.SimplePackage;
import com.starry.admin.modules.system.vo.SysTenantPackageVo;
import com.starry.admin.utils.ExcelUtils;
import com.starry.common.annotation.Log;
import com.starry.common.enums.BusinessType;

6
play-admin/src/main/java/com/starry/admin/modules/monitor/controller/UserOnlineController.java → play-admin/src/main/java/com/starry/admin/modules/system/controller/UserOnlineController.java
View File

@@ -1,12 +1,12 @@
package com.starry.admin.modules.monitor.controller;
package com.starry.admin.modules.system.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.starry.admin.common.domain.LoginUser;
import com.starry.admin.modules.monitor.entity.UserOnline;
import com.starry.admin.modules.monitor.service.UserOnlineService;
import com.starry.admin.modules.system.entity.UserOnline;
import com.starry.admin.modules.system.service.UserOnlineService;
import com.starry.common.annotation.Log;
import com.starry.common.constant.CacheConstants;
import com.starry.common.enums.BusinessType;

2
play-admin/src/main/java/com/starry/admin/modules/monitor/entity/Cache.java → play-admin/src/main/java/com/starry/admin/modules/system/entity/Cache.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.monitor.entity;
package com.starry.admin.modules.system.entity;
import com.starry.common.utils.StringUtils;

2
play-admin/src/main/java/com/starry/admin/modules/monitor/entity/Cpu.java → play-admin/src/main/java/com/starry/admin/modules/system/entity/Cpu.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.monitor.entity;
package com.starry.admin.modules.system.entity;
import com.starry.common.utils.Arith;
import lombok.Data;

2
play-admin/src/main/java/com/starry/admin/modules/monitor/entity/Jvm.java → play-admin/src/main/java/com/starry/admin/modules/system/entity/Jvm.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.monitor.entity;
package com.starry.admin.modules.system.entity;
import cn.hutool.core.date.DateUtil;
import com.starry.common.utils.Arith;

2
play-admin/src/main/java/com/starry/admin/modules/monitor/entity/Mem.java → play-admin/src/main/java/com/starry/admin/modules/system/entity/Mem.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.monitor.entity;
package com.starry.admin.modules.system.entity;
import com.starry.common.utils.Arith;
import lombok.Data;

2
play-admin/src/main/java/com/starry/admin/modules/monitor/entity/Server.java → play-admin/src/main/java/com/starry/admin/modules/system/entity/Server.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.monitor.entity;
package com.starry.admin.modules.system.entity;
import com.starry.common.utils.Arith;

2
play-admin/src/main/java/com/starry/admin/modules/monitor/entity/Sys.java → play-admin/src/main/java/com/starry/admin/modules/system/entity/Sys.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.monitor.entity;
package com.starry.admin.modules.system.entity;
import lombok.Data;

2
play-admin/src/main/java/com/starry/admin/modules/monitor/entity/SysFile.java → play-admin/src/main/java/com/starry/admin/modules/system/entity/SysFile.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.monitor.entity;
package com.starry.admin.modules.system.entity;
import lombok.Data;

2
play-admin/src/main/java/com/starry/admin/modules/platform/entity/SysTenantEntity.java → play-admin/src/main/java/com/starry/admin/modules/system/entity/SysTenantEntity.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.platform.entity;
package com.starry.admin.modules.system.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

2
play-admin/src/main/java/com/starry/admin/modules/platform/entity/SysTenantPackageEntity.java → play-admin/src/main/java/com/starry/admin/modules/system/entity/SysTenantPackageEntity.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.platform.entity;
package com.starry.admin.modules.system.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

2
play-admin/src/main/java/com/starry/admin/modules/monitor/entity/UserOnline.java → play-admin/src/main/java/com/starry/admin/modules/system/entity/UserOnline.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.monitor.entity;
package com.starry.admin.modules.system.entity;
import lombok.Data;

8
play-admin/src/main/java/com/starry/admin/modules/platform/mapper/SysTenantMapper.java → play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantMapper.java
View File

@@ -1,11 +1,11 @@
package com.starry.admin.modules.platform.mapper;
package com.starry.admin.modules.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.starry.admin.modules.platform.entity.SysTenantEntity;
import com.starry.admin.modules.platform.vo.SysTenantQueryVo;
import com.starry.admin.modules.platform.vo.TenantResultVo;
import com.starry.admin.modules.system.entity.SysTenantEntity;
import com.starry.admin.modules.system.vo.SysTenantQueryVo;
import com.starry.admin.modules.system.vo.TenantResultVo;
import org.apache.ibatis.annotations.Param;
/**

8
play-admin/src/main/java/com/starry/admin/modules/platform/mapper/SysTenantPackageMapper.java → play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantPackageMapper.java
View File

@@ -1,11 +1,11 @@
package com.starry.admin.modules.platform.mapper;
package com.starry.admin.modules.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.starry.admin.modules.platform.entity.SysTenantPackageEntity;
import com.starry.admin.modules.platform.vo.SimplePackage;
import com.starry.admin.modules.platform.vo.SysTenantPackageVo;
import com.starry.admin.modules.system.entity.SysTenantPackageEntity;
import com.starry.admin.modules.system.vo.SimplePackage;
import com.starry.admin.modules.system.vo.SysTenantPackageVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;

8
play-admin/src/main/java/com/starry/admin/modules/platform/service/ISysTenantPackageService.java → play-admin/src/main/java/com/starry/admin/modules/system/service/ISysTenantPackageService.java
View File

@@ -1,10 +1,10 @@
package com.starry.admin.modules.platform.service;
package com.starry.admin.modules.system.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.starry.admin.modules.platform.entity.SysTenantPackageEntity;
import com.starry.admin.modules.platform.vo.SimplePackage;
import com.starry.admin.modules.platform.vo.SysTenantPackageVo;
import com.starry.admin.modules.system.entity.SysTenantPackageEntity;
import com.starry.admin.modules.system.vo.SimplePackage;
import com.starry.admin.modules.system.vo.SysTenantPackageVo;
import java.util.List;

6
play-admin/src/main/java/com/starry/admin/modules/platform/service/ISysTenantService.java → play-admin/src/main/java/com/starry/admin/modules/system/service/ISysTenantService.java
View File

@@ -1,9 +1,9 @@
package com.starry.admin.modules.platform.service;
package com.starry.admin.modules.system.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.starry.admin.modules.platform.entity.SysTenantEntity;
import com.starry.admin.modules.platform.vo.SysTenantQueryVo;
import com.starry.admin.modules.system.entity.SysTenantEntity;
import com.starry.admin.modules.system.vo.SysTenantQueryVo;
import com.starry.common.result.R;
import java.util.List;

4
play-admin/src/main/java/com/starry/admin/modules/monitor/service/UserOnlineService.java → play-admin/src/main/java/com/starry/admin/modules/system/service/UserOnlineService.java
View File

@@ -1,8 +1,8 @@
package com.starry.admin.modules.monitor.service;
package com.starry.admin.modules.system.service;
import com.starry.admin.common.domain.LoginUser;
import com.starry.admin.modules.monitor.entity.UserOnline;
import com.starry.admin.modules.system.entity.UserOnline;
/**
* @author admin

8
play-admin/src/main/java/com/starry/admin/modules/system/service/impl/LoginServiceImpl.java
View File

@@ -8,13 +8,9 @@ import com.starry.admin.common.exception.ServiceException;
import com.starry.admin.common.security.entity.JwtUser;
import com.starry.admin.manager.AsyncManager;
import com.starry.admin.manager.factory.AsyncFactory;
import com.starry.admin.modules.platform.entity.SysTenantEntity;
import com.starry.admin.modules.platform.service.ISysTenantService;
import com.starry.admin.modules.system.entity.SysTenantEntity;
import com.starry.admin.modules.system.entity.SysUserEntity;
import com.starry.admin.modules.system.service.LoginService;
import com.starry.admin.modules.system.service.SysMenuService;
import com.starry.admin.modules.system.service.SysRoleService;
import com.starry.admin.modules.system.service.SysUserService;
import com.starry.admin.modules.system.service.*;
import com.starry.admin.utils.SecurityUtils;
import com.starry.common.constant.Constants;
import com.starry.common.constant.UserConstants;

2
play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysAdministrativeAreaDictInfoServiceImpl.java
View File

@@ -1,6 +1,5 @@
package com.starry.admin.modules.system.service.impl;
import com.starry.common.utils.IdUtils;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,6 +10,7 @@ import com.starry.admin.modules.system.mapper.SysAdministrativeAreaDictInfoMappe
import com.starry.admin.modules.system.service.ISysAdministrativeAreaDictInfoService;
import com.starry.admin.modules.system.vo.AdministrativeAreaQueryReturnVo;
import com.starry.common.utils.ConvertUtil;
import com.starry.common.utils.IdUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;

16
play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantPackageServiceImpl.java → play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysTenantPackageServiceImpl.java
View File

@@ -1,17 +1,17 @@
package com.starry.admin.modules.platform.service.impl;
package com.starry.admin.modules.system.service.impl;
import com.starry.common.utils.IdUtils;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.starry.admin.common.exception.CustomException;
import com.starry.admin.modules.platform.entity.SysTenantPackageEntity;
import com.starry.admin.modules.platform.mapper.SysTenantPackageMapper;
import com.starry.admin.modules.platform.service.ISysTenantPackageService;
import com.starry.admin.modules.platform.service.ISysTenantService;
import com.starry.admin.modules.platform.vo.SimplePackage;
import com.starry.admin.modules.platform.vo.SysTenantPackageVo;
import com.starry.admin.modules.system.entity.SysTenantPackageEntity;
import com.starry.admin.modules.system.mapper.SysTenantPackageMapper;
import com.starry.admin.modules.system.service.ISysTenantPackageService;
import com.starry.admin.modules.system.service.ISysTenantService;
import com.starry.admin.modules.system.vo.SimplePackage;
import com.starry.admin.modules.system.vo.SysTenantPackageVo;
import com.starry.common.utils.IdUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;

14
play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java → play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysTenantServiceImpl.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.platform.service.impl;
package com.starry.admin.modules.system.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
@@ -13,18 +13,12 @@ import com.starry.admin.common.domain.LoginUser;
import com.starry.admin.common.exception.CustomException;
import com.starry.admin.modules.clerk.service.IPlayClerkLevelInfoService;
import com.starry.admin.modules.custom.service.IPlayCustomLevelInfoService;
import com.starry.admin.modules.platform.entity.SysTenantEntity;
import com.starry.admin.modules.platform.entity.SysTenantPackageEntity;
import com.starry.admin.modules.platform.mapper.SysTenantMapper;
import com.starry.admin.modules.platform.mapper.SysTenantPackageMapper;
import com.starry.admin.modules.platform.service.ISysTenantService;
import com.starry.admin.modules.platform.vo.SysTenantQueryVo;
import com.starry.admin.modules.shop.service.IPlayCommodityInfoService;
import com.starry.admin.modules.system.entity.SysRoleEntity;
import com.starry.admin.modules.system.entity.SysRoleMenuEntity;
import com.starry.admin.modules.system.entity.SysUserEntity;
import com.starry.admin.modules.system.entity.*;
import com.starry.admin.modules.system.mapper.*;
import com.starry.admin.modules.system.service.ISysTenantService;
import com.starry.admin.modules.system.service.SysRoleMenuService;
import com.starry.admin.modules.system.vo.SysTenantQueryVo;
import com.starry.admin.utils.SecurityUtils;
import com.starry.common.constant.CacheConstants;
import com.starry.common.redis.RedisCache;

6
play-admin/src/main/java/com/starry/admin/modules/monitor/service/impl/UserOnlineServiceImpl.java → play-admin/src/main/java/com/starry/admin/modules/system/service/impl/UserOnlineServiceImpl.java
View File

@@ -1,9 +1,9 @@
package com.starry.admin.modules.monitor.service.impl;
package com.starry.admin.modules.system.service.impl;
import com.starry.admin.common.domain.LoginUser;
import com.starry.admin.modules.monitor.entity.UserOnline;
import com.starry.admin.modules.monitor.service.UserOnlineService;
import com.starry.admin.modules.system.entity.UserOnline;
import com.starry.admin.modules.system.service.UserOnlineService;
import com.starry.common.utils.StringUtils;
import org.springframework.stereotype.Service;

2
play-admin/src/main/java/com/starry/admin/modules/platform/vo/SimplePackage.java → play-admin/src/main/java/com/starry/admin/modules/system/vo/SimplePackage.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.platform.vo;
package com.starry.admin.modules.system.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
play-admin/src/main/java/com/starry/admin/modules/platform/vo/SysTenantAddVo.java → play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantAddVo.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.platform.vo;
package com.starry.admin.modules.system.vo;
import com.starry.common.domain.BaseEntity;
import lombok.Data;

2
play-admin/src/main/java/com/starry/admin/modules/platform/vo/SysTenantPackageAddVo.java → play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantPackageAddVo.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.platform.vo;
package com.starry.admin.modules.system.vo;
import com.starry.common.domain.BaseEntity;
import lombok.Data;

2
play-admin/src/main/java/com/starry/admin/modules/platform/vo/SysTenantPackageVo.java → play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantPackageVo.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.platform.vo;
package com.starry.admin.modules.system.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

2
play-admin/src/main/java/com/starry/admin/modules/platform/vo/SysTenantQueryVo.java → play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantQueryVo.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.platform.vo;
package com.starry.admin.modules.system.vo;
import com.starry.common.domain.BasePageEntity;
import lombok.Data;

2
play-admin/src/main/java/com/starry/admin/modules/platform/vo/SysTenantReturnVo.java → play-admin/src/main/java/com/starry/admin/modules/system/vo/SysTenantReturnVo.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.platform.vo;
package com.starry.admin.modules.system.vo;
import lombok.Data;

2
play-admin/src/main/java/com/starry/admin/modules/platform/vo/TenantResultVo.java → play-admin/src/main/java/com/starry/admin/modules/system/vo/TenantResultVo.java
View File

@@ -1,4 +1,4 @@
package com.starry.admin.modules.platform.vo;
package com.starry.admin.modules.system.vo;
import io.swagger.annotations.ApiModel;
import lombok.Data;

4
play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java
View File

@@ -12,8 +12,6 @@ import com.starry.admin.modules.clerk.module.vo.PlayClerkCommodityQueryVo;
import com.starry.admin.modules.clerk.service.*;
import com.starry.admin.modules.clerk.service.impl.PlayClerkUserInfoServiceImpl;
import com.starry.admin.modules.clerk.service.impl.PlayClerkUserReviewInfoServiceImpl;
import com.starry.admin.modules.gift.module.entity.PlayGiftInfoEntity;
import com.starry.admin.modules.gift.service.IPlayGiftInfoService;
import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
import com.starry.admin.modules.order.module.vo.PlayOrderEvaluateQueryVo;
import com.starry.admin.modules.order.module.vo.PlayOrderStateEditVo;
@@ -21,6 +19,8 @@ import com.starry.admin.modules.order.service.IPlayOrderEvaluateInfoService;
import com.starry.admin.modules.order.service.IPlayOrderInfoService;
import com.starry.admin.modules.personnel.module.entity.PlayPersonnelGroupInfoEntity;
import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService;
import com.starry.admin.modules.shop.module.entity.PlayGiftInfoEntity;
import com.starry.admin.modules.shop.service.IPlayGiftInfoService;
import com.starry.admin.modules.statistics.service.IPlayClerkPerformanceService;
import com.starry.admin.modules.weichat.entity.*;
import com.starry.admin.modules.weichat.entity.clerk.PlayClerkLevelAndRankingVo;

2
play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCommonController.java
View File

@@ -1,7 +1,6 @@
package com.starry.admin.modules.weichat.controller;
import cn.hutool.core.io.FileUtil;
import com.starry.common.utils.IdUtils;
import cn.hutool.core.util.StrUtil;
import com.starry.admin.common.exception.CustomException;
import com.starry.admin.common.oss.service.IOssFileService;
@@ -10,6 +9,7 @@ import com.starry.admin.modules.weichat.service.WxAccessTokenService;
import com.starry.admin.modules.weichat.utils.WxFileUtils;
import com.starry.admin.utils.SecurityUtils;
import com.starry.common.result.R;
import com.starry.common.utils.IdUtils;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.error.WxErrorException;
import org.springframework.web.bind.annotation.*;

10
play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCustomController.java
View File

@@ -16,14 +16,10 @@ import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
import com.starry.admin.modules.custom.module.entity.PlayCustomGiftInfoEntity;
import com.starry.admin.modules.custom.module.entity.PlayCustomLeaveMsgEntity;
import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity;
import com.starry.admin.modules.custom.service.IPlayCustomFollowInfoService;
import com.starry.admin.modules.custom.service.IPlayCustomGiftInfoService;
import com.starry.admin.modules.custom.service.IPlayCustomLeaveMsgService;
import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService;
import com.starry.admin.modules.follow.service.IPlayCustomFollowInfoService;
import com.starry.admin.modules.gift.module.entity.PlayClerkGiftInfoEntity;
import com.starry.admin.modules.gift.module.entity.PlayGiftInfoEntity;
import com.starry.admin.modules.gift.service.IPlayClerkGiftInfoService;
import com.starry.admin.modules.gift.service.IPlayGiftInfoService;
import com.starry.admin.modules.order.module.entity.PlayOrderComplaintInfoEntity;
import com.starry.admin.modules.order.module.entity.PlayOrderEvaluateInfoEntity;
import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
@@ -32,10 +28,14 @@ import com.starry.admin.modules.order.service.IPlayOrderComplaintInfoService;
import com.starry.admin.modules.order.service.IPlayOrderEvaluateInfoService;
import com.starry.admin.modules.order.service.IPlayOrderInfoService;
import com.starry.admin.modules.order.service.IPlayOrderRandomInfoService;
import com.starry.admin.modules.shop.module.entity.PlayClerkGiftInfoEntity;
import com.starry.admin.modules.shop.module.entity.PlayCouponInfoEntity;
import com.starry.admin.modules.shop.module.entity.PlayGiftInfoEntity;
import com.starry.admin.modules.shop.module.vo.PlayCommodityInfoVo;
import com.starry.admin.modules.shop.service.IPlayClerkGiftInfoService;
import com.starry.admin.modules.shop.service.IPlayCommodityInfoService;
import com.starry.admin.modules.shop.service.IPlayCouponInfoService;
import com.starry.admin.modules.shop.service.IPlayGiftInfoService;
import com.starry.admin.modules.weichat.entity.*;
import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoResultVo;
import com.starry.admin.modules.weichat.entity.costom.PlayCustomHideLevelStateEditVo;

2
play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxGiftController.java
View File

@@ -6,7 +6,7 @@ import com.starry.admin.common.aspect.ClerkUserLogin;
import com.starry.admin.common.aspect.CustomUserLogin;
import com.starry.admin.common.conf.ThreadLocalRequestDetail;
import com.starry.admin.common.exception.CustomException;
import com.starry.admin.modules.gift.service.IPlayGiftInfoService;
import com.starry.admin.modules.shop.service.IPlayGiftInfoService;
import com.starry.admin.modules.weichat.entity.PlayGiftInfoDto;
import com.starry.admin.modules.weichat.entity.gift.PlayClerkGiftReturnVo;
import com.starry.common.result.R;

5
play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPersonnelGroupInfoController.java
View File

@@ -8,7 +8,10 @@ import com.starry.admin.modules.weichat.entity.PlayGroupWagesReturnVo;
import com.starry.common.result.R;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.ArrayList;

3
play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayController.java
View File

@@ -17,8 +17,7 @@ import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService;
import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
import com.starry.admin.modules.order.service.IPlayOrderInfoService;
import com.starry.admin.modules.order.service.impl.PlayOrderInfoServiceImpl;
import com.starry.admin.modules.platform.entity.SysTenantEntity;
import com.starry.admin.modules.platform.service.impl.SysTenantServiceImpl;
import com.starry.admin.modules.system.service.impl.SysTenantServiceImpl;
import com.starry.admin.modules.weichat.service.WxCustomMpService;
import com.starry.admin.utils.SecurityUtils;
import com.starry.common.result.R;

2
play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderInfoGiftAdd.java
View File

@@ -1,7 +1,7 @@
package com.starry.admin.modules.weichat.entity;
import com.starry.admin.modules.gift.module.constant.GiftConstant;
import com.starry.admin.modules.shop.module.constant.GiftConstant;
import lombok.Data;
import javax.validation.constraints.Max;

2
play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayOrderInfoRandomAdd.java
View File

@@ -1,7 +1,7 @@
package com.starry.admin.modules.weichat.entity;
import com.starry.admin.modules.gift.module.constant.GiftConstant;
import com.starry.admin.modules.shop.module.constant.GiftConstant;
import lombok.Data;
import javax.validation.constraints.Max;

2
play-admin/src/main/java/com/starry/admin/modules/weichat/entity/order/PlayOrderInfoCommodityAdd.java
View File

@@ -1,7 +1,7 @@
package com.starry.admin.modules.weichat.entity.order;
import com.starry.admin.modules.gift.module.constant.GiftConstant;
import com.starry.admin.modules.shop.module.constant.GiftConstant;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

13
play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java
View File

@@ -7,7 +7,6 @@ import com.github.binarywang.wxpay.config.WxPayConfig;
import com.github.binarywang.wxpay.service.WxPayService;
import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
import com.starry.admin.common.exception.CustomException;
import com.starry.admin.common.play.wx.WeChatConstants;
import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
import com.starry.admin.modules.clerk.module.entity.PlayClerkUserReviewInfoEntity;
import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
@@ -16,8 +15,8 @@ import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService;
import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
import com.starry.admin.modules.personnel.module.entity.PlayPersonnelAdminInfoEntity;
import com.starry.admin.modules.personnel.service.IPlayPersonnelAdminInfoService;
import com.starry.admin.modules.platform.entity.SysTenantEntity;
import com.starry.admin.modules.platform.service.impl.SysTenantServiceImpl;
import com.starry.admin.modules.system.entity.SysTenantEntity;
import com.starry.admin.modules.system.service.impl.SysTenantServiceImpl;
import com.starry.admin.utils.SecurityUtils;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.error.WxErrorException;
@@ -54,6 +53,12 @@ public class WxCustomMpService {
private IPlayClerkUserInfoService clerkUserInfoService;
/**
* 支付成功回调地址
*/
public static String NOTIFY_URL = "https://july.hucs.top/api/wx/pay/jsCallback";
public WxMpService proxyWxMpService() {
String tenantId = SecurityUtils.getTenantId();
if (StrUtil.isBlankIfStr(tenantId)) {
@@ -87,7 +92,7 @@ public class WxCustomMpService {
payConfig.setMchId(StringUtils.trimToNull(entity.getMchId()));
payConfig.setMchKey(StringUtils.trimToNull(entity.getMchKey()));
payConfig.setNotifyUrl(StringUtils.trimToNull(WeChatConstants.NOTIFY_URL));
payConfig.setNotifyUrl(StringUtils.trimToNull(NOTIFY_URL));
payConfig.setTradeType("JSAPI");
payConfig.setSignType("MD5");
// 可以指定是否使用沙箱环境