查询待支付订单

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/UserOrderController.java

@@ -162,6 +162,7 @@ public class UserOrderController extends BaseController {
         if (null == query.getGoodType()
                 || (!GoodTypeEnum.VIP.getCode().equals(query.getGoodType())
             && !GoodTypeEnum.SVIP.getCode().equals(query.getGoodType())
+            && !GoodTypeEnum.DISCOUNT.getCode().equals(query.getGoodType())
             && null == query.getBizId())) {
             return HttpResponseResult.failed("参数异常");
         }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -718,6 +718,9 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     public HttpResponseResult<UserOrderVo> getPendingOrder(OrderSearch query) {
         if (query.getGoodType().equals(GoodTypeEnum.VIP.name()) || query.getGoodType().equals(GoodTypeEnum.SVIP.name())) {
             query.setGoodType(Lists.newArrayList(GoodTypeEnum.VIP, GoodTypeEnum.SVIP).stream().map(GoodTypeEnum::name).collect(Collectors.joining(",")));
+            query.setOrderType(Lists.newArrayList(OrderTypeEnum.VIP, OrderTypeEnum.SVIP).stream().map(OrderTypeEnum::name).collect(Collectors.joining(",")));
+        } else {
+            query.setOrderType(query.getGoodType());
         }
         UserOrderVo userOrderVo = baseMapper.getPendingOrder(query);
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserOrderMapper.xml

@@ -239,6 +239,9 @@
         <if test="null != param.orderClient and '' != param.orderClient">
             AND t.order_client_ = #{param.orderClient}
         </if>
+        <if test="param.orderType != null">
+            and find_in_set(t.order_type_ ,#{param.goodType})
+        </if>
         and exists (
             select 1 from user_order_detail d where t.order_no_ = d.order_no_
             and find_in_set(d.good_type_ ,#{param.goodType})