修改

xuhy

5 天以前 13a3236249d21e1ed1a0f1e8ae20a29d6bf3913a

修改

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java

@@ -161,8 +161,8 @@
    @ApiOperation( value = "删除餐饮订单")
    @GetMapping(value = "/deleteById")
    public AjaxResult<Boolean> deleteById(@RequestParam(value = "id") Long id) {
        orderMealGoodsService.remove(Wrappers.lambdaQuery(TOrderMealGoods.class)
                .eq(TOrderMealGoods::getOrderId, id));
//        orderMealGoodsService.remove(Wrappers.lambdaQuery(TOrderMealGoods.class)
//                .eq(TOrderMealGoods::getOrderId, id));
        return AjaxResult.success(orderMealService.removeById(id));
    }


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java

@@ -502,7 +502,10 @@
        for (TOrderSale orderSale : orderSales) {
            orderSale.getOrderSaleGoods().forEach(e->e.setOrderId(orderSale.getId()));
        }
        List<TGoodsType> list = goodsTypeService.list();
        // 查询店铺下的商品
        List<TGoods> goodsList = goodsService.list(Wrappers.lambdaQuery(TGoods.class)
                .in(TGoods::getShopId,dto.getShopId()));
//        List<TGoodsType> list = goodsTypeService.list();
//        orderSaleGoods.forEach(e->e.setTypeName(list.stream().filter(m->m.getId().equals(e.getTypeId())).findFirst().get().getTypeName()));
        orderSaleGoods.forEach(e->{
            e.setId(null);
@@ -515,6 +518,12 @@
            stock.getOrderStockGoods().forEach(e->e.setOrderId(stock.getId()));
        }
        List<TOrderStockGoods> orderStockGoods = stockList.stream().map(TOrderStock::getOrderStockGoods).flatMap(Collection::stream).collect(Collectors.toList());
        if(!CollectionUtils.isEmpty(orderStockGoods)){
            for (TOrderStockGoods orderStockGood : orderStockGoods) {
                goodsList.stream().filter(e->e.getId().equals(orderStockGood.getGoodsId()))
                        .findFirst().ifPresent(e->orderStockGood.setThisCostPrice(e.getCostPrice()));
            }
        }
        orderStockGoodsService.saveBatch(orderStockGoods);
    }

@@ -597,6 +606,7 @@
            orderSaleService.remove(Wrappers.lambdaQuery(TOrderSale.class)
                    .ge(TOrderSale::getOrderTime, dataGenerator.getStartTime())
                    .le(TOrderSale::getOrderTime, dataGenerator.getEndTime())
                    .eq(TOrderSale::getShopId, dataGenerator.getShopId())
                    .eq(TOrderSale::getIsCover,1));
            // 修改覆盖类型为已覆盖
            orderSaleService.update(Wrappers.lambdaUpdate(TOrderSale.class).set(TOrderSale::getIsCover, 1).eq(TOrderSale::getGeneratorId, id));
@@ -604,6 +614,7 @@
            orderStockService.remove(Wrappers.lambdaQuery(TOrderStock.class)
                    .ge(TOrderStock::getStockTime, dataGenerator.getStartTime())
                    .le(TOrderStock::getStockTime, dataGenerator.getEndTime())
                    .eq(TOrderStock::getShopId, dataGenerator.getShopId())
                    .eq(TOrderStock::getIsCover,1));
            // 修改覆盖类型为已覆盖
            orderStockService.update(Wrappers.lambdaUpdate(TOrderStock.class).set(TOrderStock::getIsCover, 1).eq(TOrderStock::getGeneratorId, id));

 ruoyi-system/src/main/resources/mapper/system/TOrderSaleGoodsMapper.xml

@@ -28,7 +28,7 @@
         </foreach>
    </delete>
    <select id="costTotal" resultType="java.math.BigDecimal">
        select sum(goodsCostPrice) from t_order_sale_goods
        select sum(goodsCostPrice*goodsCount) from t_order_sale_goods
        <where>
            <if test="ids != null and ids.size()>0">
                AND orderId IN