|
|
@@ -104,11 +104,12 @@ public class AppGoodsBillsController extends BladeController {
|
|
|
@GetMapping("/listShop")
|
|
|
@ApiOperationSupport(order = 2)
|
|
|
@ApiOperation(value = "分页", notes = "传入goodsBills")
|
|
|
- public R<IPage<GoodsBillsVO>> listShop(GoodsBills goodsBills, Query query, String goodsStatus) {
|
|
|
+ public R<IPage<GoodsBillsVO>> listShop(GoodsBills goodsBills, Query query, String goodsStatus ,String orderDate) {
|
|
|
//只查询出付款成功的订单
|
|
|
IPage<GoodsBills> pages = appGoodsBillsService.page(Condition.getPage(query), Condition.getQueryWrapper(goodsBills).lambda()
|
|
|
.eq(GoodsBills::getPayStatus, AppConstant.BillPayStatus.付款成功.name())
|
|
|
- .eq(StrUtil.isNotBlank(goodsStatus),GoodsBills::getOrderStatus,goodsStatus)
|
|
|
+ .eq(StrUtil.isNotBlank(goodsStatus), GoodsBills::getOrderStatus, goodsStatus)
|
|
|
+ .like(orderDate != null, GoodsBills::getCreateTime, orderDate)
|
|
|
.orderByDesc(GoodsBills::getCreateTime));
|
|
|
return R.data(GoodsBillsWrapper.build().pageVO(pages));
|
|
|
}
|
