liujie
2025-06-03 ced35443353a013091a70a240c846e4344fec19d
小程序接口 发布
10个文件已添加
5个文件已修改
296 ■■■■■ 已修改文件
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/OrderController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TbCompanyTypeMapper.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TbLicenceMapper.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/TbCompanyType.java 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/TbLicence.java 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/TbOrder.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/TbCompanyTypeService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/TbLicenceService.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbCompanyServiceImpl.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbCompanyTypeServiceImpl.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbLicenceServiceImpl.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/vo/CompanyDetailVo.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TbCompanyTypeMapper.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TbLicenceMapper.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java
@@ -52,6 +52,12 @@
    @Autowired
    private TbMessageService messageService;
    @Autowired
    private TbLicenceService licenceService;
    @Autowired
    private TbCompanyTypeService companyTypeService;
    @ApiOperation(value = "获取我发布的公司",tags = {"发布模块"})
@@ -67,6 +73,20 @@
    @GetMapping("/getIndustryList")
    public R<Page<TbIndustry>> getIndustryList(BasePage page) {
        Page<TbIndustry> page1 = industryService.page(new Page<>(page.getPageNum(),page.getPageSize()),new LambdaQueryWrapper<TbIndustry>().orderByDesc(TbIndustry::getOrderNum));
        return R.ok(page1);
    }
    @ApiOperation(value = "获取许可证信息",tags = {"发布模块"})
    @GetMapping("/getCompanyTypeList")
    public R<Page<TbCompanyType>> getCompanyTypeList(BasePage page) {
        Page<TbCompanyType> page1 = companyTypeService.page(new Page<>(page.getPageNum(),page.getPageSize()),new LambdaQueryWrapper<TbCompanyType>().eq(TbCompanyType::getDelFlag,0).orderByDesc(TbCompanyType::getOrderNum));
        return R.ok(page1);
    }
    @ApiOperation(value = "获取许可证信息",tags = {"发布模块"})
    @GetMapping("/getLicenceList")
    public R<Page<TbLicence>> getLicenceList(BasePage page) {
        Page<TbLicence> page1 = licenceService.page(new Page<>(page.getPageNum(),page.getPageSize()),new LambdaQueryWrapper<TbLicence>().eq(TbLicence::getDelFlag,0).orderByDesc(TbLicence::getOrderNum));
        return R.ok(page1);
    }
@@ -219,6 +239,7 @@
            return R.fail("该订单状态不能完成");
        }
        order.setStatus(5);
        order.setSellerFinishTime(new Date());
        order.updateById();
        messageService.addMessage("您有订单卖家已完成,等待确认", order.getUserId(),orderId);
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/OrderController.java
@@ -23,6 +23,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.Date;
@Slf4j
@RestController
@@ -196,6 +197,7 @@
        // 订单完成  商品已售卖
        order.setStatus(6);
        order.updateById();
        order.setFinishTime( new Date());
        company.setStatus(3);
        // 分佣
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TbCompanyTypeMapper.java
New file
@@ -0,0 +1,17 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.model.TbCompanyType;
/**
 * <p>
 * 公司类型 Mapper 接口
 * </p>
 *
 * @author administrator
 * @since 2025-06-03
 */
public interface TbCompanyTypeMapper extends BaseMapper<TbCompanyType> {
}
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TbLicenceMapper.java
New file
@@ -0,0 +1,17 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.model.TbLicence;
/**
 * <p>
 * 许可证 Mapper 接口
 * </p>
 *
 * @author administrator
 * @since 2025-06-03
 */
public interface TbLicenceMapper extends BaseMapper<TbLicence> {
}
ruoyi-system/src/main/java/com/ruoyi/system/model/TbCompanyType.java
New file
@@ -0,0 +1,53 @@
package com.ruoyi.system.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;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
 * <p>
 * 公司类型
 * </p>
 *
 * @author administrator
 * @since 2025-06-03
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("tb_company_type")
public class TbCompanyType extends Model<TbCompanyType> {
    private static final long serialVersionUID = 1L;
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 类型名称
     */
    private String name;
    /**
     * 显示顺序
     */
    @TableField("order_num")
    private Integer orderNum;
    /**
     * 删除标志(0-未删除,1-已删除)
     */
    @TableField("del_flag")
    private Integer delFlag;
}
ruoyi-system/src/main/java/com/ruoyi/system/model/TbLicence.java
New file
@@ -0,0 +1,61 @@
package com.ruoyi.system.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;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
 * <p>
 * 许可证
 * </p>
 *
 * @author administrator
 * @since 2025-06-03
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("tb_licence")
public class TbLicence extends Model<TbLicence> {
    private static final long serialVersionUID = 1L;
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 许可证名称
     */
    @ApiModelProperty("许可证名称")
    private String name;
    /**
     * 显示顺序
     */
    @TableField("order_num")
    private Integer orderNum;
    /**
     * 许可证等级(多个等级用分号分隔,如:A级;B级;C级)
     */
    @TableField("grade_name")
    @ApiModelProperty("许可证等级(多个等级用分号分隔,如:A级;B级;C级)")
    private String gradeName;
    /**
     * 删除标志(0-未删除,1-已删除)
     */
    @TableField("del_flag")
    private Integer delFlag;
}
ruoyi-system/src/main/java/com/ruoyi/system/model/TbOrder.java
@@ -84,6 +84,13 @@
    private String outTradeNo;
    @TableField("finish_time")
    private Date finishTime;
    @TableField("seller_finish_time")
    private Date sellerFinishTime;
}
ruoyi-system/src/main/java/com/ruoyi/system/service/TbCompanyTypeService.java
New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.model.TbCompanyType;
/**
 * <p>
 * 公司类型 服务类
 * </p>
 *
 * @author administrator
 * @since 2025-06-03
 */
