From 2c90a0063c4d7b234654bcb7bba478f051935658 Mon Sep 17 00:00:00 2001 From: sxu <1539530615@qq.com> Date: Fri, 8 Dec 2023 13:07:45 +0800 Subject: [PATCH] fix --- .../zlpt/common/log/enums/BusinessType.java | 10 +++++ .../order/controller/OrderInfoController.java | 42 +++++++++++++------ .../zlpt/order/service/IOrderInfoService.java | 2 + .../service/impl/OrderInfoServiceImpl.java | 9 +++- 4 files changed, 49 insertions(+), 14 deletions(-) diff --git a/zlpt-common/zlpt-common-log/src/main/java/com/bonus/zlpt/common/log/enums/BusinessType.java b/zlpt-common/zlpt-common-log/src/main/java/com/bonus/zlpt/common/log/enums/BusinessType.java index 8c70c42..e75c693 100644 --- a/zlpt-common/zlpt-common-log/src/main/java/com/bonus/zlpt/common/log/enums/BusinessType.java +++ b/zlpt-common/zlpt-common-log/src/main/java/com/bonus/zlpt/common/log/enums/BusinessType.java @@ -56,4 +56,14 @@ public enum BusinessType * 清空数据 */ CLEAN, + + /** + * 同意、批准 + */ + APPROVE, + + /** + * 驳回、拒绝 + */ + REJECT, } diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java index 8e45234..134644a 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java @@ -16,6 +16,7 @@ import com.bonus.zlpt.order.feign.EquipClient; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -40,6 +41,8 @@ import static com.bonus.zlpt.common.core.web.domain.AjaxResult.DATA_TAG; @RequestMapping("/info") public class OrderInfoController extends BaseController { + private final String REJECT_ORDER_STATUS = "39"; + @Autowired private IOrderInfoService orderInfoService; @Autowired @@ -55,18 +58,20 @@ public class OrderInfoController extends BaseController { startPage(); List list = orderInfoService.selectOrderInfoList(orderInfo); - for (OrderInfoVo orderInfoVo : list) { - Map map1 = (Map) equipClient.getInfo(orderInfoVo.getMaId()); - if (map1 != null) { - Map map2 = (Map) map1.get(DATA_TAG); - if (map2 != null) { - String typeName = (String) map2.get("typeName"); - String groupName = (String) map2.get("groupName"); - String modelName = (String) map2.get("modelName"); - String deviceName = (String) map2.get("deviceName"); - orderInfoVo.setTypeName(typeName); - orderInfoVo.setGroupName(groupName); - orderInfoVo.setDeviceName(modelName + deviceName); + if (!CollectionUtils.isEmpty(list)) { + for (OrderInfoVo orderInfoVo : list) { + Map map1 = (Map) equipClient.getInfo(orderInfoVo.getMaId()); + if (map1 != null) { + Map map2 = (Map) map1.get(DATA_TAG); + if (map2 != null) { + String typeName = (String) map2.get("typeName"); + String groupName = (String) map2.get("groupName"); + String modelName = (String) map2.get("modelName"); + String deviceName = (String) map2.get("deviceName"); + orderInfoVo.setTypeName(typeName); + orderInfoVo.setGroupName(groupName); + orderInfoVo.setDeviceName(modelName + deviceName); + } } } } @@ -136,6 +141,19 @@ public class OrderInfoController extends BaseController return toAjax(orderInfoService.updateOrderInfo(orderInfo)); } + /** + * 驳回订单 + */ + @ApiOperation(value = "驳回订单") + @RequiresPermissions("order:info:edit") + @Log(title = "订单信息", businessType = BusinessType.REJECT) + @PutMapping(value = "/reject") + public AjaxResult reject(@RequestBody OrderInfoVo orderInfo) + { + orderInfo.setOrderStatus(REJECT_ORDER_STATUS); + return toAjax(orderInfoService.rejectOrderInfo(orderInfo)); + } + /** * 删除订单信息 */ diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderInfoService.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderInfoService.java index 25ba3c0..6a208c8 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderInfoService.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderInfoService.java @@ -44,6 +44,8 @@ public interface IOrderInfoService */ public int updateOrderInfo(OrderInfoVo orderInfo); + public int rejectOrderInfo(OrderInfoVo orderInfo); + /** * 批量删除订单信息 * diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java index 369e874..b73482a 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java @@ -90,8 +90,13 @@ public class OrderInfoServiceImpl implements IOrderInfoService orderDetailsMapper.insertAttachment(fileInfoDto); } orderInfoMapper.updateOrderDetails(orderInfo); - LoginUser user = SecurityUtils.getLoginUser(); - orderInfo.setOrderUser(user.getUserid()); +// LoginUser user = SecurityUtils.getLoginUser(); + return orderInfoMapper.updateOrderInfo(orderInfo); + } + + @Override + public int rejectOrderInfo(OrderInfoVo orderInfo) + { return orderInfoMapper.updateOrderInfo(orderInfo); }