订单详情2

mall-service/src/main/java/com/txz/mall/business/impl/OrderServiceBusinessImpl.java

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

mall-service/src/main/java/com/txz/mall/service/impl/StoreOrderServiceImpl.java

@@ -1183,7 +1183,11 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         }
 
         save(storeOrder);
-        storeOrderInfos.forEach(info -> info.setOrderId(storeOrder.getId()));
+        for (StoreOrderInfo storeOrderInfo : storeOrderInfos) {
+            storeOrderInfo.setOrderId(storeOrder.getId());
+            storeOrderInfo.setIsDelete(0);
+            storeOrderInfo.setCreateTime(new Date());
+        }
         // 优惠券修改
 //        if (storeOrder.getCouponId() > 0) {
 //            storeCouponUserService.updateById(finalStoreCouponUser);

mall-service/src/main/java/vo/StoreOrderVO.java

@@ -6,6 +6,7 @@
  */
 package vo;
 
+import com.txz.cif.dto.UserDTO;
 import com.txz.mall.model.StoreOrder;
 import com.txz.mall.model.StoreOrderInfo;
 import com.txz.mall.model.StoreOrderStatus;
@@ -29,6 +30,9 @@ public class StoreOrderVO extends StoreOrder implements Serializable {
     @ApiModelProperty(value = "收货信息")
     private UserAddress orderAddressVO;
 
+    @ApiModelProperty(value = "用户信息")
+    private UserDTO userVO;
+
     @ApiModelProperty(value = "奖励佣金")
     private BigDecimal brokerage;