fix 计费单商品

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

@@ -4,10 +4,13 @@ import java.util.List;
 import java.util.Arrays;
 
 import com.zhongzheng.common.utils.SecurityUtils;
+import com.zhongzheng.modules.order.bo.OrderBillGoodsQueryBo;
 import com.zhongzheng.modules.order.bo.OrderBillSheetAddBo;
 import com.zhongzheng.modules.order.bo.OrderBillSheetEditBo;
 import com.zhongzheng.modules.order.bo.OrderBillSheetQueryBo;
+import com.zhongzheng.modules.order.service.IOrderBillGoodsService;
 import com.zhongzheng.modules.order.service.IOrderBillSheetService;
+import com.zhongzheng.modules.order.vo.OrderBillGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderBillSheetVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -43,6 +46,8 @@ public class OrderBillSheetController extends BaseController {
 
     private final IOrderBillSheetService iOrderBillSheetService;
 
+    private final IOrderBillGoodsService iOrderBillGoodsService;
+
     /**
      * 查询订单计费单列表
      */
@@ -111,4 +116,14 @@ public class OrderBillSheetController extends BaseController {
     public AjaxResult<Void> remove(@PathVariable Long[] sheetIds) {
         return toAjax(iOrderBillSheetService.deleteWithValidByIds(Arrays.asList(sheetIds), true) ? 1 : 0);
     }*/
+
+    /**
+     * 查询订单计费单商品列表
+     */
+    @ApiOperation("查询计费单商品详情")
+    @PreAuthorize("@ss.hasPermi('system:goods:list')")
+    @GetMapping("/goods")
+    public AjaxResult<OrderBillGoodsVo> goods(OrderBillGoodsQueryBo bo) {
+        return AjaxResult.success(iOrderBillGoodsService.selectDetail(bo));
+    }
 }

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

@@ -1,7 +1,11 @@
 package com.zhongzheng.modules.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.order.bo.OrderBillGoodsQueryBo;
+import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
 import com.zhongzheng.modules.order.domain.OrderBillGoods;
+import com.zhongzheng.modules.order.vo.OrderBillGoodsVo;
+import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 
 /**
  * 订单计费单商品Mapper接口

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

@@ -23,6 +23,8 @@ public interface IOrderBillGoodsService extends IService<OrderBillGoods> {
 	 */
 	OrderBillGoodsVo queryById(Long id);
 
+	OrderBillGoodsVo selectDetail(OrderBillGoodsQueryBo bo);
+
 	/**
 	 * 查询列表
 	 */

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

@@ -7,6 +7,7 @@ import com.zhongzheng.modules.order.bo.OrderBillGoodsAddBo;
 import com.zhongzheng.modules.order.bo.OrderBillGoodsEditBo;
 import com.zhongzheng.modules.order.bo.OrderBillGoodsQueryBo;
 import com.zhongzheng.modules.order.domain.OrderBillGoods;
+import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.mapper.OrderBillGoodsMapper;
 import com.zhongzheng.modules.order.service.IOrderBillGoodsService;
 import com.zhongzheng.modules.order.vo.OrderBillGoodsVo;
@@ -36,6 +37,12 @@ public class OrderBillGoodsServiceImpl extends ServiceImpl<OrderBillGoodsMapper,
         return BeanUtil.toBean(db, OrderBillGoodsVo.class);
     }
 
+    @Override
+    public OrderBillGoodsVo selectDetail(OrderBillGoodsQueryBo bo) {
+        OrderBillGoods db = this.getOne(new LambdaQueryWrapper<OrderBillGoods>().eq(OrderBillGoods::getSheetSn, bo.getSheetSn()).eq(OrderBillGoods::getGoodsId,bo.getGoodsId()));
+        return BeanUtil.toBean(db, OrderBillGoodsVo.class);
+    }
+
     @Override
     public List<OrderBillGoodsVo> queryList(OrderBillGoodsQueryBo bo) {
         LambdaQueryWrapper<OrderBillGoods> lqw = Wrappers.lambdaQuery();

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

@@ -18,5 +18,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
     </resultMap>
 
-
 </mapper>