diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberPointsController.java b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberPointsController.java index fe10f6f..ae6cff9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberPointsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberPointsController.java @@ -7,6 +7,7 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.member.domain.MemberPoints; import com.ruoyi.member.service.IMemberPointsService; import org.springframework.beans.factory.annotation.Autowired; @@ -47,6 +48,19 @@ public class MemberPointsController extends BaseController { return success(list); } + /** + * 查询在途订单 + * @author PQZ + * @date 14:36 2025/4/29 + * @return com.ruoyi.common.core.domain.AjaxResult + **/ + @GetMapping("/getOnWayOrder") + public AjaxResult getOnWayOrder() { + Long userId = SecurityUtils.getUserId(); + List list = memberPointsService.getOnWayOrder(userId); + return success(list.isEmpty()?null:list); + } + /** * 新增博主积分变动记录 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberPointsService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberPointsService.java index 6dcfdfd..df3e7fd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberPointsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberPointsService.java @@ -61,4 +61,13 @@ public interface IMemberPointsService extends IService { * @type type 回调状态(success:成功,其他为失败) **/ void payoutCallback(String orderNo,String type); + + /** + * 查询当前登录用户在途订单 + * @author PQZ + * @date 14:32 2025/4/29 + * @param userId 用户id + * @return java.util.List + **/ + List getOnWayOrder(Long userId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java index 1130ff3..38b9a30 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java @@ -183,7 +183,8 @@ public class MemberPointsServiceImpl extends ServiceImpl **/ - private List getOnWayOrder(Long userId){ + @Override + public List getOnWayOrder(Long userId){ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper .eq(MemberPoints::getUserId,userId)