diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/BSellerController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/BSellerController.java new file mode 100644 index 000000000..324e6b041 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/BSellerController.java @@ -0,0 +1,105 @@ +package org.dromara.system.controller.system; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.system.domain.vo.BSellerVo; +import org.dromara.system.domain.bo.BSellerBo; +import org.dromara.system.service.IBSellerService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 卖家信息 + * + * @author Lion Li + * @date 2025-09-12 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/seller") +public class BSellerController extends BaseController { + + private final IBSellerService bSellerService; + + /** + * 查询卖家信息列表 + */ + @SaCheckPermission("system:seller:list") + @GetMapping("/list") + public TableDataInfo list(BSellerBo bo, PageQuery pageQuery) { + return bSellerService.queryPageList(bo, pageQuery); + } + + /** + * 导出卖家信息列表 + */ + @SaCheckPermission("system:seller:export") + @Log(title = "卖家信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(BSellerBo bo, HttpServletResponse response) { + List list = bSellerService.queryList(bo); + ExcelUtil.exportExcel(list, "卖家信息", BSellerVo.class, response); + } + + /** + * 获取卖家信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("system:seller:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(bSellerService.queryById(id)); + } + + /** + * 新增卖家信息 + */ + @SaCheckPermission("system:seller:add") + @Log(title = "卖家信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody BSellerBo bo) { + return toAjax(bSellerService.insertByBo(bo)); + } + + /** + * 修改卖家信息 + */ + @SaCheckPermission("system:seller:edit") + @Log(title = "卖家信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody BSellerBo bo) { + return toAjax(bSellerService.updateByBo(bo)); + } + + /** + * 删除卖家信息 + * + * @param ids 主键串 + */ + @SaCheckPermission("system:seller:remove") + @Log(title = "卖家信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(bSellerService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/BSellerSortController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/BSellerSortController.java new file mode 100644 index 000000000..a8b81f490 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/BSellerSortController.java @@ -0,0 +1,105 @@ +package org.dromara.system.controller.system; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.system.domain.vo.BSellerSortVo; +import org.dromara.system.domain.bo.BSellerSortBo; +import org.dromara.system.service.IBSellerSortService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 上麦顺序 + * + * @author Lion Li + * @date 2025-09-12 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/sellerSort") +public class BSellerSortController extends BaseController { + + private final IBSellerSortService bSellerSortService; + + /** + * 查询上麦顺序列表 + */ + @SaCheckPermission("system:sellerSort:list") + @GetMapping("/list") + public TableDataInfo list(BSellerSortBo bo, PageQuery pageQuery) { + return bSellerSortService.queryPageList(bo, pageQuery); + } + + /** + * 导出上麦顺序列表 + */ + @SaCheckPermission("system:sellerSort:export") + @Log(title = "上麦顺序", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(BSellerSortBo bo, HttpServletResponse response) { + List list = bSellerSortService.queryList(bo); + ExcelUtil.exportExcel(list, "上麦顺序", BSellerSortVo.class, response); + } + + /** + * 获取上麦顺序详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("system:sellerSort:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(bSellerSortService.queryById(id)); + } + + /** + * 新增上麦顺序 + */ + @SaCheckPermission("system:sellerSort:add") + @Log(title = "上麦顺序", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody BSellerSortBo bo) { + return toAjax(bSellerSortService.insertByBo(bo)); + } + + /** + * 修改上麦顺序 + */ + @SaCheckPermission("system:sellerSort:edit") + @Log(title = "上麦顺序", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody BSellerSortBo bo) { + return toAjax(bSellerSortService.updateByBo(bo)); + } + + /** + * 删除上麦顺序 + * + * @param ids 主键串 + */ + @SaCheckPermission("system:sellerSort:remove") + @Log(title = "上麦顺序", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(bSellerSortService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/BSeller.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/BSeller.java new file mode 100644 index 000000000..c9b386261 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/BSeller.java @@ -0,0 +1,62 @@ +package org.dromara.system.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 卖家信息对象 b_seller + * + * @author Lion Li + * @date 2025-09-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("b_seller") +public class BSeller extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "id") + private Long id; + + /** + * 卖家昵称 + */ + private String nickName; + + /** + * 卖家电话 + */ + private String phone; + + /** + * 真实姓名 + */ + private String name; + + /** + * 卖家地址 + */ + private String address; + + /** + * 卖家备注 + */ + private String remark; + + /** + * 删除标志（0代表存在 1代表删除） + */ + @TableLogic + private String delFlag; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/BSellerSort.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/BSellerSort.java new file mode 100644 index 000000000..d9fc9b14a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/BSellerSort.java @@ -0,0 +1,48 @@ +package org.dromara.system.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 上麦顺序对象 b_seller_sort + * + * @author Lion Li + * @date 2025-09-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("b_seller_sort") +public class BSellerSort extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "id") + private Long id; + + /** + * 卖家id + */ + private Long sellerId; + + /** + * 上麦时间 + */ + private Date payDate; + + /** + * 顺序 + */ + private Long sort; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Order.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Order.java index ac6781dc4..ec7e99e99 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Order.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Order.java @@ -115,7 +115,7 @@ public class Order extends TenantEntity { /** * 购买日期 */ - private String buyData; + private Date buyData; /** * 支付时间 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/BSellerBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/BSellerBo.java new file mode 100644 index 000000000..e90da4180 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/BSellerBo.java @@ -0,0 +1,55 @@ +package org.dromara.system.domain.bo; + +import org.dromara.system.domain.BSeller; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 卖家信息业务对象 b_seller + * + * @author Lion Li + * @date 2025-09-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = BSeller.class, reverseConvertGenerate = false) +public class BSellerBo extends BaseEntity { + + /** + * + */ + private Long id; + + /** + * 卖家昵称 + */ + @NotBlank(message = "卖家昵称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String nickName; + + /** + * 卖家电话 + */ + private String phone; + + /** + * 真实姓名 + */ + private String name; + + /** + * 卖家地址 + */ + private String address; + + /** + * 卖家备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/BSellerSortBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/BSellerSortBo.java new file mode 100644 index 000000000..0452ec82f --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/BSellerSortBo.java @@ -0,0 +1,49 @@ +package org.dromara.system.domain.bo; + +import org.dromara.system.domain.BSellerSort; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 上麦顺序业务对象 b_seller_sort + * + * @author Lion Li + * @date 2025-09-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = BSellerSort.class, reverseConvertGenerate = false) +public class BSellerSortBo extends BaseEntity { + + /** + * + */ + private Long id; + + /** + * 卖家id + */ + @NotNull(message = "卖家id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long sellerId; + + /** + * 上麦时间 + */ + @NotNull(message = "上麦时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date payDate; + + /** + * 顺序 + */ + @NotNull(message = "顺序不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long sort; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/OrderBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/OrderBo.java index 7ea6e272b..8fe9de7e7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/OrderBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/OrderBo.java @@ -113,7 +113,7 @@ public class OrderBo extends BaseEntity { * 购买日期 */ @NotBlank(message = "购买日期不能为空", groups = { AddGroup.class, EditGroup.class }) - private String buyData; + private Date buyData; /** * 支付时间 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/BSellerSortVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/BSellerSortVo.java new file mode 100644 index 000000000..4690e6007 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/BSellerSortVo.java @@ -0,0 +1,58 @@ +package org.dromara.system.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.system.domain.BSellerSort; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 上麦顺序视图对象 b_seller_sort + * + * @author Lion Li + * @date 2025-09-12 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = BSellerSort.class) +public class BSellerSortVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @ExcelProperty(value = "") + private Long id; + + /** + * 卖家id + */ + @ExcelProperty(value = "卖家id") + private Long sellerId; + + /** + * 上麦时间 + */ + @ExcelProperty(value = "上麦时间") + private Date payDate; + + /** + * 顺序 + */ + @ExcelProperty(value = "顺序") + private Long sort; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/BSellerVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/BSellerVo.java new file mode 100644 index 000000000..361e54d62 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/BSellerVo.java @@ -0,0 +1,68 @@ +package org.dromara.system.domain.vo; + +import org.dromara.system.domain.BSeller; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 卖家信息视图对象 b_seller + * + * @author Lion Li + * @date 2025-09-12 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = BSeller.class) +public class BSellerVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @ExcelProperty(value = "") + private Long id; + + /** + * 卖家昵称 + */ + @ExcelProperty(value = "卖家昵称") + private String nickName; + + /** + * 卖家电话 + */ + @ExcelProperty(value = "卖家电话") + private String phone; + + /** + * 真实姓名 + */ + @ExcelProperty(value = "真实姓名") + private String name; + + /** + * 卖家地址 + */ + @ExcelProperty(value = "卖家地址") + private String address; + + /** + * 卖家备注 + */ + @ExcelProperty(value = "卖家备注") + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/OrderVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/OrderVo.java index f291c055d..a5b0c2dff 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/OrderVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/OrderVo.java @@ -155,7 +155,8 @@ public class OrderVo implements Serializable { * 购买日期 */ @ExcelProperty(value = "购买日期") - private String buyData; + @DateTimeFormat("yyyy-MM-dd") + private Date buyData; /** * 购买时间 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/BSellerMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/BSellerMapper.java new file mode 100644 index 000000000..fe2765798 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/BSellerMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.mapper; + +import org.dromara.system.domain.BSeller; +import org.dromara.system.domain.vo.BSellerVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 卖家信息Mapper接口 + * + * @author Lion Li + * @date 2025-09-12 + */ +public interface BSellerMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/BSellerSortMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/BSellerSortMapper.java new file mode 100644 index 000000000..2af235d4a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/BSellerSortMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.mapper; + +import org.dromara.system.domain.BSellerSort; +import org.dromara.system.domain.vo.BSellerSortVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 上麦顺序Mapper接口 + * + * @author Lion Li + * @date 2025-09-12 + */ +public interface BSellerSortMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IBSellerService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IBSellerService.java new file mode 100644 index 000000000..28b170231 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IBSellerService.java @@ -0,0 +1,68 @@ +package org.dromara.system.service; + +import org.dromara.system.domain.vo.BSellerVo; +import org.dromara.system.domain.bo.BSellerBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 卖家信息Service接口 + * + * @author Lion Li + * @date 2025-09-12 + */ +public interface IBSellerService { + + /** + * 查询卖家信息 + * + * @param id 主键 + * @return 卖家信息 + */ + BSellerVo queryById(Long id); + + /** + * 分页查询卖家信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 卖家信息分页列表 + */ + TableDataInfo queryPageList(BSellerBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的卖家信息列表 + * + * @param bo 查询条件 + * @return 卖家信息列表 + */ + List queryList(BSellerBo bo); + + /** + * 新增卖家信息 + * + * @param bo 卖家信息 + * @return 是否新增成功 + */ + Boolean insertByBo(BSellerBo bo); + + /** + * 修改卖家信息 + * + * @param bo 卖家信息 + * @return 是否修改成功 + */ + Boolean updateByBo(BSellerBo bo); + + /** + * 校验并批量删除卖家信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IBSellerSortService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IBSellerSortService.java new file mode 100644 index 000000000..0e4633084 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IBSellerSortService.java @@ -0,0 +1,68 @@ +package org.dromara.system.service; + +import org.dromara.system.domain.vo.BSellerSortVo; +import org.dromara.system.domain.bo.BSellerSortBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 上麦顺序Service接口 + * + * @author Lion Li + * @date 2025-09-12 + */ +public interface IBSellerSortService { + + /** + * 查询上麦顺序 + * + * @param id 主键 + * @return 上麦顺序 + */ + BSellerSortVo queryById(Long id); + + /** + * 分页查询上麦顺序列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 上麦顺序分页列表 + */ + TableDataInfo queryPageList(BSellerSortBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的上麦顺序列表 + * + * @param bo 查询条件 + * @return 上麦顺序列表 + */ + List queryList(BSellerSortBo bo); + + /** + * 新增上麦顺序 + * + * @param bo 上麦顺序 + * @return 是否新增成功 + */ + Boolean insertByBo(BSellerSortBo bo); + + /** + * 修改上麦顺序 + * + * @param bo 上麦顺序 + * @return 是否修改成功 + */ + Boolean updateByBo(BSellerSortBo bo); + + /** + * 校验并批量删除上麦顺序信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/BSellerServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/BSellerServiceImpl.java new file mode 100644 index 000000000..a5fd5a09a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/BSellerServiceImpl.java @@ -0,0 +1,135 @@ +package org.dromara.system.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.dromara.system.domain.bo.BSellerBo; +import org.dromara.system.domain.vo.BSellerVo; +import org.dromara.system.domain.BSeller; +import org.dromara.system.mapper.BSellerMapper; +import org.dromara.system.service.IBSellerService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 卖家信息Service业务层处理 + * + * @author Lion Li + * @date 2025-09-12 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class BSellerServiceImpl implements IBSellerService { + + private final BSellerMapper baseMapper; + + /** + * 查询卖家信息 + * + * @param id 主键 + * @return 卖家信息 + */ + @Override + public BSellerVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询卖家信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 卖家信息分页列表 + */ + @Override + public TableDataInfo queryPageList(BSellerBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的卖家信息列表 + * + * @param bo 查询条件 + * @return 卖家信息列表 + */ + @Override + public List queryList(BSellerBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(BSellerBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(BSeller::getId); + lqw.like(StringUtils.isNotBlank(bo.getNickName()), BSeller::getNickName, bo.getNickName()); + lqw.eq(StringUtils.isNotBlank(bo.getPhone()), BSeller::getPhone, bo.getPhone()); + lqw.like(StringUtils.isNotBlank(bo.getName()), BSeller::getName, bo.getName()); + lqw.eq(StringUtils.isNotBlank(bo.getAddress()), BSeller::getAddress, bo.getAddress()); + return lqw; + } + + /** + * 新增卖家信息 + * + * @param bo 卖家信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(BSellerBo bo) { + BSeller add = MapstructUtils.convert(bo, BSeller.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改卖家信息 + * + * @param bo 卖家信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(BSellerBo bo) { + BSeller update = MapstructUtils.convert(bo, BSeller.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(BSeller entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除卖家信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/BSellerSortServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/BSellerSortServiceImpl.java new file mode 100644 index 000000000..e53ab959a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/BSellerSortServiceImpl.java @@ -0,0 +1,134 @@ +package org.dromara.system.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.dromara.system.domain.bo.BSellerSortBo; +import org.dromara.system.domain.vo.BSellerSortVo; +import org.dromara.system.domain.BSellerSort; +import org.dromara.system.mapper.BSellerSortMapper; +import org.dromara.system.service.IBSellerSortService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 上麦顺序Service业务层处理 + * + * @author Lion Li + * @date 2025-09-12 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class BSellerSortServiceImpl implements IBSellerSortService { + + private final BSellerSortMapper baseMapper; + + /** + * 查询上麦顺序 + * + * @param id 主键 + * @return 上麦顺序 + */ + @Override + public BSellerSortVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询上麦顺序列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 上麦顺序分页列表 + */ + @Override + public TableDataInfo queryPageList(BSellerSortBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的上麦顺序列表 + * + * @param bo 查询条件 + * @return 上麦顺序列表 + */ + @Override + public List queryList(BSellerSortBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(BSellerSortBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(BSellerSort::getId); + lqw.eq(bo.getSellerId() != null, BSellerSort::getSellerId, bo.getSellerId()); + lqw.eq(bo.getPayDate() != null, BSellerSort::getPayDate, bo.getPayDate()); + lqw.eq(bo.getSort() != null, BSellerSort::getSort, bo.getSort()); + return lqw; + } + + /** + * 新增上麦顺序 + * + * @param bo 上麦顺序 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(BSellerSortBo bo) { + BSellerSort add = MapstructUtils.convert(bo, BSellerSort.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改上麦顺序 + * + * @param bo 上麦顺序 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(BSellerSortBo bo) { + BSellerSort update = MapstructUtils.convert(bo, BSellerSort.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(BSellerSort entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除上麦顺序信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/OrderServiceImpl.java index eaf6fa32c..a1ae6b2b0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/OrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/OrderServiceImpl.java @@ -103,7 +103,7 @@ public class OrderServiceImpl implements IOrderService { lqw.eq(bo.getTotalPrice() != null, Order::getTotalPrice, bo.getTotalPrice()); lqw.eq(bo.getRefundMoney() != null, Order::getRefundMoney, bo.getRefundMoney()); lqw.eq(StringUtils.isNotBlank(bo.getOrderStatus()), Order::getOrderStatus, bo.getOrderStatus()); - lqw.eq(StringUtils.isNotBlank(bo.getBuyData()), Order::getBuyData, bo.getBuyData()); + lqw.eq(bo.getBuyData()!=null, Order::getBuyData, bo.getBuyData()); lqw.eq(bo.getPayTime() != null, Order::getPayTime, bo.getPayTime()); lqw.eq(bo.getShipmentTime() != null, Order::getShipmentTime, bo.getShipmentTime()); lqw.eq(StringUtils.isNotBlank(bo.getShipmentImage()), Order::getShipmentImage, bo.getShipmentImage()); diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/BSellerMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/BSellerMapper.xml new file mode 100644 index 000000000..f81f15ec8 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/BSellerMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/BSellerSortMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/BSellerSortMapper.xml new file mode 100644 index 000000000..7310bd0dd --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/BSellerSortMapper.xml @@ -0,0 +1,7 @@ + + + + +