|
|
@@ -1559,9 +1559,16 @@ public class ProductOrderService {
|
|
|
order.setRemark("供应商审核修改: " + changeLog.toString());
|
|
|
}
|
|
|
|
|
|
- // ===== 7. 组装返回 =====
|
|
|
+ // ===== 6. 更新订单时间 =====
|
|
|
order.setUpdatedAt(new Date());
|
|
|
orderMapper.updateById(order);
|
|
|
+
|
|
|
+ // ===== 7. 组装返回 =====
|
|
|
+ ProductOrderDTO dto = ProductOrderDTO.from(order);
|
|
|
+ Map<String, Object> result = new HashMap<>();
|
|
|
+ result.put("order", dto);
|
|
|
+ result.put("changeLog", changeLog.toString());
|
|
|
+ return Result.success(result);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -1584,7 +1591,7 @@ public class ProductOrderService {
|
|
|
if (buyerId != null) {
|
|
|
User user = userMapper.selectById(buyerId);
|
|
|
if (user != null) {
|
|
|
- userLevel = membershipService.getMemberLevel(userId);
|
|
|
+ userLevel = membershipService.getMemberLevel(buyerId);
|
|
|
}
|
|
|
}
|
|
|
// 比较级别数字:级别数字越小越低
|
|
|
@@ -1597,12 +1604,3 @@ public class ProductOrderService {
|
|
|
return product.getPrice();
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- // ===== 7. 组装返回 =====
|
|
|
- ProductOrderDTO dto = ProductOrderDTO.from(order);
|
|
|
- Map<String, Object> result = new HashMap<>();
|
|
|
- result.put("order", dto);
|
|
|
- result.put("changeLog", changeLog.toString());
|
|
|
- return Result.success(result);
|
|
|
- }
|
|
|
-}
|