From 071153064e6771e377ee148712be012dba9e13c5 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 10 十二月 2024 19:25:35 +0800
Subject: [PATCH] 1.
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 31860a6..433629f 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -12,7 +12,6 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.enums.OrderStatus;
-import com.ruoyi.order.enums.OrderType;
import com.ruoyi.order.mapper.OrderGoodMapper;
import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.model.Order;
@@ -201,7 +200,7 @@
public void writeOff(String code,Integer shopId) {
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
Order order = orderMapper.selectOne(new LambdaQueryWrapper<Order>()
- .eq(Order::getOrderNumber, code));
+ .eq(Order::getId, code));
boolean check = check(order, shopId, loginUserApplet.getUserid());
if (!check){
throw new ServiceException("订单不存在");
@@ -209,18 +208,6 @@
order.setOrderStatus(OrderStatus.COMPLETED.getCode());
orderMapper.updateById(order);
Integer orderType = order.getOrderType();
- if (orderType.equals(OrderType.SERVICE.getCode())){
- R<TechnicianSubscribe> subscribeR = technicianClient.getSubscribeByOrderId(order.getId());
- if (R.isError(subscribeR)){
- throw new ServiceException("获取预约信息失败");
- }
- TechnicianSubscribe subscribe = subscribeR.getData();
- subscribe.setStatus(2);
- R<Void> r = technicianClient.updateStatus(subscribe.getStatus(), subscribe.getId());
- if (R.isError(r)){
- throw new ServiceException("更新预约状态失败");
- }
- }
// 售后设置
R<BaseSetting> baseSettingR = baseSettingClient.getBaseSetting(5);
--
Gitblit v1.7.1