From be676baa8c19b73a0c2a646f9c34e19bf597d1cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E7=9D=A1=E8=A7=89=E7=9A=84=E6=9C=88=E4=BA=AE?= <97796069+Cookies-OvO@users.noreply.github.com> Date: Thu, 4 Dec 2025 20:23:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E5=8F=96=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StoreOrderController.java | 7 ++++-- .../com/yzt/service/service/OrderService.java | 3 ++- .../service/service/StoreOrderService.java | 2 +- .../service/impl/OrderServiceImpl.java | 5 ++-- .../service/impl/StoreOrderServiceImpl.java | 4 +++- .../mapper/store/StoreOrderMapper.xml | 23 +++++++++++-------- 6 files changed, 27 insertions(+), 17 deletions(-) diff --git a/fightwine-front/src/main/java/com/yzt/front/controller/StoreOrderController.java b/fightwine-front/src/main/java/com/yzt/front/controller/StoreOrderController.java index 7bc6d9c..69650ac 100644 --- a/fightwine-front/src/main/java/com/yzt/front/controller/StoreOrderController.java +++ b/fightwine-front/src/main/java/com/yzt/front/controller/StoreOrderController.java @@ -82,19 +82,22 @@ public class StoreOrderController { /** * 订单列表 * @param type 类型 + * @param payType 支付方式 * @param pageRequest 分页 * @return 订单列表 */ @ApiOperation(value = "订单列表") @RequestMapping(value = "/list", method = RequestMethod.GET) @ApiImplicitParams ({ - @ApiImplicitParam(name = "type", value = "评价等级|0=未支付,1=待发货,2=待收货,3=待评价,4=已完成,-3=售后/退款,-4=已取消", required = false) + @ApiImplicitParam(name = "type", value = "评价等级|0=未支付,1=待发货,2=待收货,3=待评价,4=已完成,-3=售后/退款,-4=已取消", required = false), + @ApiImplicitParam(name = "payType", value = "支付方式，free表示免费订单", required = false) }) public CommonResult> orderList( @RequestParam(name = "keywords", required = false) String keywords, @RequestParam(name = "type", required = false) Integer type, + @RequestParam(name = "payType", required = false) String payType, @ModelAttribute PageParamRequest pageRequest) { - return CommonResult.success(CommonPage.restPage(orderService.list(keywords, type, pageRequest))); + return CommonResult.success(CommonPage.restPage(orderService.list(keywords, type, payType, pageRequest))); } /** diff --git a/fightwine-service/src/main/java/com/yzt/service/service/OrderService.java b/fightwine-service/src/main/java/com/yzt/service/service/OrderService.java index b4f70e0..bc7d64e 100644 --- a/fightwine-service/src/main/java/com/yzt/service/service/OrderService.java +++ b/fightwine-service/src/main/java/com/yzt/service/service/OrderService.java @@ -16,10 +16,11 @@ public interface OrderService { /** * 订单列表 * @param type 类型 + * @param payType 支付方式 * @param pageRequest 分页 * @return 订单集合 */ - PageInfo list(String keywords,Integer type, PageParamRequest pageRequest); + PageInfo list(String keywords,Integer type, String payType, PageParamRequest pageRequest); /** * 订单详情 diff --git a/fightwine-service/src/main/java/com/yzt/service/service/StoreOrderService.java b/fightwine-service/src/main/java/com/yzt/service/service/StoreOrderService.java index 1bc820f..a0e0858 100644 --- a/fightwine-service/src/main/java/com/yzt/service/service/StoreOrderService.java +++ b/fightwine-service/src/main/java/com/yzt/service/service/StoreOrderService.java @@ -53,7 +53,7 @@ public interface StoreOrderService extends IService { * @return 订单结果列表 */ List getUserOrderList(Integer uid, Integer status, PageParamRequest pageParamRequest); - PageInfo getUserOrderList_2_3(String keywords, Integer uid, Integer status, PageParamRequest pageParamRequest); + PageInfo getUserOrderList_2_3(String keywords, Integer uid, Integer status, String payType, PageParamRequest pageParamRequest); /** * 创建订单 * @param storeOrder 订单参数 diff --git a/fightwine-service/src/main/java/com/yzt/service/service/impl/OrderServiceImpl.java b/fightwine-service/src/main/java/com/yzt/service/service/impl/OrderServiceImpl.java index d049cc2..d306b8c 100644 --- a/fightwine-service/src/main/java/com/yzt/service/service/impl/OrderServiceImpl.java +++ b/fightwine-service/src/main/java/com/yzt/service/service/impl/OrderServiceImpl.java @@ -448,14 +448,15 @@ public class OrderServiceImpl implements OrderService { * 订单列表 * * @param status 类型 + * @param payType 支付方式 * @param pageRequest 分页 * @return CommonPage */ @Override - public PageInfo list(String keywords, Integer status, PageParamRequest pageRequest) { + public PageInfo list(String keywords, Integer status, String payType, PageParamRequest pageRequest) { Integer userId = userService.getUserIdException(); - PageInfo orderPageInfo = storeOrderService.getUserOrderList_2_3(keywords,userId, status, pageRequest); + PageInfo orderPageInfo = storeOrderService.getUserOrderList_2_3(keywords,userId, status, payType, pageRequest); List orderList = orderPageInfo.getList(); if (CollUtil.isEmpty(orderList)) { return CommonPage.copyPageInfo(orderPageInfo, CollUtil.newArrayList()); diff --git a/fightwine-service/src/main/java/com/yzt/service/service/impl/StoreOrderServiceImpl.java b/fightwine-service/src/main/java/com/yzt/service/service/impl/StoreOrderServiceImpl.java index 32735f8..7fbef9f 100644 --- a/fightwine-service/src/main/java/com/yzt/service/service/impl/StoreOrderServiceImpl.java +++ b/fightwine-service/src/main/java/com/yzt/service/service/impl/StoreOrderServiceImpl.java @@ -198,17 +198,19 @@ public class StoreOrderServiceImpl extends ServiceImpl getUserOrderList_2_3(String keywords, - Integer uid, Integer status, PageParamRequest pageParamRequest) { + Integer uid, Integer status, String payType, PageParamRequest pageParamRequest) { Page page = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); Map searchMap = new HashMap<>(); String searchKey = URLUtil.decode(keywords); searchMap.put("keywords", searchKey); searchMap.put("status", status); searchMap.put("uid", uid); + searchMap.put("payType", payType); List orderList = mapper.findFrontList(searchMap); return CommonPage.copyPageInfo(page, orderList); diff --git a/fightwine-service/src/main/resources/mapper/store/StoreOrderMapper.xml b/fightwine-service/src/main/resources/mapper/store/StoreOrderMapper.xml index e77b479..d8f8166 100644 --- a/fightwine-service/src/main/resources/mapper/store/StoreOrderMapper.xml +++ b/fightwine-service/src/main/resources/mapper/store/StoreOrderMapper.xml @@ -3,16 +3,16 @@ select sum(o.pay_price) as num,date_format(o.create_time, '%Y-%m-%d') as time - from fw_store_order o + from zp_store_order o where o.is_del >= 0 and o.paid >= 1 and o.refund_status >= 0 and o.create_time >= #{ startTime } and o.create_time < #{ endTime } @@ -102,7 +105,7 @@ select count(*) as num, sum(o.pay_price) as price - from fw_store_order as o - right join fw_user_brokerage_record as br on br.link_id = o.order_id and br.status = 3 and br.uid = #{spreadId} + from zp_store_order as o + right join zp_user_brokerage_record as br on br.link_id = o.order_id and br.status = 3 and br.uid = #{spreadId} where o.uid = #{uid} and o.status > 1;