From 84a3ef10e4219ad844e6ea86af65d8dec84f28d4 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 04 Aug 2021 16:51:28 +0800 Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop --- gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java b/gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java index c972db9..de5a947 100644 --- a/gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java +++ b/gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java @@ -1,11 +1,13 @@ package com.xzx.gc.user.mapper; import com.xzx.gc.entity.JhyOrder; +import com.xzx.gc.entity.JhyOrderItems; import com.xzx.gc.entity.OrderInfo; import com.xzx.gc.entity.OrderItemInfo; import com.xzx.gc.model.admin.PromoterModel; import com.xzx.gc.model.admin.XzxCityPartnerModel; import com.xzx.gc.model.order.OrderInfoVo; +import com.xzx.gc.user.vo.CategaryVo; import com.xzx.gc.util.GcMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -60,5 +62,9 @@ List<JhyOrder> selectJhyOrderByUserId(@Param("userId")String userId); List<OrderInfo> selectOrderByUserId(String userId, int i); + + List<CategaryVo> selectListByOrderId(String orderId); + + List<CategaryVo> selectJHYListByOrderId(String orderId); } -- Gitblit v1.9.1