diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/CommissionInfo.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/CommissionInfo.java index ff51844..b159f93 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/CommissionInfo.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/CommissionInfo.java @@ -14,8 +14,8 @@ import lombok.Setter; @TableName("sc_commission_info") public class CommissionInfo { - @TableId(type = IdType.AUTO) - private Integer id; + @TableId(type = IdType.ASSIGN_ID) + private Long id; private Integer tenantId; diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/SalaryBase.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/SalaryBase.java index aa62581..7ad77bc 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/SalaryBase.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/SalaryBase.java @@ -1,6 +1,5 @@ package cn.xluobo.business.sc.salary.repo.model; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Getter; @@ -13,7 +12,7 @@ import java.math.BigDecimal; @TableName("sc_salary_base") public class SalaryBase { - @TableId(type = IdType.AUTO) + @TableId() private Integer id; private String name; diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/StaffSalaryBase.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/StaffSalaryBase.java index 5284c7f..8507f54 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/StaffSalaryBase.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/StaffSalaryBase.java @@ -1,6 +1,5 @@ package cn.xluobo.business.sc.salary.repo.model; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Getter; @@ -13,7 +12,7 @@ import java.math.BigDecimal; @TableName("sc_staff_salary_base") public class StaffSalaryBase { - @TableId(type = IdType.AUTO) + @TableId() private Integer id; private Long staffId; diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/stock/goods/repo/model/StockGoodsProperty.java b/ruoyi-admin/src/main/java/cn/xluobo/business/stock/goods/repo/model/StockGoodsProperty.java index 6d2a60e..aa7d958 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/stock/goods/repo/model/StockGoodsProperty.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/stock/goods/repo/model/StockGoodsProperty.java @@ -1,6 +1,5 @@ package cn.xluobo.business.stock.goods.repo.model; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -27,7 +26,7 @@ public class StockGoodsProperty implements Serializable { /** * 商品编号 */ - @TableId(value = "goods_id", type = IdType.INPUT) + @TableId(value = "goods_id") private Long goodsId; /** diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/stock/goods/repo/model/StockInfoChange.java b/ruoyi-admin/src/main/java/cn/xluobo/business/stock/goods/repo/model/StockInfoChange.java index 818cc0d..0cdbe7b 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/stock/goods/repo/model/StockInfoChange.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/stock/goods/repo/model/StockInfoChange.java @@ -1,6 +1,5 @@ package cn.xluobo.business.stock.goods.repo.model; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -30,7 +29,7 @@ public class StockInfoChange implements Serializable { /** * 库存编号 */ - @TableId(value = "stock_change_id", type = IdType.AUTO) + @TableId(value = "stock_change_id") private Long stockChangeId; /** diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/tool/impt/repo/model/ToolImport.java b/ruoyi-admin/src/main/java/cn/xluobo/business/tool/impt/repo/model/ToolImport.java index cf8f205..530053e 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/tool/impt/repo/model/ToolImport.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/tool/impt/repo/model/ToolImport.java @@ -1,15 +1,15 @@ package cn.xluobo.business.tool.impt.repo.model; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** *

* 导入 @@ -26,7 +26,7 @@ public class ToolImport implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "import_id", type = IdType.AUTO) + @TableId(value = "import_id") private Long importId; /** diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/repo/model/WechatCpAccount.java b/ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/repo/model/WechatCpAccount.java index 625b068..20a3467 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/repo/model/WechatCpAccount.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/repo/model/WechatCpAccount.java @@ -1,6 +1,5 @@ package cn.xluobo.business.wechat.cp.repo.model; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -26,7 +25,7 @@ import java.util.Date; public class WechatCpAccount implements Serializable { - @TableId(value = "cp_account_id", type = IdType.AUTO) + @TableId(value = "cp_account_id") private Integer cpAccountId; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mall/AftersaleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mall/AftersaleController.java index 0b30ef2..f95e464 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mall/AftersaleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mall/AftersaleController.java @@ -59,7 +59,7 @@ public class AftersaleController extends BaseController { // } @ApiOperation("获取订单售后详细信息") - @PreAuthorize("@ss.hasPermi('oms:aftersale:query')") + @PreAuthorize("@ss.hasPermi('oms:aftersale:list')") @GetMapping(value = "/{id}") public ResponseEntity getInfo(@PathVariable("id") Long orderId) { return ResponseEntity.ok(service.selectById(orderId)); diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 07ca19e..f2497b5 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -132,8 +132,14 @@ mybatis-plus: configLocation: classpath:mybatis/mybatis-config.xml global-config: db-config: - id-type: auto + id-type: assign_id + # 配置机器 ID (影响雪花ID)，范围: 0-31 + worker-id: 1 + # 配置数据中心 ID (影响雪花ID)，范围: 0-31 + data-center-id: 1 # update-strategy: ignored + + pagehelper: helperDialect: mysql supportMethodsArguments: true diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java index a7a997f..6ca5b37 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java @@ -1,7 +1,6 @@ package com.ruoyi.common.core.domain.entity; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.ruoyi.common.core.domain.BaseEntity; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -24,7 +23,6 @@ public class SysDept extends BaseEntity private static final long serialVersionUID = 1L; /** 部门ID */ - @TableId private Long deptId; /** 父部门ID */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/db/SshContextListener.java b/ruoyi-common/src/main/java/com/ruoyi/common/db/SshContextListener.java index ac97a56..502515e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/db/SshContextListener.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/db/SshContextListener.java @@ -1,14 +1,11 @@ package com.ruoyi.common.db; -import org.springframework.stereotype.Component; - import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import javax.servlet.annotation.WebListener; -@Component//尽量加上这个 -@WebListener//声明为监听器 +//@Component//尽量加上这个 +//@WebListener//声明为监听器 public class SshContextListener implements ServletContextListener { private SshTunnelConfig sshConnectionConfig; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdGenerator.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdGenerator.java new file mode 100644 index 0000000..89e4159 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdGenerator.java @@ -0,0 +1,12 @@ +package com.ruoyi.common.utils.uuid; + +import com.baomidou.mybatisplus.core.toolkit.IdWorker; + +public class IdGenerator { + /** + * 获取雪花算法 ID + */ + public static long nextId() { + return IdWorker.getId(); // 返回 long 类型 + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/mall/service/AftersaleService.java b/ruoyi-system/src/main/java/com/ruoyi/mall/service/AftersaleService.java index 4a04bda..b54cc9a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/mall/service/AftersaleService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/mall/service/AftersaleService.java @@ -6,15 +6,14 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.enums.AftersaleStatus; import com.ruoyi.common.enums.OrderRefundStatus; import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.mall.domain.Aftersale; -import com.ruoyi.mall.domain.Order; -import com.ruoyi.mall.domain.OrderItem; -import com.ruoyi.mall.domain.OrderOperateHistory; +import com.ruoyi.mall.domain.*; import com.ruoyi.mall.domain.form.DealWithAftersaleForm; import com.ruoyi.mall.domain.form.ManagerAftersaleOrderForm; import com.ruoyi.mall.domain.vo.*; @@ -38,7 +37,7 @@ import java.util.stream.Collectors; */ @Service @Slf4j -public class AftersaleService { +public class AftersaleService extends ServiceImpl implements IService { @Autowired private AftersaleMapper aftersaleMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/mall/service/BrandService.java b/ruoyi-system/src/main/java/com/ruoyi/mall/service/BrandService.java index 145920d..cb4ee12 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/mall/service/BrandService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/mall/service/BrandService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.mall.domain.Brand; +import com.ruoyi.mall.domain.Product; import com.ruoyi.mall.domain.query.BrandQuery; import com.ruoyi.mall.mapper.BrandMapper; import org.apache.commons.lang3.StringUtils; @@ -25,6 +26,9 @@ public class BrandService { @Autowired private BrandMapper brandMapper; + @Autowired + private ProductService productService; + /** * 查询品牌管理 * @@ -98,6 +102,11 @@ public class BrandService { * @return 结果 */ public int deleteById(Long id) { + //被使用，无法删除 + int productCount= productService.count(new QueryWrapper().eq("brand_id",id)); + if (productCount>0){ + throw new RuntimeException("品牌下有商品，无法删除！"); + } return brandMapper.deleteById(id); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/mall/service/OrderService.java b/ruoyi-system/src/main/java/com/ruoyi/mall/service/OrderService.java index 3cf8bb8..a1a6f11 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/mall/service/OrderService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/mall/service/OrderService.java @@ -14,6 +14,8 @@ import com.ruoyi.mall.domain.query.DeliverProductForm; import com.ruoyi.mall.domain.query.ManagerOrderQueryForm; import com.ruoyi.mall.domain.vo.*; import com.ruoyi.mall.mapper.*; +import com.ruoyi.system.domain.AppUser; +import com.ruoyi.system.service.YjAppUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; @@ -47,7 +49,8 @@ public class OrderService { @Autowired private OrderDeliveryHistoryMapper orderDeliveryHistoryMapper; - + @Autowired + private YjAppUserService appUserService; /** * 查询订单表 @@ -87,9 +90,9 @@ public class OrderService { managerOrderAddressVo.setName(order.getReceiverName()); managerOrderDetailVO.setAddressInfo(managerOrderAddressVo); //查询会员信息 -// Member member = memberMapper.selectById(order.getMemberId()); -// managerOrderDetailVO.setUserName(member.getNickname()); -// managerOrderDetailVO.setUserPhone(member.getPhoneHidden()); + AppUser member = appUserService.getById(order.getMemberId()); + managerOrderDetailVO.setUserName(member.getNickName()); + managerOrderDetailVO.setUserPhone(member.getPhoneNumber()); //查询购买商品信息 QueryWrapper qw = new QueryWrapper<>(); qw.eq("order_id", order.getId()); diff --git a/ruoyi-system/src/main/java/com/ruoyi/mall/service/ProductCategoryService.java b/ruoyi-system/src/main/java/com/ruoyi/mall/service/ProductCategoryService.java index 3498625..70ddd06 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/mall/service/ProductCategoryService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/mall/service/ProductCategoryService.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.mall.domain.Product; import com.ruoyi.mall.domain.ProductCategory; import com.ruoyi.mall.domain.query.ProductCategoryQuery; import com.ruoyi.mall.domain.vo.ProductCategoryVO; @@ -27,7 +28,8 @@ public class ProductCategoryService { @Autowired private ProductCategoryMapper productCategoryMapper; - + @Autowired + private ProductService productService; /** * 查询商品分类 * @@ -147,6 +149,11 @@ public class ProductCategoryService { * @return 结果 */ public int deleteById(Long id) { + //被使用，无法删除 + int productCount= productService.count(new QueryWrapper().eq("category_id",id)); + if (productCount>0){ + throw new RuntimeException("分类下有商品，无法删除！"); + } return productCategoryMapper.deleteById(id); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/mall/service/ProductService.java b/ruoyi-system/src/main/java/com/ruoyi/mall/service/ProductService.java index 3fde8af..f91a01c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/mall/service/ProductService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/mall/service/ProductService.java @@ -6,12 +6,11 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.mall.domain.Brand; -import com.ruoyi.mall.domain.Product; -import com.ruoyi.mall.domain.ProductCategory; -import com.ruoyi.mall.domain.Sku; +import com.ruoyi.mall.domain.*; import com.ruoyi.mall.domain.query.ProductQuery; import com.ruoyi.mall.domain.vo.ProductDetailVO; import com.ruoyi.mall.domain.vo.ProductVO; @@ -42,7 +41,7 @@ import java.util.stream.Collectors; */ @Service @Slf4j -public class ProductService { +public class ProductService extends ServiceImpl implements IService { @Autowired private ProductMapper productMapper; @Autowired @@ -54,6 +53,9 @@ public class ProductService { @Autowired private YjAppUserService userService; + @Autowired + private OrderItemService orderItemService; + /** @@ -202,11 +204,14 @@ public class ProductService { if (ObjectUtil.isEmpty(productVO.getCustomerService())){ throw new RuntimeException("请选择客服/顾问"); } - if (productVO.getIsCourse().equals(new Integer(1))&&ObjectUtil.isEmpty(productVO.getInstructor())){ - throw new RuntimeException("请选择教练"); - }else { - AppUser instructor= userService.getOne(new QueryWrapper().eq("manage_account_id",productVO.getInstructor())); - product.setInstructor(instructor.getId()); + if (productVO.getIsCourse().equals(new Integer(1))){ + if (ObjectUtil.isEmpty(productVO.getInstructor())){ + throw new RuntimeException("请选择教练"); + }else { + AppUser instructor= userService.getOne(new QueryWrapper().eq("manage_account_id",productVO.getInstructor())); + product.setInstructor(instructor.getId()); + } + } AppUser customerService= userService.getOne(new QueryWrapper().eq("manage_account_id",productVO.getCustomerService())); product.setCustomerService(customerService.getId()); @@ -290,6 +295,10 @@ public class ProductService { * @return 结果 */ public int deleteById(Long id) { + int orderCount= orderItemService.count(new QueryWrapper().eq("product_id",id)); + if (orderCount>0){ + throw new RuntimeException("商品已生成订单，无法删除！"); + } return productMapper.deleteById(id); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTime.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTime.java index f809067..639e3ed 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTime.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTime.java @@ -179,7 +179,11 @@ public class ScClaTime implements Serializable { @TableField("create_time") private Date createTime; - + /** + * 所属租户 + */ + @TableField("tenant_id") + private String tenantId; /** * 更新时间 diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTimeAttend.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTimeAttend.java index 821868b..6ff88d0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTimeAttend.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTimeAttend.java @@ -155,4 +155,10 @@ public class ScClaTimeAttend implements Serializable { */ @TableField(value = "fee_after") private BigDecimal feeAfter; + + /** + * 所属租户 + */ + @TableField("tenant_id") + private String tenantId; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScCourse.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScCourse.java index cb7dcd5..9827548 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScCourse.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScCourse.java @@ -29,7 +29,7 @@ public class ScCourse implements Serializable { /** * 课程id */ - @TableId(value = "course_id") + @TableId(value = "course_id",type = IdType.ASSIGN_ID) private Long courseId; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScCourseType.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScCourseType.java index e9878e1..f290852 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScCourseType.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScCourseType.java @@ -1,6 +1,5 @@ package com.ruoyi.school.course.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -26,7 +25,7 @@ import java.util.Date; public class ScCourseType implements Serializable { - @TableId(value = "course_type_id",type = IdType.AUTO) + @TableId(value = "course_type_id") private Long courseTypeId; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessClaTimeRuleService.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessClaTimeRuleService.java index cba96e6..63fc966 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessClaTimeRuleService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessClaTimeRuleService.java @@ -197,6 +197,7 @@ public class BusinessClaTimeRuleService { claTime.setClassTheme(claTimeRule.getClassTheme()); claTime.setTeacherId(claTimeRule.getTeacherId()); claTime.setCreateUser(claTimeRule.getCreateUser()); + claTime.setTenantId(courseCla.getTenantId()); return claTime; }).collect(Collectors.toList()); claTimeService.saveBatch(timeList); diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessClaTimeService.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessClaTimeService.java index 2cb822d..b963a2f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessClaTimeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessClaTimeService.java @@ -251,6 +251,7 @@ public class BusinessClaTimeService { claTime.setTeacherFee(course.getClaFee()); claTime.setCreateUser(loginUser.getUserId()); claTime.setCreateTime(new Date()); + claTime.setTenantId(SecurityUtils.getLoginUser().getNowTenantId()); claTimeService.save(claTime); return APIResponse.toOkResponse(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessScCourseService.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessScCourseService.java index be6d435..2a31d50 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessScCourseService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessScCourseService.java @@ -11,6 +11,8 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.core.api.APIBaseResponse; import com.ruoyi.core.api.APIResponse; import com.ruoyi.core.api.ApiResEnums; +import com.ruoyi.mall.domain.Product; +import com.ruoyi.mall.service.ProductService; import com.ruoyi.school.course.domain.ScCourse; import com.ruoyi.school.course.domain.ScCourseCla; import com.ruoyi.school.course.domain.ScCourseType; @@ -46,7 +48,7 @@ public class BusinessScCourseService { @Autowired private ScCourseMapper courseMapper; @Autowired - private IScCourseChargeService courseChargeService; + private ProductService productService; @Autowired private BusinessSysDeptService deptService; @Autowired @@ -233,6 +235,11 @@ public class BusinessScCourseService { return APIResponse.toExceptionResponse("已有会员卡项使用,无法删除"); } + int productCount= productService.count(new QueryWrapper().in("course_id",courseIds)); + if (productCount != 0) { + return APIResponse.toExceptionResponse("已在商城上架,无法删除"); + } + boolean deleteScCourse = scCourseService.removeByIds(courseIds); if (deleteScCourse) { return APIResponse.toOkResponse(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/IScClaTimeAttendService.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/IScClaTimeAttendService.java index 6662bb9..5bfca66 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/IScClaTimeAttendService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/IScClaTimeAttendService.java @@ -46,10 +46,9 @@ public interface IScClaTimeAttendService extends com.baomidou.mybatisplus.extens * 消耗课时 * @param beginDate * @param endDate - * @param needAttend 是否应消 * @return */ - BigDecimal getAttendCostHour(String beginDate, String endDate, boolean needAttend); + BigDecimal getAttendCostHour(String beginDate, String endDate); /** * 教练获得课时数量 diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/IScCourseClaService.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/IScCourseClaService.java index 4fb75d9..59a9dc4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/IScCourseClaService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/IScCourseClaService.java @@ -14,12 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IScCourseClaService extends IService { - /** - * 班级在读会员数量 - * @param claId - * @return - */ - Integer selectStudentCnt(Long claId); + /** * 是否允许变更 班级所属课程 diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/impl/BusinessScCourseClaService.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/impl/BusinessScCourseClaService.java index a8a4325..36f93f3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/impl/BusinessScCourseClaService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/impl/BusinessScCourseClaService.java @@ -129,6 +129,8 @@ public class BusinessScCourseClaService { return APIResponse.toAPIResponse(resultMap); } + + @Autowired private IScClaTimeRuleService claTimeRuleService; diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/impl/ScClaTimeAttendServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/impl/ScClaTimeAttendServiceImpl.java index 1309227..9352988 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/impl/ScClaTimeAttendServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/impl/ScClaTimeAttendServiceImpl.java @@ -1,12 +1,12 @@ package com.ruoyi.school.course.service.impl; -import com.ruoyi.school.course.domain.req.time.ReqClaTimeCount; -import com.ruoyi.school.course.mapper.ScClaTimeAttendMapper; -import com.ruoyi.school.course.domain.ScClaTimeAttend; -import com.ruoyi.school.course.service.IScClaTimeAttendService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.school.course.domain.ScClaTimeAttend; +import com.ruoyi.school.course.domain.req.time.ReqClaTimeCount; +import com.ruoyi.school.course.mapper.ScClaTimeAttendMapper; +import com.ruoyi.school.course.service.IScClaTimeAttendService; import org.springframework.stereotype.Service; import java.math.BigDecimal; @@ -40,14 +40,12 @@ public class ScClaTimeAttendServiceImpl extends ServiceImpl().eq("tenant_id",tenantId)); int courseCnt = courseService.count(new QueryWrapper().eq("tenant_id",tenantId)); int studentCnt = studentService.count(new QueryWrapper().eq("tenant_id",tenantId)); - + //排课数 ReqClaTimeCount reqClaTimeCount = ReqClaTimeCount.builder().beginDate(todayDate).endDate(todayDate).hadBegin(null).tenantId(tenantId).build(); Integer todayClaTimeCnt = claTimeService.claTimeCount(reqClaTimeCount); - + // 今日已上课数量 reqClaTimeCount.setHadBegin(true); Integer completeTodayClaTimeCnt = claTimeService.claTimeCount(reqClaTimeCount); - + //今日报名 Integer todayOrderCnt = orderService.orderCount(todayDate, todayDate, OrderTypeEnum.SIGN_UP.getOrderType()); + // 本月报名 Integer thisMonthOrderCnt = orderService.orderCount(thisMonthBegin, thisMonthEnd, OrderTypeEnum.SIGN_UP.getOrderType()); + // 今日上课应到人次（预约人数） Integer todayNeedAttendCnt = attendService.getNeedAttendCount(todayDate, todayDate); + // 今日上课实到课人次（签到人数） Integer todayRealAttendCnt = attendService.getAttendCount(todayDate, todayDate, new String[]{ClaTimeAttendStatusEnums.AT_CLASS.getAttendStatus()}); // BigDecimal todayNeedCostHour = attendService.getAttendCostHour(todayDate, todayDate, true); - BigDecimal todayRealCostHour = attendService.getAttendCostHour(todayDate, todayDate, false); + //今日实收费用 + BigDecimal todayRealCostHour = attendService.getAttendCostHour(todayDate, todayDate); + //费用少于200元 Integer feeWillExpireCnt = memberCardMapper.selectFeeWillExpireCards(200); + //5天内要过期的 Integer dateWillExpireCnt = memberCardMapper.selectExpiringCards(5).size(); + //还剩10节课以内的 Integer hourWillExpireCnt = memberCardMapper.selectHourWillExpireCards(10); return DashboardData.builder() diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCard.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCard.java index 268962c..f5f3eaa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCard.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCard.java @@ -28,7 +28,7 @@ public class ScMemberCard implements Serializable { /** * 主键ID */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id") private Long id; @TableField(value = "tenant_id") diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCardCharge.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCardCharge.java index 8d4bb05..a6f5994 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCardCharge.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCardCharge.java @@ -1,6 +1,5 @@ package com.ruoyi.school.member.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -26,7 +25,7 @@ public class ScMemberCardCharge implements Serializable { /** * id */ - @TableId(value = "charge_id",type = IdType.AUTO ) + @TableId(value = "charge_id") private Long chargeId; private Long cardTypeId; diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCardCourses.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCardCourses.java index 9680305..473f864 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCardCourses.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCardCourses.java @@ -1,6 +1,5 @@ package com.ruoyi.school.member.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -27,11 +26,13 @@ public class ScMemberCardCourses implements Serializable { /** * id */ - @TableId(value = "id",type = IdType.AUTO ) + @TableId(value = "id") private Long id; private Long cardTypeId; private Long courseTypeId; + + private Long course_id; @TableField(value = "courses", typeHandler = LongArrayTypeHandler.class) private Long[] courses; diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCardTeacher.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCardTeacher.java new file mode 100644 index 0000000..7614634 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCardTeacher.java @@ -0,0 +1,37 @@ +package com.ruoyi.school.member.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + *

+ * 会员卡信息 + *

+ * + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName(value = "sc_member_card_teachers",autoResultMap = true) +public class ScMemberCardTeacher implements Serializable { + + + /** + * id + */ + @TableId(value = "id") + private Long id; + + private Long cardTypeId; + @TableField("user_id") + private Long teacherId; + + +} + diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCardTypes.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCardTypes.java index 1fa939f..ddab9de 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCardTypes.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScMemberCardTypes.java @@ -35,7 +35,7 @@ public class ScMemberCardTypes implements Serializable { /** * id */ - @TableId(value = "card_type_id",type = IdType.AUTO) + @TableId(value = "card_type_id") private Long cardTypeId; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/resp/MemberCardDTO.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/resp/MemberCardDTO.java index 55462c0..0295de0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/resp/MemberCardDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/resp/MemberCardDTO.java @@ -104,6 +104,8 @@ public class MemberCardDTO { private int pageNum; private int pageSize; + private String startDate; + private String endDate; /** * 从实体转换为DTO diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardServiceImpl.java index a8ec38f..215f1ad 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardServiceImpl.java @@ -345,7 +345,7 @@ public class ScMemberCardServiceImpl extends ServiceImpl imp } dept.setAncestors(info.getAncestors() + "," + dept.getParentId()); dept.setTenantId(SecurityUtils.getLoginUser().getNowTenantId()); + dept.setDeptId(IdGenerator.nextId()); int i= deptMapper.insertDept(dept); if (dept.getDeptType().equals("2")){ //校区 新增门店介绍 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java index e47f551..22ceb6d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java @@ -12,6 +12,7 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.page.RespPage; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.uuid.IdGenerator; import com.ruoyi.system.domain.SysTenant; import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.domain.columns.YjStore; @@ -166,6 +167,7 @@ public class SysTenantServiceImpl extends ServiceImpl 0; } diff --git a/ruoyi-system/src/main/resources/mapper/school/course/ScClaTimeAttendMapper.xml b/ruoyi-system/src/main/resources/mapper/school/course/ScClaTimeAttendMapper.xml index adf25bc..e95352d 100644 --- a/ruoyi-system/src/main/resources/mapper/school/course/ScClaTimeAttendMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/school/course/ScClaTimeAttendMapper.xml @@ -45,31 +45,29 @@ and exists(select 1 from sc_cla_time b where a.course_time_id=b.course_time_id and b.real_cla_date between #{beginDate} and #{endDate} ) select b.*, fcn_dict_name_list(b.week_day,'week_day') as week_day_name, - a.cla_name,c.course_name,d.nick_name staff_name - from sc_course_cla a, sc_cla_time_rule b, sc_course c, sys_user d - where a.cla_id = b.cla_id and a.course_id=c.course_id and b.teacher_id=d.user_id and a.tenant_id=#{reqSearchScClaTimeRule.tenantId} + a.cla_name, + c.course_name, + d.nick_name staff_name + from sc_course_cla a, + sc_cla_time_rule b, + sc_course c, + sys_user d + where + a.cla_id = b.cla_id + and a.course_id=c.course_id + and b.teacher_id=d.user_id + and a.tenant_id=#{reqSearchScClaTimeRule.tenantId} + and a.depart_id=#{reqSearchScClaTimeRule.deptId} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index 4e948c8..64f6b92 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dept_name=#{deptName} and parent_id = #{parentId} limit 1 - + insert into sys_dept( dept_id, parent_id, diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 18e9388..1ed21d9 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -157,7 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into sys_user( user_id, dept_id,