mozhe
/
mental-tenant-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化量表和预约订单列表

This commit is contained in:
cjw 2024-09-23 14:39:22 +08:00
parent bd8df3971c
commit 0207fc4249
4 changed files with 64 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxOrderController.java
View File

@ -11,9 +11,11 @@ import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.ReservationOrderBo;
import org.dromara.scale.domain.bo.SysScaleOrderBo;
import org.dromara.scale.domain.vo.ReservationOrderVo;
import org.dromara.scale.domain.vo.SysScaleOrderVo;
import org.dromara.scale.service.IReservationOrderService;
import org.dromara.scale.service.ISysScaleOrderService;
@ -39,7 +41,9 @@ public class WxOrderController extends BaseController {
* 查询量表订单列表
*/
@GetMapping("/scale/pageList")
public TableDataInfo<SysScaleOrderVo> list(SysScaleOrderBo bo, PageQuery pageQuery) {
public TableDataInfo<SysScaleOrderVo> scaleOrderList(SysScaleOrderBo bo, PageQuery pageQuery) {
Long userId = LoginHelper.getUserId();
bo.setCreateBy(userId);
return scaleOrderService.queryPageList(bo, pageQuery);
}
@ -49,8 +53,8 @@ public class WxOrderController extends BaseController {
* @param id 主键
*/
@GetMapping("/scale/{id}")
public R<SysScaleOrderVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
public R<SysScaleOrderVo> getScaleOrderInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(scaleOrderService.queryById(id));
}
@ -78,4 +82,36 @@ public class WxOrderController extends BaseController {
return R.ok(reservationOrderService.insertByBo(bo));
}
/**
* 查询量表订单列表
*/
@GetMapping("/user/reservation/pageList")
public TableDataInfo<ReservationOrderVo> userReservationOrderList(ReservationOrderBo bo, PageQuery pageQuery) {
Long userId = LoginHelper.getUserId();
bo.setCreateBy(userId);
bo.setCounselorId(null);
return reservationOrderService.queryPageList(bo, pageQuery);
}
/**
* 查询量表订单列表
*/
@GetMapping("/counselor/reservation/pageList")
public TableDataInfo<ReservationOrderVo> counselorReservationOrderList(ReservationOrderBo bo, PageQuery pageQuery) {
Long userId = LoginHelper.getUserId();
bo.setCounselorId(userId);
bo.setCreateBy(null);
return reservationOrderService.queryPageList(bo, pageQuery);
}
/**
* 获取量表订单详细信息
*
* @param id 主键
*/
@GetMapping("/reservation/{id}")
public R<ReservationOrderVo> getReservationOrderInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(reservationOrderService.queryById(id));
}
}

23
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxReservationController.java Normal file
View File

@ -0,0 +1,23 @@
package org.dromara.scale.controller.wx;
import lombok.RequiredArgsConstructor;
import org.dromara.common.web.core.BaseController;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>预约<p>
*
* @author cjw
* @version V1.0.0
* @date 2024/9/23 14:23
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/wx/reservation/")
public class WxReservationController extends BaseController {
}

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationOrderServiceImpl.java
View File

@ -8,7 +8,6 @@ import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
import com.github.binarywang.wxpay.service.WxPayService;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
@ -83,14 +82,9 @@ public class ReservationOrderServiceImpl implements IReservationOrderService {
private LambdaQueryWrapper<ReservationOrder> buildQueryWrapper(ReservationOrderBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ReservationOrder> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getTimeId() != null, ReservationOrder::getTimeId, bo.getTimeId());
lqw.eq(bo.getCounselorId() != null, ReservationOrder::getCounselorId, bo.getCounselorId());
lqw.eq(bo.getOrderPrice() != null, ReservationOrder::getOrderPrice, bo.getOrderPrice());
lqw.eq(bo.getActualPrice() != null, ReservationOrder::getActualPrice, bo.getActualPrice());
lqw.eq(bo.getPayWay() != null, ReservationOrder::getPayWay, bo.getPayWay());
lqw.eq(bo.getOrderStatus() != null, ReservationOrder::getOrderStatus, bo.getOrderStatus());
lqw.eq(StringUtils.isNotBlank(bo.getDiagnose()), ReservationOrder::getDiagnose, bo.getDiagnose());
lqw.eq(bo.getAnnex() != null, ReservationOrder::getAnnex, bo.getAnnex());
lqw.eq(bo.getCreateBy() != null, ReservationOrder::getCreateBy, bo.getCreateBy());
return lqw;
}

5
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleOrderServiceImpl.java
View File

@ -86,12 +86,9 @@ public class SysScaleOrderServiceImpl implements ISysScaleOrderService {
private LambdaQueryWrapper<SysScaleOrder> buildQueryWrapper(SysScaleOrderBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SysScaleOrder> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getScaleId() != null, SysScaleOrder::getScaleId, bo.getScaleId());
lqw.eq(bo.getOrderPrice() != null, SysScaleOrder::getOrderPrice, bo.getOrderPrice());
lqw.eq(bo.getActualPrice() != null, SysScaleOrder::getActualPrice, bo.getActualPrice());
lqw.eq(bo.getPayWay() != null, SysScaleOrder::getPayWay, bo.getPayWay());
lqw.eq(bo.getUseStatus() != null, SysScaleOrder::getUseStatus, bo.getUseStatus());
lqw.eq(bo.getOrderStatus() != null, SysScaleOrder::getOrderStatus, bo.getOrderStatus());
lqw.eq(bo.getCreateBy() != null, SysScaleOrder::getCreateBy, bo.getCreateBy());
return lqw;
}