From f9e9dd3286d580b4d08fb6f24b0461c86e07dfc3 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Fri, 29 Nov 2024 10:41:05 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=88=86=E9=A1=B5bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/device/controller/DevInfoController.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java index 8e95df7..af2f827 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java @@ -3,6 +3,7 @@ package com.bonus.material.device.controller; import cn.hutool.core.convert.Convert; import com.bonus.common.biz.config.ListPagingUtil; import com.bonus.common.biz.domain.BmCompanyInfo; +import com.bonus.common.core.constant.Constants; import com.bonus.common.core.utils.ServletUtils; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; @@ -23,8 +24,6 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; import java.util.List; -import static com.bonus.common.core.web.page.TableSupport.PAGE_NUM; -import static com.bonus.common.core.web.page.TableSupport.PAGE_SIZE; /** * 设备信息Controller @@ -33,7 +32,6 @@ import static com.bonus.common.core.web.page.TableSupport.PAGE_SIZE; */ @RestController @RequestMapping("/dev") -@Validated @Api(value = "设备信息",tags = "设备管理") public class DevInfoController extends BaseController { @@ -70,8 +68,8 @@ public class DevInfoController extends BaseController { */ //@RequiresPermissions("equip:info:list") @ApiOperation(value = "查询装备列表--分页") - @PostMapping("/devList") - public TableDataInfo devList(@RequestBody DevInfoVo devInfo) { + @GetMapping("/devList") + public TableDataInfo devList(DevInfoVo devInfo) { startPage(); List list = devInfoService.selectDevInfoLists(devInfo); return getDataTable(list); From 5ec647ac8a2d7ca23ca21496b5ddad8eabdf909b Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Fri, 29 Nov 2024 18:07:06 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/material/order/mapper/OrderMapper.java | 2 ++ .../material/order/service/impl/OrderServiceImpl.java | 7 +++++-- .../resources/mapper/material/device/DevInfoMapper.xml | 1 + .../resources/mapper/material/order/OrderInfoMapper.xml | 3 +++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java index b22663d..d3d4c76 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java @@ -28,4 +28,6 @@ public interface OrderMapper { void updateMaStatus(OrderDetailDto orderDetailDto); Integer updateOrderStatus(@Param("ids") List ids, @Param("orderStatus") String orderStatus,@Param("userName") String userName); + + Integer updateDevCount(OrderDetailDto orderDetailDto); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index b42bfd4..7550f4c 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -36,6 +36,9 @@ public class OrderServiceImpl implements OrderService { DevInfo devInfo = orderMapper.getdeviceCount(orderDetailDto); if (devInfo.getDeviceCount() < orderDetailDto.getNum()) { throw new RuntimeException(devInfo.getDeviceName() + "库存不足"); + } else { + // 改库存 + orderMapper.updateDevCount(orderDetailDto); } } else { //如果是编码设备，改设备状态为在租 @@ -69,11 +72,11 @@ public class OrderServiceImpl implements OrderService { for (String id : ids.split(",")) { OrderDetailDto orderDetailDto = orderMapper.selectOrderDetailsById(id); // 待出库 - if ("2".equals(orderDetailDto.getOrderStatus())){ + if ("2".equals(orderDetailDto.getOrderStatus())) { dto.setOrderStatus("2"); } // 待收货 - if ("3".equals(orderDetailDto.getOrderStatus())){ + if ("3".equals(orderDetailDto.getOrderStatus())) { dto.setCzOrderStatus("3"); } list.add(orderDetailDto); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index ecdd8dc..6af4302 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -220,6 +220,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.type_id as typeId, mt4.type_name as typeName, mt4.unit_name as unitName, + mt4.manage_type as manageType, d.ma_status as maStatus, d.brand as brand, d.model_name as modelName, diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml index 99fe5ee..1946487 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml @@ -58,6 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + update ma_dev_info set device_count = device_count - #{num} where ma_id = #{maId} and is_active = 1 + From 65ad64a4656cba200c05c0b9df5cefe91996d776 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Sun, 1 Dec 2024 11:49:59 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/OrderController.java | 2 +- .../material/order/service/OrderService.java | 2 +- .../order/service/impl/OrderServiceImpl.java | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java index 40114c7..b3bad0f 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java @@ -51,7 +51,7 @@ public class OrderController extends BaseController { */ @ApiOperation(value = "获取订单详情") @GetMapping("/getOrderDetails") - public TableDataInfo getOrderDetails(OrderInfoDto orderInfoDto) { + public TableDataInfo getOrderDetails(OrderInfoDto orderInfoDto) throws Exception { startPage(); return getDataTable(orderService.getOrderDetails(orderInfoDto)); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java index 365478a..258fec2 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java @@ -13,7 +13,7 @@ public interface OrderService { Integer submitOrderInfo(OrderInfoDto orderInfoDto); - List getOrderDetails(OrderInfoDto orderInfoDto); + List getOrderDetails(OrderInfoDto orderInfoDto) throws Exception; OrderInfoDto getOrderDetailsById(OrderDetailDto dto); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index 7550f4c..8e605e0 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -64,24 +64,24 @@ public class OrderServiceImpl implements OrderService { } @Override - public List getOrderDetails(OrderInfoDto orderInfoDto) { + public List getOrderDetails(OrderInfoDto orderInfoDto) throws Exception { List orderInfoDtos = orderMapper.getOrderDetails(orderInfoDto); for (OrderInfoDto dto : orderInfoDtos) { List list = new ArrayList(); String ids = dto.getIds(); for (String id : ids.split(",")) { OrderDetailDto orderDetailDto = orderMapper.selectOrderDetailsById(id); - // 待出库 - if ("2".equals(orderDetailDto.getOrderStatus())) { - dto.setOrderStatus("2"); - } - // 待收货 - if ("3".equals(orderDetailDto.getOrderStatus())) { - dto.setCzOrderStatus("3"); - } list.add(orderDetailDto); } dto.setDetailsList(list); + boolean orderStatus = list.stream() + .map(OrderDetailDto::getOrderStatus) + .allMatch(name -> name.equals(list.get(0).getOrderStatus())); + if (orderStatus) { + dto.setOrderStatus(list.get(0).getOrderStatus()); + } else { + throw new Exception("订单状态不一致，请检查订单状态"); + } } return orderInfoDtos; } From 586aa21b412737b346db55beeb850c7378e37c88 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Sun, 1 Dec 2024 12:01:48 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/order/service/impl/OrderServiceImpl.java | 2 ++ .../main/resources/mapper/material/order/OrderInfoMapper.xml | 1 + 2 files changed, 3 insertions(+) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index 8e605e0..7725069 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -82,6 +82,8 @@ public class OrderServiceImpl implements OrderService { } else { throw new Exception("订单状态不一致，请检查订单状态"); } + dto.setStartTime(list.get(0).getRentBeginTime()); + dto.setEndTime(list.get(0).getRentEndTime()); } return orderInfoDtos; } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml index 1946487..d43992c 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml @@ -73,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mdi.person_phone AS personPhone, su.phonenumber AS phoneNumber, moi.address, + sum(hh.costs) cost, dept.companyName FROM ma_order_details hh From c0960719dbdc2ad90b14b9f2d27bd5215b219b10 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Sun, 1 Dec 2024 12:28:14 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/order/mapper/OrderMapper.java | 2 ++ .../order/service/impl/OrderServiceImpl.java | 4 +-- .../mapper/material/order/OrderInfoMapper.xml | 30 ++++++++++++++++++- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java index d3d4c76..56c8ec7 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java @@ -30,4 +30,6 @@ public interface OrderMapper { Integer updateOrderStatus(@Param("ids") List ids, @Param("orderStatus") String orderStatus,@Param("userName") String userName); Integer updateDevCount(OrderDetailDto orderDetailDto); + + List selectOrderDetailsByOderId(String orderId); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index 7725069..42b85b7 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -91,9 +91,7 @@ public class OrderServiceImpl implements OrderService { @Override public OrderInfoDto getOrderDetailsById(OrderDetailDto dto) { OrderInfoDto orderInfoDto = orderMapper.getOrderDetailsById(dto); - List list = new ArrayList(); - OrderDetailDto orderDetailDto = orderMapper.selectOrderDetailsById(dto.getId().toString()); - list.add(orderDetailDto); + List list = orderMapper.selectOrderDetailsByOderId(dto.getOrderId().toString()); orderInfoDto.setDetailsList(list); return orderInfoDto; } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml index d43992c..d6c7eeb 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml @@ -73,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mdi.person_phone AS personPhone, su.phonenumber AS phoneNumber, moi.address, + moi.order_id, sum(hh.costs) cost, dept.companyName FROM @@ -173,6 +174,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sys_dept sd1 ON sd1.parent_id = subquery.first_ancestor ) dept ON dept.deptId = su.dept_id WHERE - mt.del_flag = '0' and hh.id = #{id} + mt.del_flag = '0' and moi.order_id = #{orderId} limit 1 + + \ No newline at end of file From cccf463b369a651267a319202c704e8ef8499209 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Sun, 1 Dec 2024 12:31:25 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/order/controller/OrderController.java | 2 +- .../java/com/bonus/material/order/mapper/OrderMapper.java | 2 +- .../main/resources/mapper/material/order/OrderInfoMapper.xml | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java index b3bad0f..21044ba 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java @@ -77,7 +77,7 @@ public class OrderController extends BaseController { @PostMapping("/updateOrderStatus") public AjaxResult updateOrderStatus(@RequestBody OrderDetailDto orderInfoDto) { String userName = SecurityUtils.getLoginUser().getUsername(); - Integer i = orderMapper.updateOrderStatus(orderInfoDto.getIds(), orderInfoDto.getOrderStatus(), userName); + Integer i = orderMapper.updateOrderStatus(orderInfoDto.getOrderId(), orderInfoDto.getOrderStatus(), userName); if (i > 0) { return success(); } else { diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java index 56c8ec7..956098a 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java @@ -27,7 +27,7 @@ public interface OrderMapper { void updateMaStatus(OrderDetailDto orderDetailDto); - Integer updateOrderStatus(@Param("ids") List ids, @Param("orderStatus") String orderStatus,@Param("userName") String userName); + Integer updateOrderStatus(@Param("orderId") Integer orderId, @Param("orderStatus") String orderStatus,@Param("userName") String userName); Integer updateDevCount(OrderDetailDto orderDetailDto); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml index d6c7eeb..ab2a850 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml @@ -53,10 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ,rent_over_user = #{userName} ,rent_over_time = now() - where id in - - #{id} - + where order_id = #{orderId} update ma_dev_info set device_count = device_count - #{num} where ma_id = #{maId} and is_active = 1 From 7d4bc94b3518367357f602f7d856351ce9407a63 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Sun, 1 Dec 2024 12:34:31 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/order/controller/OrderController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java index 21044ba..3fb7aba 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java @@ -62,7 +62,7 @@ public class OrderController extends BaseController { @ApiOperation(value = "获取单个订单详情") @GetMapping("/getOrderDetailsById") public AjaxResult getOrderDetailsById(OrderDetailDto dto) { - if (dto.getId() != null) { + if (dto.getOrderId() != null) { OrderInfoDto orderInfoDto = orderService.getOrderDetailsById(dto); return success(orderInfoDto); } else { From bec91aac8a0c5f9e59385b365c02b1ed2687fc09 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Sun, 1 Dec 2024 12:41:36 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/order/service/impl/OrderServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index 42b85b7..664ab26 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -92,6 +92,8 @@ public class OrderServiceImpl implements OrderService { public OrderInfoDto getOrderDetailsById(OrderDetailDto dto) { OrderInfoDto orderInfoDto = orderMapper.getOrderDetailsById(dto); List list = orderMapper.selectOrderDetailsByOderId(dto.getOrderId().toString()); + orderInfoDto.setStartTime(list.get(0).getRentBeginTime()); + orderInfoDto.setEndTime(list.get(0).getRentEndTime()); orderInfoDto.setDetailsList(list); return orderInfoDto; } From 6c7612602096ce01b19f511afa472b76f4b0c2bd Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Sun, 1 Dec 2024 12:52:37 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/order/service/OrderService.java | 2 +- .../material/order/service/impl/OrderServiceImpl.java | 10 +++++++++- .../mapper/material/order/OrderInfoMapper.xml | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java index 258fec2..b8a943e 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java @@ -15,5 +15,5 @@ public interface OrderService { List getOrderDetails(OrderInfoDto orderInfoDto) throws Exception; - OrderInfoDto getOrderDetailsById(OrderDetailDto dto); + OrderInfoDto getOrderDetailsById(OrderDetailDto dto) throws Exception; } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index 664ab26..81c7be8 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -89,9 +89,17 @@ public class OrderServiceImpl implements OrderService { } @Override - public OrderInfoDto getOrderDetailsById(OrderDetailDto dto) { + public OrderInfoDto getOrderDetailsById(OrderDetailDto dto) throws Exception { OrderInfoDto orderInfoDto = orderMapper.getOrderDetailsById(dto); List list = orderMapper.selectOrderDetailsByOderId(dto.getOrderId().toString()); + boolean orderStatus = list.stream() + .map(OrderDetailDto::getOrderStatus) + .allMatch(name -> name.equals(list.get(0).getOrderStatus())); + if (orderStatus) { + orderInfoDto.setOrderStatus(list.get(0).getOrderStatus()); + } else { + throw new Exception("订单状态不一致，请检查订单状态"); + } orderInfoDto.setStartTime(list.get(0).getRentBeginTime()); orderInfoDto.setEndTime(list.get(0).getRentEndTime()); orderInfoDto.setDetailsList(list); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml index ab2a850..77289b1 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml @@ -152,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mdi.person_phone AS personPhone, su.phonenumber AS phoneNumber, su.nick_name AS nickName, + sum(hh.costs) cost, moi.address, dept.companyName FROM From 092cdeb03c6dc1929604f9f66f8506140861507e Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Sun, 1 Dec 2024 12:52:51 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/order/controller/OrderController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java index 3fb7aba..f6ed712 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java @@ -61,7 +61,7 @@ public class OrderController extends BaseController { */ @ApiOperation(value = "获取单个订单详情") @GetMapping("/getOrderDetailsById") - public AjaxResult getOrderDetailsById(OrderDetailDto dto) { + public AjaxResult getOrderDetailsById(OrderDetailDto dto) throws Exception { if (dto.getOrderId() != null) { OrderInfoDto orderInfoDto = orderService.getOrderDetailsById(dto); return success(orderInfoDto); From 4029e29e2de88c8304c3e834f8d30c9d747be8cc Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Sun, 1 Dec 2024 13:23:19 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/material/order/OrderInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml index 77289b1..d3f7368 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml @@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND hh.order_status = #{orderStatus} - AND moi.order_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') + AND hh.rent_begin_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') AND c.company_name like concat('%',#{czcompanyName},'%')