fix 题目列表

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderController.java

@@ -68,7 +68,7 @@ public class OrderController extends BaseController {
     @GetMapping("/goods/list")
     public TableDataInfo<OrderGoodsVo> goodsList(OrderGoodsQueryBo bo) {
         startPage();
-        List<OrderGoodsVo> list = iOrderGoodsService.queryList(bo);
+        List<OrderGoodsVo> list = iOrderGoodsService.selectList(bo);
         return getDataTable(list);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderAddBo.java

@@ -22,7 +22,7 @@ public class OrderAddBo {
 
     /** 订单编号 */
     @ApiModelProperty("订单编号")
-    private String oderSn;
+    private String orderSn;
     /** 用户ID */
     @ApiModelProperty("用户ID")
     private Long userId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderEditBo.java

@@ -25,7 +25,7 @@ public class OrderEditBo {
 
     /** 订单编号 */
     @ApiModelProperty("订单编号")
-    private String oderSn;
+    private String orderSn;
 
     /** 用户ID */
     @ApiModelProperty("用户ID")

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderQueryBo.java

@@ -39,7 +39,7 @@ public class OrderQueryBo extends BaseEntity {
 
 	/** 订单编号 */
 	@ApiModelProperty("订单编号")
-	private String oderSn;
+	private String orderSn;
 	/** 用户ID */
 	@ApiModelProperty("用户ID")
 	private Long userId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/Order.java

@@ -30,7 +30,7 @@ private static final long serialVersionUID=1L;
     @TableId(value = "order_id")
     private Long orderId;
     /** 订单编号 */
-    private String oderSn;
+    private String orderSn;
     /** 用户ID */
     private Long userId;
     /** 订单价格 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderGoodsMapper.java

@@ -1,7 +1,13 @@
 package com.zhongzheng.modules.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.bank.bo.QuestionQueryBo;
+import com.zhongzheng.modules.bank.vo.QuestionVo;
+import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
 import com.zhongzheng.modules.order.domain.OrderGoods;
+import com.zhongzheng.modules.order.vo.OrderGoodsVo;
+
+import java.util.List;
 
 /**
  * 订单商品Mapper接口
@@ -10,5 +16,5 @@ import com.zhongzheng.modules.order.domain.OrderGoods;
  * @date 2021-11-08
  */
 public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
-
+    List<OrderGoodsVo> selectList(OrderGoodsQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderGoodsService.java

@@ -23,6 +23,8 @@ public interface IOrderGoodsService extends IService<OrderGoods> {
 	 */
 	OrderGoodsVo queryById(String orderSn);
 
+	List<OrderGoodsVo> selectList(OrderGoodsQueryBo bo);
+
 	/**
 	 * 查询列表
 	 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.order.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.bank.mapper.QuestionMapper;
 import com.zhongzheng.modules.order.bo.OrderGoodsAddBo;
 import com.zhongzheng.modules.order.bo.OrderGoodsEditBo;
 import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
@@ -10,6 +11,7 @@ import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.mapper.OrderGoodsMapper;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -30,12 +32,20 @@ import java.util.stream.Collectors;
 @Service
 public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGoods> implements IOrderGoodsService {
 
+    @Autowired
+    private OrderGoodsMapper orderGoodsMapper;
+
     @Override
     public OrderGoodsVo queryById(String orderSn){
         OrderGoods db = this.baseMapper.selectById(orderSn);
         return BeanUtil.toBean(db, OrderGoodsVo.class);
     }
 
+    @Override
+    public List<OrderGoodsVo> selectList(OrderGoodsQueryBo bo) {
+        return orderGoodsMapper.selectList(bo);
+    }
+
     @Override
     public List<OrderGoodsVo> queryList(OrderGoodsQueryBo bo) {
         LambdaQueryWrapper<OrderGoods> lqw = Wrappers.lambdaQuery();

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -57,7 +57,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Override
     public List<OrderVo> queryList(OrderQueryBo bo) {
         LambdaQueryWrapper<Order> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StrUtil.isNotBlank(bo.getOderSn()), Order::getOderSn, bo.getOderSn());
+        lqw.eq(StrUtil.isNotBlank(bo.getOrderSn()), Order::getOrderSn, bo.getOrderSn());
         lqw.eq(bo.getUserId() != null, Order::getUserId, bo.getUserId());
         lqw.eq(bo.getOrderPrice() != null, Order::getOrderPrice, bo.getOrderPrice());
         lqw.eq(StrUtil.isNotBlank(bo.getOrderGeneral()), Order::getOrderGeneral, bo.getOrderGeneral());
@@ -161,7 +161,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         }
         iOrderGoodsService.saveBatch(coll);
 
-        add.setOderSn(out_trade_no);
+        add.setOrderSn(out_trade_no);
         add.setOrderFrom(1);
         add.setPayPrice(payPrice);
         add.setOrderPrice(totalPrice);

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderVo.java

@@ -28,7 +28,7 @@ public class OrderVo {
 	/** 订单编号 */
 	@Excel(name = "订单编号")
 	@ApiModelProperty("订单编号")
-	private String oderSn;
+	private String orderSn;
 	/** 用户ID */
 	@Excel(name = "用户ID")
 	@ApiModelProperty("用户ID")

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -22,8 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsInputData" column="goods_input_data"/>
         <result property="goodsPrice" column="goods_price"/>
         <result property="goodsRealPrice" column="goods_real_price"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateTime" column="update_time"/>
+       
 
         <result property="code" column="code"/>
         <result property="goodsName" column="goods_name"/>

zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="com.zhongzheng.modules.order.domain.Order" id="OrderResult">
         <result property="orderId" column="order_id"/>
-        <result property="oderSn" column="oder_sn"/>
+        <result property="orderSn" column="order_sn"/>
         <result property="userId" column="user_id"/>
         <result property="orderPrice" column="order_price"/>
         <result property="orderGeneral" column="order_general"/>