|
...
|
...
|
@@ -31,7 +31,7 @@ import com.yohobuy.ufo.model.order.common.*; |
|
|
|
import com.yohobuy.ufo.model.order.constants.QNliveConstants;
|
|
|
|
import com.yohobuy.ufo.model.order.req.BuyerOrderMetaUpdateReq;
|
|
|
|
import com.yohobuy.ufo.model.order.resp.*;
|
|
|
|
//import com.yohobuy.ufo.model.order.resp.SkupImageInfo;
|
|
|
|
import com.yohobuy.ufo.model.order.resp.SkupImageInfo;
|
|
|
|
import com.yohobuy.ufo.model.resp.product.*;
|
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
...
|
...
|
@@ -1611,7 +1611,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { |
|
|
|
resp.setStatus(buyerOrder.getStatus());
|
|
|
|
resp.setStatusStr(Constant.convertOrderStatusStr(buyerOrder.getStatus()));
|
|
|
|
resp.setCreateTimeStr(DateUtil.int2DateStr(buyerOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
|
// resp.setAttributes(buyerOrder.getAttributes());
|
|
|
|
resp.setAttributes(buyerOrder.getAttributes());
|
|
|
|
|
|
|
|
//检查买家是否是线下店的用户
|
|
|
|
resp.setInnerBuyerType("0");
|
|
...
|
...
|
@@ -2493,7 +2493,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { |
|
|
|
resp.setGoodsPrice(String.format("%.2f", buyerGoodsMap.get(item.getOrderCode()).getGoodsPrice().doubleValue()));
|
|
|
|
resp.setStatusStr(Constant.convertOrderStatusStr(item.getStatus()));
|
|
|
|
resp.setStatus(item.getStatus());
|
|
|
|
// resp.setAttributes(item.getAttributes());
|
|
|
|
resp.setAttributes(item.getAttributes());
|
|
|
|
|
|
|
|
respList.add(resp);
|
|
|
|
}
|
|
...
|
...
|
@@ -2629,8 +2629,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { |
|
|
|
if (null != secondDetailResp.getImageInfoList()) {
|
|
|
|
secondDetailResp.getImageInfoList().stream().forEach(a -> imageInfoList.add(new SkupImageInfo(a.getImageUrl(), a.getImageDesc())));
|
|
|
|
}
|
|
|
|
// resp.setImageInfoList(imageInfoList);
|
|
|
|
// resp.setSecondProductDesc(secondDetailResp.getDesc());
|
|
|
|
resp.setImageInfoList(imageInfoList);
|
|
|
|
resp.setSecondProductDesc(secondDetailResp.getDesc());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
...
|
...
|
|
