finish order list
This commit is contained in:
@@ -99,7 +99,7 @@ public class BuyOrderController {
|
|||||||
* @param requestVo request value object
|
* @param requestVo request value object
|
||||||
* @return R
|
* @return R
|
||||||
*/
|
*/
|
||||||
@RequestMapping(path = "orderList", method = RequestMethod.POST)
|
@RequestMapping(path = "/orderList", method = RequestMethod.POST)
|
||||||
public R orderList(@RequestBody BuyOrderListRequestVo requestVo) {
|
public R orderList(@RequestBody BuyOrderListRequestVo requestVo) {
|
||||||
List<BuyOrderListResponseVo> response = buyOrderService.orderList(requestVo);
|
List<BuyOrderListResponseVo> response = buyOrderService.orderList(requestVo);
|
||||||
return R.ok().put("result", response);
|
return R.ok().put("result", response);
|
||||||
|
|||||||
@@ -309,10 +309,26 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
|
|||||||
QueryWrapper<BuyOrderProduct> queryWrapper = new QueryWrapper<>();
|
QueryWrapper<BuyOrderProduct> queryWrapper = new QueryWrapper<>();
|
||||||
queryWrapper.eq("order_id", buyOrder.getOrderId());
|
queryWrapper.eq("order_id", buyOrder.getOrderId());
|
||||||
List<BuyOrderProduct> buyOrderProductList = buyOrderProductService.list(queryWrapper);
|
List<BuyOrderProduct> buyOrderProductList = buyOrderProductService.list(queryWrapper);
|
||||||
|
List<GoodsResponseVo> goodsResponseVoList = new ArrayList<>();
|
||||||
for (BuyOrderProduct buyOrderProduct : buyOrderProductList) {
|
for (BuyOrderProduct buyOrderProduct : buyOrderProductList) {
|
||||||
buyOrderProduct.getProductId();
|
GoodsResponseVo goodsResponseVo = new GoodsResponseVo();
|
||||||
|
QueryWrapper<ShopProduct> shopProductQueryWrapper = new QueryWrapper<>();
|
||||||
|
shopProductQueryWrapper.eq("id", buyOrderProduct.getProductId());
|
||||||
|
ShopProduct shopProduct = shopProductService.getOne(shopProductQueryWrapper);
|
||||||
|
goodsResponseVo.setProductName(shopProduct.getProductName());
|
||||||
|
goodsResponseVo.setProductImage(shopProduct.getProductImages());
|
||||||
|
goodsResponseVo.setProductPrice(shopProduct.getPrice());
|
||||||
|
QueryWrapper<ExpressOrder> expressOrderQueryWrapper = new QueryWrapper<>();
|
||||||
|
expressOrderQueryWrapper.eq("id", buyOrderProduct.getExpress_order_id());
|
||||||
|
ExpressOrder expressOrder = expressOrderService.getOne(expressOrderQueryWrapper);
|
||||||
|
ExpressResponseVo expressResponseVo = new ExpressResponseVo();
|
||||||
|
expressResponseVo.setExpressCompany(expressOrder.getExpressCompanyCode());
|
||||||
|
expressResponseVo.setExpressOrderSn(expressOrder.getExpressOrderSn());
|
||||||
|
expressResponseVo.setPrintTemplate(expressOrder.getPrintTemplate());
|
||||||
|
goodsResponseVo.setExpressInfo(expressResponseVo);
|
||||||
|
goodsResponseVoList.add(goodsResponseVo);
|
||||||
}
|
}
|
||||||
responseVo.setGoodsList();
|
responseVo.setGoodsList(goodsResponseVoList);
|
||||||
requestVo.setIndex((requestVo.getIndex() - 1) * requestVo.getPageSize());
|
requestVo.setIndex((requestVo.getIndex() - 1) * requestVo.getPageSize());
|
||||||
result.add(responseVo);
|
result.add(responseVo);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,5 +26,5 @@ public class GoodsResponseVo {
|
|||||||
/**
|
/**
|
||||||
* 快递
|
* 快递
|
||||||
*/
|
*/
|
||||||
private ExpressQueryResponseVo expressInfo;
|
private ExpressResponseVo expressInfo;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user