From a8e83d12274b776b215895273e7021c4eb2ba789 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 05 六月 2025 09:54:07 +0800
Subject: [PATCH] 小程序接口 发布优化 首页放行
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java | 79 +++++++++++++++++++++++++++++++++++++++
1 files changed, 78 insertions(+), 1 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java
index 6b9d862..67502ea 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java
@@ -1,18 +1,24 @@
package com.ruoyi.web.controller.system;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.BasePage;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.*;
import com.ruoyi.system.model.*;
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.IndexCompanyListVo;
import com.ruoyi.system.vo.MyPushCompanyListVo;
import io.swagger.annotations.Api;
@@ -24,11 +30,13 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
@Slf4j
@RestController
-@RequestMapping("/user")
+@RequestMapping("/company")
@Api(tags = "发布模块")
public class CompanyController {
@@ -46,6 +54,15 @@
@Autowired
private TbScheduleService scheduleService;
+
+ @Autowired
+ private TbMessageService messageService;
+
+ @Autowired
+ private TbLicenceService licenceService;
+
+ @Autowired
+ private TbCompanyTypeService companyTypeService;
@@ -65,11 +82,29 @@
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);
+ }
+
@ApiOperation(value = "立即发布",tags = {"发布模块"})
@PostMapping("/pushCompany")
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();
}
@@ -79,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();
}
@@ -133,7 +176,9 @@
return R.fail("该订单状态不需要确认");
}
order.setStatus(3);
+ order.setConfirmTime(new Date());
order.updateById();
+
return R.ok();
}
@@ -160,6 +205,12 @@
}
order.setStatus(3);
order.updateById();
+
+ company.setStatus(1);
+ company.updateById();
+
+
+ messageService.addMessage("您有订单被取消", order.getUserId(),order.getId());
return R.ok();
}
@@ -177,9 +228,21 @@
return R.fail("非法操作");
}
scheduleService.addSchedule(dto,userId);
+
+ messageService.addMessage("您有订单卖家已完成,等待确认", order.getUserId(),order.getId());
return R.ok();
}
+
+ public static void main(String[] args) {
+ HttpRequest post = HttpUtil.createPost("https://shuimui.szsmjr.com/index/index/result");
+ HashMap<String, String> stringStringHashMap = new HashMap<>();
+ stringStringHashMap.put("Origin","https://shuimui.szsmjr.com");
+ post.addHeaders(stringStringHashMap);
+ post.body("{\"sn\":\""+"ZZD20250321019744801521301"+"\"}");
+ HttpResponse execute = post.execute();
+ System.out.println(execute.body());
+ }
@@ -204,11 +267,25 @@
return R.fail("该订单状态不能完成");
}
order.setStatus(5);
+ order.setSellerFinishTime(new Date());
order.updateById();
+
+ messageService.addMessage("您有订单卖家已完成,等待确认", order.getUserId(),orderId);
return R.ok();
}
+ @ApiOperation(value = "公司详情",tags = {"发布模块"})
+ @GetMapping("/companyDetail")
+ public R<CompanyDetailVo> companyDetail(@RequestParam String companyId) {
+ if(StringUtils.isEmpty(companyId)){
+ return R.fail("参数错误");
+ }
+ LoginUser loginUser = tokenService.getLoginUser();
+ Long userId = loginUser.getUserId();
+ CompanyDetailVo companyDetailVo = tbCompanyService.companyDetail(companyId,userId);
+ return R.ok(companyDetailVo);
+ }
}
--
Gitblit v1.7.1