|
@@ -6,6 +6,7 @@ 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.model.UserAddress;
|
|
import com.txz.mall.service.StoreOrderInfoService;
|
|
import com.txz.mall.service.StoreOrderInfoService;
|
|
import com.txz.mall.service.StoreOrderService;
|
|
import com.txz.mall.service.StoreOrderService;
|
|
import com.txz.mall.service.StoreOrderStatusService;
|
|
import com.txz.mall.service.StoreOrderStatusService;
|
|
@@ -40,15 +41,15 @@ public class OrderServiceBusinessImpl implements OrderServiceBusiness {
|
|
Condition infoCondition = new Condition(StoreOrderInfo.class);
|
|
Condition infoCondition = new Condition(StoreOrderInfo.class);
|
|
Example.Criteria infoCriteria = infoCondition.createCriteria();
|
|
Example.Criteria infoCriteria = infoCondition.createCriteria();
|
|
infoCriteria.andEqualTo("isDelete", 0);
|
|
infoCriteria.andEqualTo("isDelete", 0);
|
|
- infoCriteria.andEqualTo("orderId", storeOrder.getOrderId());
|
|
|
|
|
|
+ infoCriteria.andEqualTo("orderId", storeOrder.getId());
|
|
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());
|
|
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);
|
|
vo.setUserVO(user);
|
|
return vo;
|
|
return vo;
|