public interface TbCompanyTypeService extends IService<TbCompanyType> {
}
ruoyi-system/src/main/java/com/ruoyi/system/service/TbLicenceService.java
New file
@@ -0,0 +1,17 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.model.TbLicence;
/**
 * <p>
 * 许可证 服务类
 * </p>
 *
 * @author administrator
 * @since 2025-06-03
 */
public interface TbLicenceService extends IService<TbLicence> {
}
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbCompanyServiceImpl.java
@@ -58,6 +58,9 @@
    @Autowired
    private TbUserService userService;
    @Autowired
    private TbCompanyTypeService companyTypeService;
    @Override
    public Page<IndexCompanyListVo> getCompanyList(CompanyListQuery query, Long userId) {
        Page<TbCompany> page = new Page<>(query.getPageNum(), query.getPageSize());
@@ -120,8 +123,8 @@
            queryWrapper.orderByDesc(TbCompany::getCreateTime);
        }
        Page<TbCompany> companyPage = this.baseMapper.selectPage(page, queryWrapper);
        if(companyPage.getRecords().isEmpty()){
             return page1;
        if (companyPage.getRecords().isEmpty()) {
            return page1;
        }
        List<Integer> ids = companyPage.getRecords().stream().map(TbCompany::getCompanyIndustryId).collect(Collectors.toList());
        List<TbIndustry> tbIndustries = industryService.list(new LambdaQueryWrapper<TbIndustry>().in(TbIndustry::getId, ids));
@@ -214,6 +217,10 @@
        List<TbOpeningBank> list1 = openingBankService.list(new LambdaQueryWrapper<TbOpeningBank>().eq(TbOpeningBank::getCompanyId, companyId));
        companyDetailVo.setOpeningBanks(list1);
        Integer companyCategory = tbCompany.getCompanyCategory();
        TbCompanyType byId = companyTypeService.getById(companyCategory);
        companyDetailVo.setCompanyCategoryName(byId.getName());
        // 当前未产生订单
        if (tbCompany.getStatus() == 1) {
            companyDetailVo.setStatus(1);
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbCompanyTypeServiceImpl.java
New file
@@ -0,0 +1,21 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.mapper.TbCompanyTypeMapper;
import com.ruoyi.system.model.TbCompanyType;
import com.ruoyi.system.service.TbCompanyTypeService;
import org.springframework.stereotype.Service;
/**
 * <p>
 * 公司类型 服务实现类
 * </p>
 *
 * @author administrator
 * @since 2025-06-03
 */
@Service
public class TbCompanyTypeServiceImpl extends ServiceImpl<TbCompanyTypeMapper, TbCompanyType> implements TbCompanyTypeService {
}
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbLicenceServiceImpl.java
New file
@@ -0,0 +1,21 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.mapper.TbLicenceMapper;
import com.ruoyi.system.model.TbLicence;
import com.ruoyi.system.service.TbLicenceService;
import org.springframework.stereotype.Service;
/**
 * <p>
 * 许可证 服务实现类
 * </p>
 *
 * @author administrator
 * @since 2025-06-03
 */
@Service
public class TbLicenceServiceImpl extends ServiceImpl<TbLicenceMapper, TbLicence> implements TbLicenceService {
}
ruoyi-system/src/main/java/com/ruoyi/system/vo/CompanyDetailVo.java
@@ -27,9 +27,12 @@
    @ApiModelProperty("纳税信用等级")
    private String taxCredit;
    @ApiModelProperty("1个体工商户 2有限 3独资")
    @ApiModelProperty("1个体工商")
    private Integer companyCategory;
    @ApiModelProperty("公司类型名称")
    private String companyCategoryName;
    @ApiModelProperty("类型 所属行业")
    private String companyIndustryName;
ruoyi-system/src/main/resources/mapper/system/TbCompanyTypeMapper.xml
New file
@@ -0,0 +1,13 @@
<?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.system.mapper.TbCompanyTypeMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TbCompanyType">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="order_num" property="orderNum" />
        <result column="del_flag" property="delFlag" />
    </resultMap>
</mapper>
ruoyi-system/src/main/resources/mapper/system/TbLicenceMapper.xml
New file
@@ -0,0 +1,14 @@
<?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.system.mapper.TbLicenceMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TbLicence">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="order_num" property="orderNum" />
        <result column="grade_name" property="gradeName" />
        <result column="del_flag" property="delFlag" />
    </resultMap>
</mapper>