Skip to content

X
xinrenli
Commit 85f00e2f by kaevom
Options

需求发布页面

parent c3b864a4
Showing with 247 additions and 31 deletions
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbOrderController.java
......@@ -4,6 +4,8 @@ import java.util.List;
import java.util.Arrays;
import com.yongqi.common.core.domain.model.LoginUser;
import com.yongqi.xinrenli.domain.DbOrder;
import com.yongqi.xinrenli.domain.bo.DbOrderEditBo;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
......@@ -44,16 +46,16 @@ public class DbOrderController extends BaseController {
* 查询订单列表
*/
@SaCheckPermission("xinrenli:order:list")
@GetMapping("/list")
@RequestMapping("/list")
public TableDataInfo<DbOrderVo> list(DbOrderBo bo, PageQuery pageQuery) {
return iDbOrderService.queryPageList(bo, pageQuery);
return iDbOrderService.homeList(bo, pageQuery);
}
/**
* 用户需求广场
*/
@SaCheckPermission("xinrenli:order:userDemandSquare")
@GetMapping("/userDemandSquare")
@RequestMapping("/userDemandSquare")
public TableDataInfo<DbOrderVo> userDemandSquare(DbOrderBo bo, PageQuery pageQuery) {
return iDbOrderService.userDemandSquare(bo, pageQuery);
}
......@@ -62,7 +64,7 @@ public class DbOrderController extends BaseController {
* 我的需求
*/
@SaCheckPermission("xinrenli:order:MyNeeds")
@GetMapping("/MyNeeds")
@RequestMapping("/MyNeeds")
public TableDataInfo<DbOrderVo> MyNeeds(DbOrderBo bo, PageQuery pageQuery) {
// LoginUser loginUser = getLoginUser();
LoginUser loginUser = new LoginUser();
......@@ -75,7 +77,7 @@ public class DbOrderController extends BaseController {
*/
@SaCheckPermission("xinrenli:order:export")
@Log(title = "订单", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@RequestMapping("/export")
public void export(DbOrderBo bo, HttpServletResponse response) {
List<DbOrderVo> list = iDbOrderService.queryList(bo);
ExcelUtil.exportExcel(list, "订单", DbOrderVo.class, response);
......@@ -86,8 +88,8 @@ public class DbOrderController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("xinrenli:order:query")
@GetMapping("/")
@SaCheckPermission("xinrenli:order:particulars")
@RequestMapping("/particulars")
public R<DbOrderVo> getInfo(@NotNull(message = "主键不能为空")
@RequestParam("id") Long id) {
return R.ok(iDbOrderService.queryById(id));
......@@ -99,12 +101,12 @@ public class DbOrderController extends BaseController {
@SaCheckPermission("xinrenli:order:add")
@Log(title = "订单", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@RequestMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody DbOrderBo bo) {
// LoginUser loginUser = getLoginUser();
LoginUser user = new LoginUser();
user.setUserId(1L);
return toAjax(iDbOrderService.insertByBo(bo,user));
return toAjax(iDbOrderService.insertByBo(bo, user));
}
/**
......@@ -113,12 +115,12 @@ public class DbOrderController extends BaseController {
@SaCheckPermission("xinrenli:order:edit")
@Log(title = "订单", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody DbOrderBo bo) {
@PutMapping("/edit")
public R<Void> edit(@Validated(EditGroup.class) @RequestBody DbOrderEditBo bo) {
// LoginUser loginUser = getLoginUser();
LoginUser loginUser = new LoginUser();
loginUser.setUserId(1L);
return toAjax(iDbOrderService.updateByBo(bo,loginUser));
return toAjax(iDbOrderService.updateByBo(bo, loginUser));
}
/**
......@@ -128,9 +130,10 @@ public class DbOrderController extends BaseController {
*/
@SaCheckPermission("xinrenli:order:remove")
@Log(title = "订单", businessType = BusinessType.DELETE)
@DeleteMapping("/remove")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@RequestParam Long[] ids) {
return toAjax(iDbOrderService.deleteWithValidByIds(Arrays.asList(ids), true));
@RequestMapping("/remove")
public R<Void> remove(@NotNull(message = "主键不能为空")
@RequestParam("id") Long id) {
LoginUser loginUser = new LoginUser();
return toAjax(iDbOrderService.deleteWithValidByIds(id, loginUser));
}
}
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbOrderEditBo.java 0 → 100644
package com.yongqi.xinrenli.domain.bo;
import com.yongqi.common.core.domain.BaseEntity;
import com.yongqi.common.core.validate.AddGroup;
import com.yongqi.common.core.validate.EditGroup;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* 订单业务对象 db_order
*
* @author zyf
* @date 2023-03-09
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class DbOrderEditBo extends BaseEntity {
/**
* 自增id
*/
@NotNull(message = "自增id不能为空", groups = {EditGroup.class})
private Long id;
/**
* 用户id
*/
private Long userId;
/**
* 标题
*/
@NotBlank(message = "标题不能为空", groups = {AddGroup.class, EditGroup.class})
private String title;
/**
* 联系人
*/
@NotBlank(message = "联系人不能为空", groups = {AddGroup.class, EditGroup.class})
private String linkman;
/**
* 联系电话
*/
@NotBlank(message = "联系电话不能为空", groups = {AddGroup.class, EditGroup.class})
private String phone;
/**
* 维修时间
*/
@NotNull(message = "维修时间不能为空", groups = {AddGroup.class, EditGroup.class})
private String repairTime;
/**
* 维修地址
*/
@NotBlank(message = "维修地址不能为空", groups = {AddGroup.class, EditGroup.class})
private String repairAddress;
/**
* 预算金额
*/
@NotNull(message = "预算金额不能为空", groups = {AddGroup.class, EditGroup.class})
private BigDecimal budget;
/**
* 成交金额
*/
private BigDecimal actualAmount;
/**
* 备注说明
*/
@NotBlank(message = "备注说明不能为空", groups = {AddGroup.class, EditGroup.class})
private String remark;
/**
* 订单状态：0 已发布；1 已驳回；2 待支付；3 已接单；4 已完成；5 退款中；6 已退款
*/
private Integer status;
/**
* 驳回理由
*/
private String reasonsForRejection;
/**
* 创建人
*/
private String createUser;
/**
* 修改人
*/
private String modifyUser;
/**
* 修改时间
*/
private Date modifyTime;
/**
* 删除状态 0：未取消 1:已取消
*/
private Integer deleteStatus;
/**
* 文件列表
*/
@NotNull(message = "图片，视频，语音必须上传其中一个", groups = {AddGroup.class, EditGroup.class})
private List<DbFileBo> fileBoList;
}
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/mapper/DbOrderMapper.java
package com.yongqi.xinrenli.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yongqi.common.core.domain.entity.SysUser;
import com.yongqi.xinrenli.domain.DbOrder;
import com.yongqi.xinrenli.domain.bo.DbOrderBo;
import com.yongqi.xinrenli.domain.bo.DbOrderEditBo;
import com.yongqi.xinrenli.domain.vo.DbOrderVo;
import com.yongqi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
......@@ -15,5 +23,9 @@ import java.math.BigDecimal;
public interface DbOrderMapper extends BaseMapperPlus<DbOrderMapper, DbOrder, DbOrderVo> {
BigDecimal getMinAmount();
Integer updateOrderCancel(Long id);
Page<DbOrderVo> homeList(@Param("page") Page<DbOrderVo> page, @Param(Constants.WRAPPER) Wrapper<DbOrder> queryWrapper);
int updateOrder(DbOrderEditBo update);
}
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/IDbOrderService.java
package com.yongqi.xinrenli.service;
import com.yongqi.common.core.domain.model.LoginUser;
import com.yongqi.xinrenli.domain.DbOrder;
import com.yongqi.xinrenli.domain.bo.DbOrderEditBo;
import com.yongqi.xinrenli.domain.vo.DbOrderVo;
import com.yongqi.xinrenli.domain.bo.DbOrderBo;
import com.yongqi.common.core.page.TableDataInfo;
......@@ -40,12 +42,12 @@ public interface IDbOrderService {
/**
* 修改订单
*/
Boolean updateByBo(DbOrderBo bo, LoginUser loginUser);
Boolean updateByBo(DbOrderEditBo bo, LoginUser loginUser);
/**
* 校验并批量删除订单信息
* 取消订单
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
Boolean deleteWithValidByIds(Long id, LoginUser user);
/**
* 需求广场
......@@ -57,4 +59,11 @@ public interface IDbOrderService {
*/
TableDataInfo<DbOrderVo> myNeeds(DbOrderBo bo, PageQuery pageQuery, LoginUser loginUser);
/**
* 首页查询
* @param bo
* @param pageQuery
* @return
*/
TableDataInfo<DbOrderVo> homeList(DbOrderBo bo, PageQuery pageQuery);
}
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbOrderServiceImpl.java
......@@ -2,6 +2,7 @@ package com.yongqi.xinrenli.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.yongqi.common.core.domain.entity.SysUser;
import com.yongqi.common.core.domain.model.LoginUser;
import com.yongqi.common.utils.StringUtils;
import com.yongqi.common.core.page.TableDataInfo;
......@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yongqi.xinrenli.domain.DbFile;
import com.yongqi.xinrenli.domain.bo.DbFileBo;
import com.yongqi.xinrenli.domain.bo.DbOrderEditBo;
import com.yongqi.xinrenli.domain.vo.DbFileVo;
import com.yongqi.xinrenli.enums.DeleteStatusEnum;
import com.yongqi.xinrenli.enums.FileEnumServiceType;
......@@ -122,13 +124,11 @@ public class DbOrderServiceImpl implements IDbOrderService {
*/
@Override
@Transactional
public Boolean updateByBo(DbOrderBo bo, LoginUser user) {
DbOrder update = BeanUtil.toBean(bo, DbOrder.class);
validEntityBeforeSave(update, user);
public Boolean updateByBo(DbOrderEditBo update, LoginUser user) {
update.setModifyTime(new Date());
update.setModifyTime(new Date());
update.setModifyUser(user.getUserId().toString());
boolean modify = baseMapper.updateById(update) > 0;
boolean modify = baseMapper.updateOrder(update) > 0;
if (modify) {
fileMapper.delete(Wrappers.<DbFile>lambdaQuery()
......@@ -136,7 +136,7 @@ public class DbOrderServiceImpl implements IDbOrderService {
.eq(DbFile::getServiceType, FileEnumServiceType.ORDER.getServiceTyp())
.eq(DbFile::getServiceId, update.getId())
);
List<DbFile> files = BeanUtil.copyToList(bo.getFileBoList(), DbFile.class);
List<DbFile> files = BeanUtil.copyToList(update.getFileBoList(), DbFile.class);
files.forEach(file -> {
file.setServiceId(update.getId());
file.setServiceType(FileEnumServiceType.ORDER.getServiceTyp());
......@@ -155,14 +155,13 @@ public class DbOrderServiceImpl implements IDbOrderService {
}
/**
* 批量删除订单
* 取消订单
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
public Boolean deleteWithValidByIds(Long id, LoginUser user) {
boolean modify = baseMapper.updateOrderCancel(id) > 0;
return modify;
}
/**
......@@ -221,4 +220,34 @@ public class DbOrderServiceImpl implements IDbOrderService {
});
return TableDataInfo.build(result);
}
private LambdaQueryWrapper<DbOrder> homeListWrapper(DbOrderBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<DbOrder> lqw = Wrappers.lambdaQuery();
lqw.gt(bo.getActualAmount() != null, DbOrder::getActualAmount, bo.getActualAmount());
return lqw;
}
/**
* 首页查询
* @param bo
* @param pageQuery
* @return
*/
@Override
public TableDataInfo<DbOrderVo> homeList(DbOrderBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<DbOrder> lqw = homeListWrapper(bo);
Page<DbOrderVo> result = baseMapper.homeList(pageQuery.build(), lqw);
result.getRecords().forEach(record -> {
DbFileVo dbFileVo = fileMapper.selectVoOne(Wrappers.<DbFile>lambdaQuery()
.eq(DbFile::getServiceId, record.getId())
.eq(DbFile::getServiceType, FileEnumServiceType.ORDER.getServiceTyp())
.eq(DbFile::getSort, 1)
.eq(DbFile::getDeleteStatus, DeleteStatusEnum.OK.getCode()));
List<DbFileVo> vos = new ArrayList<>();
if (ObjectUtils.isNotEmpty(dbFileVo)) {
vos.add(dbFileVo);
}
record.setFileVos(vos);
});
return TableDataInfo.build(result);
}
}
yongqi-xinrenli/src/main/resources/mapper/DbOrderMapper.xml
......@@ -23,6 +23,48 @@
</resultMap>
<select id="getMinAmount" resultType="java.math.BigDecimal">
select min_amount from db_config;
select min_amount
from db_config;
</select>
<update id="updateOrderCancel" parameterType="Long">
update db_order
set modify_time=now(),
modify_user=#{modifyUser},
delete_status=1
where id = #{id}
</update>
<resultMap type="com.yongqi.xinrenli.domain.vo.DbOrderVo" id="DbOrderVoResult">
<result property="id" column="id"/>
<result property="userId" column="user_id"/>
<result property="title" column="title"/>
<result property="linkman" column="linkman"/>
<result property="phone" column="phone"/>
<result property="repairTime" column="repair_time"/>
<result property="repairAddress" column="repair_address"/>
<result property="budget" column="budget"/>
<result property="remark" column="remark"/>
<result property="status" column="status"/>
<result property="createUser" column="create_user"/>
<result property="modifyUser" column="modify_user"/>
<result property="modifyTime" column="modify_time"/>
<result property="deleteStatus" column="delete_status"/>
</resultMap>
<select id="homeList" resultMap="DbOrderVoResult">
select *
from db_order ${ew.getCustomSqlSegment}
</select>
<update id="updateOrder" parameterType="com.yongqi.xinrenli.domain.bo.DbOrderEditBo">
update db_order
set title=#{title},
linkman=#{linkman},
phone=#{phone},
repair_time=#{repairTime},
repair_address=#{repairAddress},
budget=#{budget},
remark=#{actualAmount},
modify_name=#{remark},
modify_time=NOW()
where id = #{id}
</update>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment