ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java
@@ -36,7 +36,7 @@ @Slf4j @RestController @RequestMapping("/user") @RequestMapping("/company") @Api(tags = "发布模块") public class CompanyController { @@ -101,6 +101,10 @@ public R<?> pushCompany(@Valid @RequestBody PushCompanyDto dto) { LoginUser loginUser = tokenService.getLoginUser(); Long userId = loginUser.getUserId(); long count = tbCompanyService.count(new LambdaQueryWrapper<TbCompany>().eq(TbCompany::getCompanyName, dto.getCompanyName()).ne(TbCompany::getStatus, 3)); if (count > 0) { return R.fail("该公司已发布"); } tbCompanyService.pushCompany(dto,userId); return R.ok(); } @@ -110,14 +114,22 @@ public R<?> editCompany(@Valid @RequestBody EditCompanyDto dto) { LoginUser loginUser = tokenService.getLoginUser(); Long userId = loginUser.getUserId(); TbCompany company = tbCompanyService.getById(dto.getId()); if (company == null || !company.getUserId().equals(userId.toString())) { return R.fail("非法操作"); } long count1 = tbCompanyService.count(new LambdaQueryWrapper<TbCompany>().eq(TbCompany::getCompanyName, dto.getCompanyName()).ne(TbCompany::getId,dto.getId()).ne(TbCompany::getStatus, 3)); if (count1 > 0) { return R.fail("该公司已发布"); } long count = orderService.count(new LambdaQueryWrapper<TbOrder>().eq(TbOrder::getCompanyId, dto.getId()).in(TbOrder::getStatus, 3, 4, 5)); if (count > 0) { return R.fail("订单状态不能修改"); } tbCompanyService.editCompany(dto,company,userId); return R.ok(); } ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyShopController.java
@@ -29,7 +29,7 @@ @Slf4j @RestController @RequestMapping("/user") @RequestMapping("/shop") @Api(tags = "商城模块") public class CompanyShopController { ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -112,7 +112,7 @@ .authorizeRequests() // 对于登录login 注册register 验证码captchaImage 允许匿名访问 .antMatchers( "/wxLogin/**","/order/WX/zxsCallback" "/wxLogin/**","/order/WX/zxsCallback","/shop/**","/company/companyDetail" ).permitAll() // 静态资源,可匿名访问 ruoyi-system/src/main/java/com/ruoyi/system/model/TbCompany.java
@@ -219,6 +219,10 @@ */ private String remark; /** * 1上架 2 下架 3已出售 4锁定中 * */ private Integer status; @TableField("create_time") private Date createTime; ruoyi-system/src/main/java/com/ruoyi/system/query/CompanyListQuery.java
@@ -18,6 +18,8 @@ @ApiModelProperty("区code") @NotBlank(message = "区code不能为空") private String areaCode; @ApiModelProperty("公司名称") private String companyName; @ApiModelProperty("公司类型 1个体工商 2有限责任 3独资") private List<Integer> companyCategorys; @ApiModelProperty("注册资本") ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbCompanyServiceImpl.java
@@ -1,9 +1,11 @@ package com.ruoyi.system.service.impl; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.dto.EditCompanyDto; import com.ruoyi.system.dto.PushCompanyDto; @@ -12,10 +14,7 @@ import com.ruoyi.system.query.CompanyListQuery; import com.ruoyi.system.query.MyPushCompanyListQuery; import com.ruoyi.system.service.*; import com.ruoyi.system.vo.CompanyDetailVo; import com.ruoyi.system.vo.CustomerInfoVo; import com.ruoyi.system.vo.IndexCompanyListVo; import com.ruoyi.system.vo.MyPushCompanyListVo; import com.ruoyi.system.vo.*; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -61,6 +60,9 @@ @Autowired private TbCompanyTypeService companyTypeService; @Autowired private RedisCache redisCache; @Override public Page<IndexCompanyListVo> getCompanyList(CompanyListQuery query, Long userId) { Page<TbCompany> page = new Page<>(query.getPageNum(), query.getPageSize()); @@ -77,6 +79,7 @@ } queryWrapper.eq(TbCompany::getCityCode, query.getCityCode()); queryWrapper.eq(TbCompany::getAreaCode, query.getAreaCode()); queryWrapper.like(StringUtils.isNotEmpty(query.getCompanyName()),TbCompany::getCompanyName, query.getCompanyName()); if (query.getCompanyCategorys() != null && query.getCompanyCategorys().size() > 0) { queryWrapper.in(TbCompany::getCompanyCategory, query.getCompanyCategorys()); @@ -249,6 +252,19 @@ TbUser user = userService.getById(order.getUserId()); companyDetailVo.setCustomerName(user.getUserName()); // 异常原因 List<Object> cacheList = redisCache.getCacheList("abnormal_" + companyId); if (cacheList.isEmpty()) { ArrayList<AbnormalVo> abnormalVos = new ArrayList<>(); for (Object o : cacheList) { AbnormalVo abnormalVo = JSONObject.parseObject(o.toString(), AbnormalVo.class); abnormalVos.add(abnormalVo); } companyDetailVo.setAbnormalVos(abnormalVos); }else { // TODO 企查查 次数查询加数据库 并加入缓存1天过期 } return companyDetailVo; } }