...
|
...
|
@@ -125,14 +125,14 @@ public class UserOrdersServiceImpl implements IUserOrdersService,IBusinessExport |
|
|
orderRspBO.setOrderCode(orders.getOrderCode().intValue());
|
|
|
orderRspBO.setId(orders.getId());
|
|
|
orderRspBO.setOrderTime(DateUtil.long2DateStr(Long.valueOf(orders.getCreateTime()) * Long.valueOf(1000), "yyyy-MM-dd"));
|
|
|
UserOrders userOrders = userOrdersDAO.selectByOrderCode(orders.getParentOrderCode());
|
|
|
if(userOrders!=null){
|
|
|
orderRspBO.setUnionId(userOrders.getUid());
|
|
|
MktMarketingUrl mktMarketingUrl = mktMarketingUrlDAO.selectByPrimaryKey(Long.valueOf(userOrders.getUid()));
|
|
|
if (mktMarketingUrl != null) {
|
|
|
orderRspBO.setUnionType(mktMarketingUrl.getName());
|
|
|
}
|
|
|
}
|
|
|
// UserOrders userOrders = userOrdersDAO.selectByOrderCode(orders.getParentOrderCode());
|
|
|
// if(userOrders!=null){
|
|
|
// orderRspBO.setUnionId(userOrders.getUid());
|
|
|
// MktMarketingUrl mktMarketingUrl = mktMarketingUrlDAO.selectByPrimaryKey(Long.valueOf(userOrders.getUid()));
|
|
|
// if (mktMarketingUrl != null) {
|
|
|
// orderRspBO.setUnionType(mktMarketingUrl.getName());
|
|
|
// }
|
|
|
// }
|
|
|
unionOrderRspBOList.add(orderRspBO);
|
|
|
}
|
|
|
PageUnionOrderRspBO pageUnionOrderRspBO = new PageUnionOrderRspBO();
|
...
|
...
|
|