Skip to content

I
ims
提交 28dfc351 作者: 刘明祎-运维用途
操作

列表按时间，金额，地区排序

上级 21bc2fa2
流水线 #7070 已失败 于阶段
in 2 分 55 秒
正在显示 包含 112 行增加 和 61 行删除
csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/qo/RequirementsInfoQO.java 0 → 100644
package com.mmc.csf.infomation.qo;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author Admin
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class RequirementsInfoQO {
@ApiModelProperty(value = "是否按时间排序",example = "true")
private Boolean isNewRequirements;
@ApiModelProperty(value = "是否按金额排序",example = "true")
private Boolean isHighCommission;
@ApiModelProperty(value = "省份编码",example = "802323")
private Integer provinceCode;
@ApiModelProperty(value = "市编码", example = "802323")
private Integer cityCode;
@ApiModelProperty(value = "区编码", example = "802323")
private Integer districtCode;
}
release-service/src/main/java/com/mmc/csf/release/controller/RequirementsController.java
......@@ -2,10 +2,7 @@ package com.mmc.csf.release.controller;
import com.mmc.csf.common.util.web.ResultBody;
import com.mmc.csf.infomation.dto.*;
import com.mmc.csf.infomation.qo.AgreeOrRefusePilotQO;
import com.mmc.csf.infomation.qo.IndustryCaseQO;
import com.mmc.csf.infomation.qo.MyPreemptQO;
import com.mmc.csf.infomation.qo.MyPublishQO;
import com.mmc.csf.infomation.qo.*;
import com.mmc.csf.infomation.vo.*;
import com.mmc.csf.release.commit.NotRepeatSubmit;
import com.mmc.csf.release.entity.requirements.ServiceRequirementsDO;
......@@ -163,8 +160,8 @@ public class RequirementsController extends BaseController {
@ApiOperation(value = "小程序-列表——需求发布")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@GetMapping("appPublishList")
public ResultBody<RequirementsInfoVO> appPublishList() {
return requirementsService.appPublishList();
public ResultBody<RequirementsInfoVO> appPublishList(RequirementsInfoQO requirementsInfoQO) {
return requirementsService.appPublishList(requirementsInfoQO);
}
......
release-service/src/main/java/com/mmc/csf/release/dao/RequirementsDao.java
......@@ -2,10 +2,7 @@ package com.mmc.csf.release.dao;
import com.mmc.csf.common.util.web.ResultBody;
import com.mmc.csf.infomation.dto.*;
import com.mmc.csf.infomation.qo.AgreeOrRefusePilotQO;
import com.mmc.csf.infomation.qo.IndustryCaseQO;
import com.mmc.csf.infomation.qo.MyPreemptQO;
import com.mmc.csf.infomation.qo.MyPublishQO;
import com.mmc.csf.infomation.qo.*;
import com.mmc.csf.infomation.vo.LiabilityProblemVO;
import com.mmc.csf.infomation.vo.ServiceSettleAccountsVO;
import com.mmc.csf.release.entity.requirements.*;
......@@ -82,7 +79,7 @@ public interface RequirementsDao {
void requirementsDao(Integer id);
List<RequirementsInfoDO> appPublishList();
List<RequirementsInfoDO> appPublishList(RequirementsInfoQO requirementsInfoQO);
RequirementsInfoDO detailPublish(Integer id);
......@@ -344,5 +341,4 @@ public interface RequirementsDao {
Integer selectServiceFlowIdFromAgreePilot(Integer requireId,Integer userAccountId);
RequirementsServicePilotInfoDO selectPilotInfoByRequireId(Integer requireId);
}
release-service/src/main/java/com/mmc/csf/release/service/RequirementsService.java
......@@ -3,10 +3,7 @@ package com.mmc.csf.release.service;
import com.mmc.csf.common.util.page.PageResult;
import com.mmc.csf.common.util.web.ResultBody;
import com.mmc.csf.infomation.dto.*;
import com.mmc.csf.infomation.qo.AgreeOrRefusePilotQO;
import com.mmc.csf.infomation.qo.IndustryCaseQO;
import com.mmc.csf.infomation.qo.MyPreemptQO;
import com.mmc.csf.infomation.qo.MyPublishQO;
import com.mmc.csf.infomation.qo.*;
import com.mmc.csf.infomation.vo.*;
import com.mmc.csf.release.entity.requirements.ServiceRequirementsDO;
......@@ -64,7 +61,7 @@ public interface RequirementsService {
ResultBody deletePublish(Integer id, Integer userAccountId);
ResultBody appPublishList();
ResultBody appPublishList(RequirementsInfoQO requirementsInfoQO);
ResultBody detailPublish(Integer id, HttpServletRequest request, Integer userAccountId);
......
release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java
......@@ -9,10 +9,7 @@ import com.mmc.csf.common.util.web.ResultBody;
import com.mmc.csf.common.util.web.ResultEnum;
import com.mmc.csf.config.IsNullConvertZeroUtil;
import com.mmc.csf.infomation.dto.*;
import com.mmc.csf.infomation.qo.AgreeOrRefusePilotQO;
import com.mmc.csf.infomation.qo.IndustryCaseQO;
import com.mmc.csf.infomation.qo.MyPreemptQO;
import com.mmc.csf.infomation.qo.MyPublishQO;
import com.mmc.csf.infomation.qo.*;
import com.mmc.csf.infomation.vo.*;
import com.mmc.csf.release.constant.*;
import com.mmc.csf.release.controller.countDown.RedisUtil;
......@@ -175,8 +172,30 @@ public class RequirementsServiceImpl implements RequirementsService {
}
@Override
public ResultBody appPublishList() {
List<RequirementsInfoDO> requirementsInfoDOS = requirementsDao.appPublishList();
public ResultBody appPublishList(RequirementsInfoQO requirementsInfoQO) {
List<RequirementsInfoDO> requirementsInfoDOS = requirementsDao.appPublishList(requirementsInfoQO);
Integer provinceCode = requirementsInfoQO.getProvinceCode();
if(provinceCode != null) {
Integer districtCode = requirementsInfoQO.getDistrictCode();
Integer cityCode = requirementsInfoQO.getCityCode();
List<RequirementsInfoDO> requirementsInfoDOS1 = new ArrayList<>();
requirementsInfoDOS.stream().map(requirementsInfoDO -> {
if (requirementsInfoDO.getDistrictCode() != null && requirementsInfoDO.getDistrictCode().equals(districtCode)) {
requirementsInfoDOS1.add(requirementsInfoDO);
}
return requirementsInfoDO;
}).filter(requirementsInfoDO -> requirementsInfoDO.getDistrictCode() != districtCode).map(requirementsInfoDO -> {
if (requirementsInfoDO.getCityCode() != null && requirementsInfoDO.getCityCode().equals(cityCode)) {
requirementsInfoDOS1.add(requirementsInfoDO);
}
return requirementsInfoDO;
}).filter(requirementsInfoDO -> requirementsInfoDO.getCityCode() != cityCode).map(requirementsInfoDO -> {
requirementsInfoDOS1.add(requirementsInfoDO);
return requirementsInfoDO;
}).collect(Collectors.toList());
requirementsInfoDOS = requirementsInfoDOS1;
}
//远程调用服务一级分类
// List<IndustryTypeDTO> industryTypeDTOS = listIndustry();
List<RequirementsInfoVO> collect = requirementsInfoDOS.stream().map(RequirementsInfoDO::buildRequirementsInfoVO).collect(Collectors.toList());
......@@ -2115,6 +2134,10 @@ public class RequirementsServiceImpl implements RequirementsService {
IsNullConvertZeroUtil.checkIsNull(requirementsInfoDO);
//父订单不退钱
if(requirementsInfoDO.getRequireNum() != null && requirementsInfoDO.getRequireNum() > 1) {
//如果这个多人订单还有子订单没被人接 就把总订单也取消
if(requirementsInfoDO.getRepertory() > 0) {
requirementsDao.updateInfo(requirementsInfoDO.getId(), 7);
}
continue;
}
if (requirementsInfoDO.getCashAmount().compareTo(BigDecimal.ZERO) != 0 ||
......
release-service/src/main/resources/application-local.yml
......@@ -52,7 +52,7 @@ spring:
#Redis
redis:
database: 1
host: r-wz9ke310fs684hacn1pd.redis.rds.aliyuncs.com
host: 127.0.0.1
port: 6379
password: MMC@2022&REDIS
#连接池
......@@ -70,7 +70,7 @@ spring:
#rabbitMQ
#rabbitMQ
rabbitmq:
host: amqp-cn-zvp2ozhnj001.cn-shenzhen.amqp-0.net.mq.amqp.aliyuncs.com
host: 127.0.0.1
port: 5672
username: MjphbXFwLWNuLXp2cDJvemhuajAwMTpMVEFJNEZ6Q3B5ckEzM1BlZ254V1M2WFY=
password: RTg3OUMxQzk4NzU0NDQ4RkQ1RDg4MkEzQjY4M0M3MkQxOTM2QkEyNDoxNjUyNDA4NDk0NDg4
......
release-service/src/main/resources/mapper/requirements/RequirementsDao.xml
......@@ -463,42 +463,6 @@
where id = #{id}
</delete>
<select id="appPublishList" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
SELECT ri.id,
ri.task_title,
ri.task_start_time,
ri.task_end_time,
ri.task_address,
ri.longitude,
ri.latitude,
ri.require_url,
ri.require_description,
ri.requirement_type_id,
ri.user_account_id,
ra.order_level,
ri.service_id,
ra.total_amount,
ra.order_amount,
ra.update_order_amount,
ri.insurance,
ri.publish,
ri.service_name,
ri.create_time,
ri.repertory,
ri.require_num
FROM requirements_info ri
left join requirements_amount ra
on ra.requirements_info_id = ri.id and ri.user_account_id = ra.user_account_id
WHERE NOT EXISTS(
SELECT rs.requirements_info_id FROM requirements_service rs WHERE ri.id = rs.requirements_info_id)
AND ri.service_flow = 1
AND ri.is_deleted = 0
AND ri.service_flow_id != 7
AND father_require_id = 0
AND repertory > 0
ORDER BY ri.order_level_amount DESC,
ri.id DESC
</select>
<select id="detailPublish" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
SELECT ri.id,
......@@ -878,6 +842,7 @@
ri.task_address,
ri.longitude,
ri.latitude,
ri.repertory,
ri.require_url,
ri.require_description,
ri.requirement_type_id,
......@@ -1761,6 +1726,50 @@
resultType="com.mmc.csf.release.entity.requirements.RequirementsServicePilotInfoDO">
select pilot_certification_id,pilot_certification_user_id from requirements_service where service_flow_id != 11 and is_deleted != 1 and requirements_info_id = #{requireId}
</select>
<select id="appPublishList" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
SELECT ri.id,
ri.task_title,
ri.task_start_time,
ri.task_end_time,
ri.task_address,
ri.longitude,
ri.latitude,
ri.require_url,
ri.require_description,
ri.requirement_type_id,
ri.user_account_id,
ra.order_level,
ri.service_id,
ra.total_amount,
ra.order_amount,
ra.update_order_amount,
ri.insurance,
ri.publish,
ri.service_name,
ri.create_time,
ri.repertory,
ri.require_num
FROM requirements_info ri
left join requirements_amount ra
on ra.requirements_info_id = ri.id and ri.user_account_id = ra.user_account_id
WHERE NOT EXISTS(
SELECT rs.requirements_info_id FROM requirements_service rs WHERE ri.id = rs.requirements_info_id)
AND ri.service_flow = 1
AND ri.is_deleted = 0
AND ri.service_flow_id != 7
AND father_require_id = 0
AND repertory > 0
<if test="provinceCode != null">
and ri.province_code = #{provinceCode}
</if>
ORDER BY ri.order_level_amount DESC
<if test="isNewRequirements != null and isNewRequirements">
,ri.id DESC
</if>
<if test="isHighCommission != null and isHighCommission">
,ra.order_amount DESC
</if>
</select>
<delete id="deleteRequirementsServiceInfo">
delete from requirements_service where requirements_info_id = #{requireId} and pilot_certification_user_id = #{userAccountId}
</delete>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论