|
@@ -1,10 +1,15 @@
|
|
package com.txz.mall.business.impl;
|
|
package com.txz.mall.business.impl;
|
|
|
|
|
|
|
|
+import com.txz.cif.dto.UserDTO;
|
|
import com.txz.mall.business.OrderServiceBusiness;
|
|
import com.txz.mall.business.OrderServiceBusiness;
|
|
|
|
+import com.txz.mall.dubbo.client.CifUserDubboServiceClient;
|
|
import com.txz.mall.model.StoreOrder;
|
|
import com.txz.mall.model.StoreOrder;
|
|
import com.txz.mall.model.StoreOrderInfo;
|
|
import com.txz.mall.model.StoreOrderInfo;
|
|
import com.txz.mall.model.StoreOrderStatus;
|
|
import com.txz.mall.model.StoreOrderStatus;
|
|
-import com.txz.mall.service.*;
|
|
|
|
|
|
+import com.txz.mall.service.StoreOrderInfoService;
|
|
|
|
+import com.txz.mall.service.StoreOrderService;
|
|
|
|
+import com.txz.mall.service.StoreOrderStatusService;
|
|
|
|
+import com.txz.mall.service.UserAddressService;
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.AllArgsConstructor;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -27,10 +32,8 @@ public class OrderServiceBusinessImpl implements OrderServiceBusiness {
|
|
private final StoreOrderService storeOrderService;
|
|
private final StoreOrderService storeOrderService;
|
|
private final StoreOrderInfoService storeOrderInfoService;
|
|
private final StoreOrderInfoService storeOrderInfoService;
|
|
private final UserAddressService userAddressService;
|
|
private final UserAddressService userAddressService;
|
|
- private final StorePinkService storePinkService;
|
|
|
|
private final StoreOrderStatusService storeOrderStatusService;
|
|
private final StoreOrderStatusService storeOrderStatusService;
|
|
- private final StoreCombinationService storeCombinationService;
|
|
|
|
-
|
|
|
|
|
|
+ private final CifUserDubboServiceClient userDubboServiceClient;
|
|
@Override
|
|
@Override
|
|
public StoreOrderVO orderDetail(Long id) {
|
|
public StoreOrderVO orderDetail(Long id) {
|
|
StoreOrder storeOrder = storeOrderService.findById(id);
|
|
StoreOrder storeOrder = storeOrderService.findById(id);
|
|
@@ -40,12 +43,14 @@ public class OrderServiceBusinessImpl implements OrderServiceBusiness {
|
|
infoCriteria.andEqualTo("orderId", storeOrder.getOrderId());
|
|
infoCriteria.andEqualTo("orderId", storeOrder.getOrderId());
|
|
List<StoreOrderInfo> infoList = storeOrderInfoService.findByCondition(infoCondition);
|
|
List<StoreOrderInfo> infoList = storeOrderInfoService.findByCondition(infoCondition);
|
|
List<StoreOrderStatus> logList = storeOrderStatusService.getLogList(storeOrder.getId());
|
|
List<StoreOrderStatus> logList = storeOrderStatusService.getLogList(storeOrder.getId());
|
|
|
|
+ UserDTO user = userDubboServiceClient.getUser(storeOrder.getUid());
|
|
// UserAddress userAddress = userAddressService.getDefaultByUid(storeOrder.getUid());
|
|
// UserAddress userAddress = userAddressService.getDefaultByUid(storeOrder.getUid());
|
|
StoreOrderVO vo = new StoreOrderVO();
|
|
StoreOrderVO vo = new StoreOrderVO();
|
|
BeanUtils.copyProperties(storeOrder, vo);
|
|
BeanUtils.copyProperties(storeOrder, vo);
|
|
vo.setOrderInfoVO(infoList);
|
|
vo.setOrderInfoVO(infoList);
|
|
// vo.setOrderAddressVO(userAddress);
|
|
// vo.setOrderAddressVO(userAddress);
|
|
vo.setOrderStatusVO(logList);
|
|
vo.setOrderStatusVO(logList);
|
|
|
|
+ vo.setUserVO(user);
|
|
return vo;
|
|
return vo;
|
|
}
|
|
}
|
|
|
|
|