From a8d2cb07f6440dc54dc4005b0b06d5a47cb1517d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 16 十二月 2024 13:34:03 +0800
Subject: [PATCH] 12.16
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 21 +--------------------
1 files changed, 1 insertions(+), 20 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 7724e42..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,17 +208,6 @@
order.setOrderStatus(OrderStatus.COMPLETED.getCode());
orderMapper.updateById(order);
Integer orderType = order.getOrderType();
- if (orderType.equals(OrderType.SERVICE.getCode())){
- R<Technician> shopdetail = technicianClient.shopdetail(order.getTechnicianId());
- if (shopdetail.getCode() != R.SUCCESS){
- throw new ServiceException("获取技师信息失败");
- }
- Technician technician = shopdetail.getData();
- R<Void> r = technicianClient.updateStatus(2, technician.getId());
- if (r.getCode() != R.SUCCESS){
- throw new ServiceException("修改技师状态失败");
- }
- }
// 售后设置
R<BaseSetting> baseSettingR = baseSettingClient.getBaseSetting(5);
@@ -234,12 +222,5 @@
JSONObject jsonObject = JSONObject.parseObject(content);
Long days = jsonObject.getLong("days");
commissionService.addToCommissionDelayQueue(order.getId(), LocalDateTime.now().plusDays(days));
- }
-
-
-
- @Override
- public void commission(Long orderId) {
-
}
}
--
Gitblit v1.7.1