fix 题库

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

@@ -130,6 +130,16 @@ public class OrderController extends BaseController {
         return AjaxResult.success(iOrderService.queryByOrderSn(orderSn));
     }
 
+    /**
+     * 通过单号查询详情
+     */
+    @ApiOperation("通过单号查询详情")
+    @PreAuthorize("@ss.hasPermi('system:order:query')")
+    @GetMapping("/detail/{orderSn}")
+    public AjaxResult<OrderListVo> getOrderDetail(@PathVariable("orderSn" ) String orderSn) {
+        return AjaxResult.success(iOrderService.queryDetailByOrderSn(orderSn));
+    }
+
     @ApiOperation("继续支付PC订单")
     @PostMapping("/resumePCOrder")
     public AjaxResult resumePCOrder(@RequestBody OrderAddBo bo) {
@@ -157,13 +167,5 @@ public class OrderController extends BaseController {
         return AjaxResult.success(iOrderGoodsService.selectDetail(bo));
     }
 
-    /**
-     * 获取订单详细信息
-     */
-    @ApiOperation("获取订单详细信息")
-    @PreAuthorize("@ss.hasPermi('system:order:query')")
-    @GetMapping("/{orderId}")
-    public AjaxResult<OrderVo> getInfo(@PathVariable("orderId" ) Long orderId) {
-        return AjaxResult.success(iOrderService.queryById(orderId));
-    }
+
 }

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

@@ -25,4 +25,6 @@ public interface OrderMapper extends BaseMapper<Order> {
     Integer getGradePeriod(@Param("orderGoodsId") Long orderGoodsId,@Param("userId") Long userId);
 
     Integer queryByOrderSn(String orderSn);
+
+    OrderListVo queryDetailByOrderSn(String orderSn);
 }

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

@@ -80,5 +80,7 @@ public interface IOrderService extends IService<Order> {
 
 	Integer queryByOrderSn(String orderSn);
 
+	OrderListVo queryDetailByOrderSn(String orderSn);
+
 	Map<String, String> resumePcOrder(OrderAddBo bo);
 }

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

@@ -955,6 +955,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return baseMapper.queryByOrderSn(orderSn);
     }
 
+    @Override
+    public OrderListVo queryDetailByOrderSn(String orderSn) {
+        return baseMapper.queryDetailByOrderSn(orderSn);
+    }
+
     @Override
     public Map<String, String> resumePcOrder(OrderAddBo bo) {
         if (bo.getOrderSn() == null) {

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsAttachedMapper.xml

@@ -228,6 +228,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				WHEN ga.type = 3 THEN
 					uer.status
 				END record_status,
+			CASE
+				WHEN ga.type = 1 THEN
+					-1
+				WHEN ga.type = 2 THEN
+					-1
+				WHEN ga.type = 3 THEN
+					e.do_type
+				END do_type,
 			uer.total_question_num,
 			uer.right_question_num,
 			uer.do_question_num

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

@@ -238,4 +238,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="queryByOrderSn" parameterType="String" resultType="Integer">
         SELECT order_status from `order` where order_sn = #{orderSn}
     </select>
+
+    <select id="queryDetailByOrderSn" parameterType="String" resultMap="OrderResultVo">
+        SELECT * from `order` where order_sn = #{orderSn}
+    </select>
 </mapper>