浏览代码

fix 计费单商品

he2802 4 年之前
父节点
当前提交
edbd013ec1

+ 1 - 1
zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderGoodsController.java

@@ -73,7 +73,7 @@ public class OrderGoodsController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:goods:query')")
     @GetMapping("/info")
     public AjaxResult<OrderGoodsVo> getInfo(OrderGoodsQueryBo bo) {
-        return AjaxResult.success(iOrderGoodsService.queryBySnId(bo));
+        return AjaxResult.success(iOrderGoodsService.selectDetail(bo));
     }
 
     /**

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

@@ -17,4 +17,5 @@ import java.util.List;
  */
 public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     List<OrderGoodsVo> selectList(OrderGoodsQueryBo bo);
+    OrderGoodsVo selectDetail(OrderGoodsQueryBo bo);
 }

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

@@ -23,7 +23,7 @@ public interface IOrderGoodsService extends IService<OrderGoods> {
 	 */
 	OrderGoodsVo queryById(String orderSn);
 
-	OrderGoodsVo queryBySnId(OrderGoodsQueryBo bo);
+	OrderGoodsVo selectDetail(OrderGoodsQueryBo bo);
 
 	List<OrderGoodsVo> selectList(OrderGoodsQueryBo bo);
 

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

@@ -42,8 +42,8 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
     }
 
     @Override
-    public OrderGoodsVo queryBySnId(OrderGoodsQueryBo bo) {
-        return null;
+    public OrderGoodsVo selectDetail(OrderGoodsQueryBo bo) {
+        return orderGoodsMapper.selectDetail(bo);
     }
 
     @Override

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

@@ -70,6 +70,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND og.order_sn =  #{orderSn}
             </if>
 
+    </select>
+
+    <select id="selectDetail" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo" resultMap="OrderGoodsResultVo">
+        SELECT
+        og.*,
+        g.`code`,
+        g.goods_name,
+        cet.education_name,
+        cpt.project_name,
+        cb.business_name
+        FROM
+        order_goods og
+        LEFT JOIN goods g ON og.goods_id = g.goods_id
+        LEFT JOIN course_education_type cet ON g.education_type_id = cet.id
+        LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
+        LEFT JOIN course_business cb ON g.business_id = cb.id
+        WHERE
+         og.order_sn =  #{orderSn} AND og.goods_id =  #{goodsId}
 
     </select>
 </mapper>