Merge branch 'master' of http://115.29.66.169:10080/new-base-shop/api

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shop/business/BusinessCategoryRelationController.java

@@ -0,0 +1,58 @@
+package com.ruoyi.web.controller.shop.business;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.ruoyi.business.domain.bo.BusinessCategoryRelationBo;
+import com.ruoyi.business.domain.vo.BusinessCategoryRelationVo;
+import com.ruoyi.business.service.IBusinessCategoryRelationService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 商家分类关联Controller
+ *
+ * @author ruoyi
+ * @date 2026-04-08
+ */
+@Validated
+@Api(value = "商家分类关联控制器", tags = {"商家分类关联管理"})
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/business/businessCategoryRelation")
+public class BusinessCategoryRelationController extends BaseController {
+
+    private final IBusinessCategoryRelationService iBusinessCategoryRelationService;
+
+    /**
+     * 查商家下分类列表
+     */
+    @ApiOperation("查询商品分类列表")
+    @GetMapping("/list")
+    public R<List<BusinessCategoryRelationVo>> list(@Validated(QueryGroup.class) BusinessCategoryRelationBo bo) {
+        return R.ok(iBusinessCategoryRelationService.queryList(bo));
+    }
+
+    /**
+     * 新增商家分类关联
+     */
+    @ApiOperation("新增商家分类关联")
+    @SaCheckPermission("business:businessCategoryRelation:add")
+    @Log(title = "商家分类关联", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/add")
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody List<BusinessCategoryRelationBo> bos) {
+        return toAjax(iBusinessCategoryRelationService.insertByBo(bos) ? 1 : 0);
+    }
+
+}

ruoyi-business/src/main/java/com/ruoyi/business/domain/BusinessCategory.java

@@ -41,5 +41,9 @@ public class BusinessCategory extends BaseEntity {
      */
     @TableLogic
     private Integer delFlag;
+    /**
+     * 分类图标
+     */
+    private String categoryIcon;
 
 }

ruoyi-business/src/main/java/com/ruoyi/business/domain/BusinessCategoryRelation.java

@@ -0,0 +1,44 @@
+package com.ruoyi.business.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 商家分类关联对象 tb_business_category_relation
+ *
+ * @author ruoyi
+ * @date 2026-04-08
+ */
+@Data
+@TableName("tb_business_category_relation")
+public class BusinessCategoryRelation implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 商家ID
+     */
+    @TableId(value = "relation_id")
+    private Long relationId;
+    /**
+     * 商家ID
+     */
+    private Long businessId;
+    /**
+     * 分类ID
+     */
+    private Long categoryId;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+}

ruoyi-business/src/main/java/com/ruoyi/business/domain/bo/BusinessCategoryBo.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -65,4 +66,11 @@ public class BusinessCategoryBo extends BaseEntity {
     @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
+
+    /**
+     * 分类图标
+     */
+    @ApiModelProperty(value = "分类图标")
+    @FilePathValue
+    private String categoryIcon;
 }

ruoyi-business/src/main/java/com/ruoyi/business/domain/bo/BusinessCategoryRelationBo.java

@@ -0,0 +1,48 @@
+package com.ruoyi.business.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 商家分类关联业务对象 tb_business_category_relation
+ *
+ * @author ruoyi
+ * @date 2026-04-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("商家分类关联业务对象")
+public class BusinessCategoryRelationBo extends BaseEntity {
+
+    /**
+     * 商家ID
+     */
+    @ApiModelProperty(value = "商家ID", required = true)
+    @NotNull(message = "商家ID不能为空", groups = { EditGroup.class })
+    private Long relationId;
+
+    /**
+     * 商家ID
+     */
+    @ApiModelProperty(value = "商家ID", required = true)
+    @NotNull(message = "商家ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long businessId;
+
+    /**
+     * 分类ID
+     */
+    @ApiModelProperty(value = "分类ID", required = true)
+    @NotNull(message = "分类ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long categoryId;
+
+
+}

ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/BusinessCategoryRelationVo.java

@@ -0,0 +1,48 @@
+package com.ruoyi.business.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 商家分类关联视图对象 tb_business_category_relation
+ *
+ * @author ruoyi
+ * @date 2026-04-08
+ */
+@Data
+@ApiModel("商家分类关联视图对象")
+@ExcelIgnoreUnannotated
+public class BusinessCategoryRelationVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 商家ID
+     */
+    @ExcelProperty(value = "商家ID")
+    @ApiModelProperty("商家ID")
+    private Long relationId;
+
+    /**
+     * 商家ID
+     */
+    @ExcelProperty(value = "商家ID")
+    @ApiModelProperty("商家ID")
+    private Long businessId;
+
+    /**
+     * 分类ID
+     */
+    @ExcelProperty(value = "分类ID")
+    @ApiModelProperty("分类ID")
+    private Long categoryId;
+
+
+}

ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/BusinessCategoryVo.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
 import com.ruoyi.common.core.domain.BaseVo;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -51,6 +52,11 @@ public class BusinessCategoryVo extends BaseVo {
     @ExcelDictFormat(readConverterExp = "1=：上架，0：下架")
     @ApiModelProperty("是否上架（1：上架，0：下架）")
     private Boolean shelvedStatus;
-
+    /**
+     * 分类图标
+     */
+    @ApiModelProperty(value = "分类图标")
+    @FilePathValue
+    private String categoryIcon;
 
 }

ruoyi-business/src/main/java/com/ruoyi/business/exception/BusinessCategoryRelationExceptionEnum.java

@@ -0,0 +1,53 @@
+package com.ruoyi.business.exception;
+
+import com.ruoyi.common.enums.IIntegerEnum;
+import java.util.Objects;
+
+
+/**
+ * 异常枚举
+ */
+public enum BusinessCategoryRelationExceptionEnum implements IIntegerEnum {
+
+    // TODO 注意检查错误码，保证系统内唯一
+    BusinessCategoryRelation_IS_NOT_EXISTS(560001, "商家分类关联不存在"),
+
+    ;
+
+    private Integer code;
+
+    private String msg;
+
+    BusinessCategoryRelationExceptionEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    @Override
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    @Override
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public static BusinessCategoryRelationExceptionEnum getByCode(int code, BusinessCategoryRelationExceptionEnum[] values) {
+        for (BusinessCategoryRelationExceptionEnum value : values) {
+            if (Objects.equals(code, value.getCode())) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+}

ruoyi-business/src/main/java/com/ruoyi/business/mapper/BusinessCategoryRelationMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.business.mapper;
+
+import com.ruoyi.business.domain.BusinessCategoryRelation;
+import com.ruoyi.business.domain.vo.BusinessCategoryRelationVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 商家分类关联Mapper接口
+ *
+ * @author ruoyi
+ * @date 2026-04-08
+ */
+public interface BusinessCategoryRelationMapper extends BaseMapperPlus<BusinessCategoryRelationMapper, BusinessCategoryRelation, BusinessCategoryRelationVo> {
+
+}

ruoyi-business/src/main/java/com/ruoyi/business/service/IBusinessCategoryRelationService.java

@@ -0,0 +1,77 @@
+package com.ruoyi.business.service;
+
+import com.ruoyi.business.domain.BusinessCategoryRelation;
+import com.ruoyi.business.domain.vo.BusinessCategoryRelationVo;
+import com.ruoyi.business.domain.bo.BusinessCategoryRelationBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 商家分类关联Service接口
+ *
+ * @author ruoyi
+ * @date 2026-04-08
+ */
+public interface IBusinessCategoryRelationService {
+
+    /**
+     * 查询商家分类关联分页
+     *
+     * @param bo 商家分类关联
+     * @return 商家分类关联集合
+     */
+    TableDataInfo<BusinessCategoryRelationVo> queryPageList(BusinessCategoryRelationBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询商家分类关联列表
+     *
+     * @param bo 商家分类关联
+     * @return 商家分类关联集合
+     */
+    List<BusinessCategoryRelationVo> queryList(BusinessCategoryRelationBo bo);
+
+    /**
+     * 查询商家分类关联
+     *
+     * @param relationId 商家分类关联主键
+     * @return 商家分类关联
+     */
+    BusinessCategoryRelationVo queryById(Long relationId);
+
+    /**
+     * 详情商家分类关联
+     *
+     * @param relationId 商家分类关联主键
+     * @return 商家分类关联
+     */
+    BusinessCategoryRelation loadById(Long relationId, Boolean tw);
+
+    /**
+     * 新增商家分类关联
+     *
+     * @param bo 商家分类关联
+     * @return 结果
+     */
+    Boolean insertByBo(List<BusinessCategoryRelationBo> bos);
+
+    /**
+     * 修改商家分类关联
+     *
+     * @param bo 商家分类关联
+     * @return 结果
+     */
+    Boolean updateByBo(BusinessCategoryRelationBo bo);
+
+    /**
+     * 校验并批量删除商家分类关联信息
+     *
+     * @param ids 需要删除的商家分类关联主键集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return 结果
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+}

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BusinessCategoryRelationServiceImpl.java

@@ -0,0 +1,159 @@
+package com.ruoyi.business.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.business.domain.BusinessCategoryRelation;
+import com.ruoyi.business.domain.bo.BusinessCategoryRelationBo;
+import com.ruoyi.business.domain.vo.BusinessCategoryRelationVo;
+import com.ruoyi.business.exception.BusinessCategoryRelationExceptionEnum;
+import com.ruoyi.business.mapper.BusinessCategoryRelationMapper;
+import com.ruoyi.business.service.IBusinessCategoryRelationService;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.BeanCopyUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * 商家分类关联Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2026-04-08
+ */
+@RequiredArgsConstructor
+@Service
+public class BusinessCategoryRelationServiceImpl implements IBusinessCategoryRelationService {
+
+    private final BusinessCategoryRelationMapper baseMapper;
+
+    /**
+     * 查询商家分类关联分页
+     *
+     * @param bo 商家分类关联
+     * @return 商家分类关联
+     */
+    @Override
+    public TableDataInfo<BusinessCategoryRelationVo> queryPageList(BusinessCategoryRelationBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<BusinessCategoryRelation> lqw = buildQueryWrapper(bo);
+        Page<BusinessCategoryRelationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询商家分类关联列表
+     *
+     * @param bo 商家分类关联
+     * @return 商家分类关联
+     */
+    @Override
+    public List<BusinessCategoryRelationVo> queryList(BusinessCategoryRelationBo bo) {
+        LambdaQueryWrapper<BusinessCategoryRelation> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<BusinessCategoryRelation> buildQueryWrapper(BusinessCategoryRelationBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<BusinessCategoryRelation> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getBusinessId() != null, BusinessCategoryRelation::getBusinessId, bo.getBusinessId());
+        lqw.eq(bo.getCategoryId() != null, BusinessCategoryRelation::getCategoryId, bo.getCategoryId());
+        return lqw;
+    }
+
+    /**
+     * 查询商家分类关联
+     *
+     * @param relationId 商家分类关联主键
+     * @return 商家分类关联
+     */
+    @Override
+    public BusinessCategoryRelationVo queryById(Long relationId){
+        return baseMapper.selectVoById(relationId);
+    }
+
+    /**
+     * 详情商家分类关联
+     *
+     * @param relationId 商家分类关联主键
+     * @return 商家分类关联
+     */
+    @Override
+    public BusinessCategoryRelation loadById(Long relationId, Boolean tw){
+        BusinessCategoryRelation info = this.baseMapper.selectById(relationId);
+        if(ObjectUtil.isEmpty(info) && tw){
+            throw new ServiceException(BusinessCategoryRelationExceptionEnum.BusinessCategoryRelation_IS_NOT_EXISTS);
+        }
+        return info;
+    }
+
+    /**
+     * 新增商家分类关联
+     *
+     * @param bos 商家分类关联
+     * @return 结果
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Boolean insertByBo(List<BusinessCategoryRelationBo> bos) {
+        //判断是不是同一个商家
+        Set<Long> businessIds = bos.stream()
+            .map(BusinessCategoryRelationBo::getBusinessId)
+            .collect(Collectors.toSet());
+        if (businessIds.size() > 1) {
+            throw new ServiceException("批量操作仅支持同一商家的分类关联");
+        }
+        Long businessId = businessIds.iterator().next();
+        //先删除
+        baseMapper.delete(new LambdaQueryWrapper<BusinessCategoryRelation>().eq(BusinessCategoryRelation::getBusinessId, businessId));
+        //在添加
+        return baseMapper.insertBatch(BeanCopyUtils.copyList(bos, BusinessCategoryRelation.class));
+    }
+
+    /**
+     * 修改商家分类关联
+     *
+     * @param bo 商家分类关联
+     * @return 结果
+     */
+    @Override
+    public Boolean updateByBo(BusinessCategoryRelationBo bo) {
+        BusinessCategoryRelation businessCategoryRelation = baseMapper.selectById(bo.getRelationId());
+        BusinessCategoryRelation update = BeanCopyUtils.copy(bo, businessCategoryRelation);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(BusinessCategoryRelation entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除商家分类关联
+     *
+     * @param ids 需要删除的商家分类关联主键
+     * @return 结果
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+}

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BusinessServiceImpl.java

@@ -188,8 +188,6 @@ public class BusinessServiceImpl implements IBusinessService {
         lqw.eq(StringUtils.isNotBlank(bo.getCityCode()), Business::getCityCode, bo.getCityCode());
         lqw.eq(StringUtils.isNotBlank(bo.getAreaCode()), Business::getAreaCode, bo.getAreaCode());
         lqw.like(StringUtils.isNotBlank(bo.getAddress()), Business::getAddress, bo.getAddress());
-        lqw.eq(StringUtils.isNotBlank(bo.getLongitude()), Business::getLongitude, bo.getLongitude());
-        lqw.eq(StringUtils.isNotBlank(bo.getLatitude()), Business::getLatitude, bo.getLatitude());
         lqw.like(StringUtils.isNotBlank(bo.getEntityName()), Business::getEntityName, bo.getEntityName());
         lqw.eq(StringUtils.isNotBlank(bo.getTaxNumber()), Business::getTaxNumber, bo.getTaxNumber());
         lqw.like(StringUtils.isNotBlank(bo.getContactPerson()), Business::getContactPerson, bo.getContactPerson());

ruoyi-business/src/main/resources/mapper/business/BusinessCategoryMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="createBy" column="create_by"/>
         <result property="updateBy" column="update_by"/>
+        <result property="categoryIcon" column="category_icon"/>
     </resultMap>
 
 

ruoyi-business/src/main/resources/mapper/business/BusinessCategoryRelationMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.business.mapper.BusinessCategoryRelationMapper">
+
+    <resultMap type="com.ruoyi.business.domain.BusinessCategoryRelation" id="BusinessCategoryRelationResult">
+        <result property="relationId" column="relation_id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="categoryId" column="category_id"/>
+        <result property="createTime" column="create_time"/>
+    </resultMap>
+
+
+</mapper>