修改

xuhy

2024-10-30 660f4451c140a9da1f4bb92721a403b128dbdaf7

修改

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

@@ -69,7 +69,13 @@
    @PostMapping(value = "/add")
    public AjaxResult<Boolean> add(@RequestBody TGoods dto) {
        dto.setShopId(tokenService.getLoginUser().getObjectId());
        dto.setGoodsNum(CodeGenerateUtils.generateVolumeSn());
        String num = CodeGenerateUtils.generateVolumeSn();
        long count = goodsService.count(Wrappers.lambdaQuery(TGoods.class)
                .eq(TGoods::getGoodsNum, num));
        if(count>0){
            num = CodeGenerateUtils.generateVolumeSn();
        }
        dto.setGoodsNum(num);
        return AjaxResult.success(goodsService.save(dto));
    }


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

@@ -2,27 +2,26 @@


import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.mysql.cj.xdevapi.Collection;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain.TBoard;
import com.ruoyi.system.domain.TShop;
import com.ruoyi.system.domain.*;
import com.ruoyi.system.dto.TShopDTO;
import com.ruoyi.system.query.TShopQuery;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TBoardService;
import com.ruoyi.system.service.TShopService;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TShopVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

import static com.ruoyi.common.core.domain.AjaxResult.error;

@@ -43,13 +42,33 @@
    private final ISysUserService userService;
    private final TBoardService boardService;
    private final TokenService tokenService;
    private final TGoodsService goodsService;
    private final TGoodsTypeService goodsTypeService;
    private final TOrderMealService mealService;
    private final TOrderMealGoodsService mealGoodsService;
    private final TOrderSaleService saleService;
    private final TOrderSaleGoodsService saleGoodsService;
    private final TOrderStockService stockService;
    private final TOrderStockGoodsService stockGoodsService;
    private final TStockDataSetService stockDataSetService;
    private final TDataGeneratorService dataGeneratorService;

    @Autowired
    public TShopController(TShopService shopService, ISysUserService userService, TBoardService boardService, TokenService tokenService) {
    public TShopController(TShopService shopService, ISysUserService userService, TBoardService boardService, TokenService tokenService, TGoodsService goodsService, TGoodsTypeService goodsTypeService, TOrderMealService mealService, TOrderMealGoodsService mealGoodsService, TOrderSaleService saleService, TOrderSaleGoodsService saleGoodsService, TOrderStockService stockService, TOrderStockGoodsService stockGoodsService, TStockDataSetService stockDataSetService, TDataGeneratorService dataGeneratorService) {
        this.shopService = shopService;
        this.userService = userService;
        this.boardService = boardService;
        this.tokenService = tokenService;
        this.goodsService = goodsService;
        this.goodsTypeService = goodsTypeService;
        this.mealService = mealService;
        this.mealGoodsService = mealGoodsService;
        this.saleService = saleService;
        this.saleGoodsService = saleGoodsService;
        this.stockService = stockService;
        this.stockGoodsService = stockGoodsService;
        this.stockDataSetService = stockDataSetService;
        this.dataGeneratorService = dataGeneratorService;
    }

    /**
@@ -142,6 +161,53 @@
        if(Objects.nonNull(sysUser)){
            userService.deleteUserById(sysUser.getUserId());
        }
        // 删除店铺下的桌子
        long boardCount = boardService.count(Wrappers.lambdaQuery(TBoard.class)
                .eq(TBoard::getShopId, id));
        if(boardCount>0){
            boardService.deleteByShopId(id);
        }
        // 删除店铺下的餐品分类
        long goodsCount = goodsService.count(Wrappers.lambdaQuery(TGoods.class)
                .eq(TGoods::getShopId, id));
        if(goodsCount>0){
            goodsService.deleteByShopId(id);
        }
        long goodsTypeCount = goodsTypeService.count(Wrappers.lambdaQuery(TGoodsType.class)
                .eq(TGoodsType::getShopId, id));
        if (goodsTypeCount>0){
            goodsTypeService.deleteByShopId(id);
        }
        // 删除店铺下的餐饮订单
        List<TOrderMeal> mealList = mealService.list(Wrappers.lambdaQuery(TOrderMeal.class)
                .eq(TOrderMeal::getShopId, id));
        List<Long> mealIds = mealList.stream().map(TOrderMeal::getId).collect(Collectors.toList());
        if(!CollectionUtils.isEmpty(mealIds)){
            mealGoodsService.deleteByOrderId(mealIds);
            mealService.deleteByShopId(id);
        }
        // 删除店铺下的销售数据
        List<TOrderSale> saleList = saleService.list(Wrappers.lambdaQuery(TOrderSale.class)
                .eq(TOrderSale::getShopId, id));
        List<Long> saleIds = saleList.stream().map(TOrderSale::getId).collect(Collectors.toList());
        if(!CollectionUtils.isEmpty(saleIds)){
            saleGoodsService.deleteByOrderId(saleIds);
            saleService.deleteByShopId(id);
        }
        // 删除店铺下的进货数据
        List<TOrderStock> stockList = stockService.list(Wrappers.lambdaQuery(TOrderStock.class)
                .eq(TOrderStock::getShopId, id));
        List<Long> stockIds = stockList.stream().map(TOrderStock::getId).collect(Collectors.toList());
        if(!CollectionUtils.isEmpty(stockIds)){
            stockGoodsService.deleteByOrderId(stockIds);
            stockService.deleteByShopId(id);
        }
        // 删除店铺下的生成数据
        long dataGeneratorCount = dataGeneratorService.count(Wrappers.lambdaQuery(TDataGenerator.class)
                .eq(TDataGenerator::getShopId, id));
        if (dataGeneratorCount>0){
            dataGeneratorService.deleteByShopId(id);
        }
        return AjaxResult.success(shopService.removeById(id));
    }


 ruoyi-common/src/main/java/com/ruoyi/common/utils/CodeGenerateUtils.java

@@ -62,7 +62,7 @@
     */
    public static String generateVolumeSn() {
        Calendar calendar = Calendar.getInstance();
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
        String dateTime = dateFormat.format(calendar.getTime());
        dateTime = dateTime.substring(2);
        String timestampPart = "" + (Math.random() * 10000) * (System.currentTimeMillis() / 10000);
@@ -72,8 +72,8 @@
        int day = calendar.get(Calendar.DAY_OF_MONTH);
        double v = Math.random() * 10000;
        int dayNum = (int) ((v % 3.33) * day);
        String dayPart = "0" + dayNum;
        dayPart = dayPart.substring(dayPart.length() - 2);
        String dayPart = "001" + dayNum;
        dayPart = dayPart.substring(dayPart.length() - 3);
        return dateTime + timestampPart + dayPart;
    }


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBoardMapper.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.TBoard;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * <p>
@@ -15,4 +16,9 @@
@Mapper
public interface TBoardMapper extends BaseMapper<TBoard> {

    /**
     * 根据店铺id删除
     * @param shopId
     */
    void deleteByShopId(@Param("shopId") Long shopId);
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TDataGeneratorMapper.java

@@ -31,4 +31,10 @@
     * @return
     */
    List<TDataGeneratorVO> pageList(@Param("query") TDataGeneratorQuery query, @Param("pageInfo")PageInfo<TDataGeneratorVO> pageInfo);

    /**
     * 数据生成删除
     * @param shopId
     */
    void deleteByShopId(@Param("shopId")Long shopId);
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TGoodsMapper.java

@@ -28,4 +28,10 @@
     * @return
     */
    List<TGoodsVO> pageList(@Param("query") TGoodsQuery query, @Param("pageInfo") PageInfo<TGoodsVO> pageInfo);

    /**
     * 根据商家id删除商品管理
     * @param shopId
     */
    void deleteByShopId(@Param("shopId")Long shopId);
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TGoodsTypeMapper.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.TGoodsType;
import org.apache.ibatis.annotations.Param;

/**
 * <p>
@@ -13,4 +14,9 @@
 */
public interface TGoodsTypeMapper extends BaseMapper<TGoodsType> {

    /**
     * 根据商家id删除
     * @param shopId
     */
    void deleteByShopId(@Param("shopId") Long shopId);
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TOrderMealGoodsMapper.java

@@ -36,4 +36,5 @@
     */
    List<SalesRankingVO> salesRanking(@Param("ids")List<Long> ids, @Param("pageInfo")PageInfo<SalesRankingVO> pageInfo);

    void deleteByOrderId(@Param("mealIds")List<Long> mealIds);
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TOrderMealMapper.java

@@ -115,4 +115,11 @@
     * @return
     */
    List<GoodsProfitVO> profitDetailsExport(@Param("query")ProfitDetailsQuery query);

    /**
     * 删除
     * @param shopId
     */
    void deleteByShopId(@Param("shopId")Long shopId);

}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TOrderSaleGoodsMapper.java

@@ -36,4 +36,10 @@
     */
    List<SalesRankingVO> salesRanking(@Param("ids")List<Long> ids, @Param("pageInfo")PageInfo<SalesRankingVO> pageInfo);

    /**
     * 删除销售单商品
     * @param saleIds
     */
    void deleteByOrderId(@Param("saleIds")List<Long> saleIds);

}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TOrderSaleMapper.java

@@ -102,4 +102,10 @@
     */
    List<GoodsProfitVO> profitDetailsExport(@Param("query")ProfitDetailsQuery query);

    /**
     * 删除
     * @param shopId
     */
    void deleteByShopId(@Param("shopId")Long shopId);

}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TOrderStockGoodsMapper.java

@@ -26,4 +26,10 @@
     * @return
     */
    List<TOrderStockGoods> getListByTimeAndShopId(@Param("orderTime") String orderTime, @Param("shopId")Long shopId);

    /**
     * 删除进货单商品
     * @param stockIds
     */
    void deleteByOrderId(@Param("stockIds")List<Long> stockIds);
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TOrderStockMapper.java

@@ -41,4 +41,10 @@
     * @return
     */
    List<TOrderStockVO> stockGeneratorExport(@Param("query")TDataGeneratorStockQuery query);

    /**
     * 进货删除
     * @param shopId
     */
    void deleteByShopId(@Param("shopId")Long shopId);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TBoardService.java

@@ -13,4 +13,9 @@
 */
public interface TBoardService extends IService<TBoard> {

    /**
     * 根据店铺id删除
     * @param shopId
     */
    void deleteByShopId(Long shopId);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TDataGeneratorService.java

@@ -70,4 +70,10 @@
     * @return
     */
    List<TOrderSaleVO> mealGeneratorExport(TDataGeneratorMealQuery query);

    /**
     * 餐饮数据生成列表删除
     * @param shopId
     */
    void deleteByShopId(Long shopId);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TGoodsService.java

@@ -22,4 +22,10 @@
     * @return
     */
    PageInfo<TGoodsVO> pageList(TGoodsQuery query);

    /**
     * 删除商品管理
     * @param shopId
     */
    void deleteByShopId(Long shopId);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TGoodsTypeService.java

@@ -13,4 +13,9 @@
 */
public interface TGoodsTypeService extends IService<TGoodsType> {

    /**
     * 根据商家id删除
     * @param shopId
     */
    void deleteByShopId(Long shopId);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TOrderMealGoodsService.java

@@ -23,4 +23,10 @@
     * @return
     */
    BigDecimal costTotal(List<Long> ids);

    /**
     * 删除
     * @param mealIds
     */
    void deleteByOrderId(List<Long> mealIds);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TOrderMealService.java

@@ -139,4 +139,10 @@
     * @return
     */
    List<GoodsProfitVO> profitDetailsExport(ProfitDetailsQuery query);

    /**
     * 删除
     * @param shopId
     */
    void deleteByShopId(Long shopId);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TOrderSaleGoodsService.java

@@ -23,4 +23,10 @@
     * @return
     */
    BigDecimal costTotal(List<Long> ids);

    /**
     * 删除
     * @param saleIds
     */
    void deleteByOrderId(List<Long> saleIds);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TOrderSaleService.java

@@ -116,4 +116,11 @@
     * @return
     */
    List<GoodsProfitVO> profitDetailsExport(ProfitDetailsQuery query);

    /**
     * 删除销售数据
     * @param shopId
     */
    void deleteByShopId(Long shopId);

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TOrderStockGoodsService.java

@@ -27,4 +27,9 @@
     */
    List<TOrderStockGoods> getListByTimeAndShopId(String orderTime, Long shopId);

    /**
     * 删除
     * @param stockIds
     */
    void deleteByOrderId(List<Long> stockIds);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TOrderStockService.java

@@ -61,4 +61,10 @@
     * @param dto
     */
    void editGenerator(TOrderStockDTO dto);

    /**
     * 删除
     * @param shopId
     */
    void deleteByShopId(Long shopId);
}

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

@@ -17,4 +17,8 @@
@Service
public class TBoardServiceImpl extends ServiceImpl<TBoardMapper, TBoard> implements TBoardService {

    @Override
    public void deleteByShopId(Long shopId) {
        this.baseMapper.deleteByShopId(shopId);
    }
}

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

@@ -131,7 +131,13 @@
                orderMeal.setMealType(1);
                orderMeal.setMealPerson(random);
                orderMeal.setMealTime(orderMealGeneratorCountDTO.getTime());
                orderMeal.setOrderNum(OrderNumConstants.MEAL + CodeGenerateUtils.generateVolumeSn());
                String num = OrderNumConstants.MEAL + CodeGenerateUtils.generateVolumeSn();
//                long count1 = orderMealService.count(Wrappers.lambdaQuery(TOrderMeal.class)
//                        .eq(TOrderMeal::getOrderNum, num));
//                if(count1>0){
//                    num = CodeGenerateUtils.generateVolumeSn();
//                }
                orderMeal.setOrderNum(num);
                orderMeal.setStatus(2);
                List<TOrderMealGoods> orderMealGoods = new ArrayList<>();
                // 获取当前桌的菜品
@@ -696,6 +702,11 @@
        return null;
    }

    @Override
    public void deleteByShopId(Long shopId) {
        this.baseMapper.deleteByShopId(shopId);
    }

    private int getRandomPayType(Integer size,BigDecimal count) {
        BigDecimal bigDecimal = new BigDecimal(size).multiply(count.divide(new BigDecimal(100))).setScale(0, BigDecimal.ROUND_FLOOR);
        return Integer.parseInt(bigDecimal.toString());

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

@@ -29,4 +29,9 @@
        pageInfo.setRecords(list);
        return pageInfo;
    }

    @Override
    public void deleteByShopId(Long shopId) {
        this.baseMapper.deleteByShopId(shopId);
    }
}

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

@@ -17,4 +17,8 @@
@Service
public class TGoodsTypeServiceImpl extends ServiceImpl<TGoodsTypeMapper, TGoodsType> implements TGoodsTypeService {

    @Override
    public void deleteByShopId(Long shopId) {
        this.baseMapper.deleteByShopId(shopId);
    }
}

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

@@ -24,4 +24,9 @@
    public BigDecimal costTotal(List<Long> ids) {
        return this.baseMapper.costTotal(ids);
    }

    @Override
    public void deleteByOrderId(List<Long> mealIds) {
        this.baseMapper.deleteByOrderId(mealIds);
    }
}

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

@@ -493,4 +493,9 @@
        return this.baseMapper.profitDetailsExport(query);
    }

    @Override
    public void deleteByShopId(Long shopId) {
        this.baseMapper.deleteByShopId(shopId);
    }

}

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

@@ -23,4 +23,9 @@
    public BigDecimal costTotal(List<Long> ids) {
        return this.baseMapper.costTotal(ids);
    }

    @Override
    public void deleteByOrderId(List<Long> saleIds) {
        this.baseMapper.deleteByOrderId(saleIds);
    }
}

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

@@ -447,4 +447,9 @@
    public List<GoodsProfitVO> profitDetailsExport(ProfitDetailsQuery query) {
        return this.baseMapper.profitDetailsExport(query);
    }

    @Override
    public void deleteByShopId(Long shopId) {
        this.baseMapper.deleteByShopId(shopId);
    }
}

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

@@ -26,4 +26,9 @@
    public List<TOrderStockGoods> getListByTimeAndShopId(String orderTime, Long shopId) {
        return this.baseMapper.getListByTimeAndShopId(orderTime,shopId);
    }

    @Override
    public void deleteByOrderId(List<Long> stockIds) {
        this.baseMapper.deleteByOrderId(stockIds);
    }
}

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

@@ -281,4 +281,9 @@
        });
        tOrderStockGoodsService.saveBatch(orderStockGoods);
    }

    @Override
    public void deleteByShopId(Long shopId) {
        this.baseMapper.deleteByShopId(shopId);
    }
}

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

@@ -5,7 +5,7 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.domain.TBoard">
        <id column="id" property="id" />
        <result column="companyId" property="companyId" />
        <result column="shopId" property="shopId" />
        <result column="boardName" property="boardName" />
        <result column="minPerson" property="minPerson" />
        <result column="maxPerson" property="maxPerson" />
@@ -19,7 +19,10 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id,companyId, boardName, minPerson, maxPerson, createTime, updateTime, disabled, createBy, updateBy, status
        id,shopId, boardName, minPerson, maxPerson, createTime, updateTime, disabled, createBy, updateBy, status
    </sql>
    <delete id="deleteByShopId">
        delete from t_board where shopId = #{shopId}
    </delete>

</mapper>

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

@@ -31,6 +31,9 @@
        id, userId, userName, shopId, startTime, endTime, minMoney, maxMoney, status, createTime, updateTime, disabled, createBy, updateBy,orderType,weiXinPay,
        aliPay,cardPay,moneyPay,otherPay
    </sql>
    <delete id="deleteByShopId">
        delete from t_data_generator where shopId = #{shopId}
    </delete>
    <select id="pageList" resultType="com.ruoyi.system.vo.TDataGeneratorVO">
        select tdg.id, tdg.userId, tdg.userName, tdg.shopId, tdg.startTime, tdg.endTime, tdg.minMoney, tdg.maxMoney, tdg.status, tdg.createTime,
               tdg.updateTime, tdg.disabled, tdg.createBy, tdg.updateBy,tdg.orderType,tdg.weiXinPay,tdg.aliPay,tdg.cardPay,tdg.moneyPay,tdg.otherPay,

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

@@ -24,6 +24,9 @@
    <sql id="Base_Column_List">
        id, goodsNum, goodsName, typeId, costPrice, salePrice, goodsPicture, createTime, updateTime, disabled, createBy, updateBy, inventory,shopId
    </sql>
    <delete id="deleteByShopId">
        delete from t_goods where shopId = #{shopId}
    </delete>
    <select id="pageList" resultType="com.ruoyi.system.vo.TGoodsVO">
        select
        t.id,

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

@@ -18,5 +18,8 @@
    <sql id="Base_Column_List">
        id, typeName, createTime, updateTime, disabled, createBy, updateBy,shopId
    </sql>
    <delete id="deleteByShopId">
        delete from t_goods_type where shopId = #{shopId}
    </delete>

</mapper>

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

@@ -26,6 +26,12 @@
    <sql id="Base_Column_List">
        id, goodsNum, goodsName, goodsSalePrice, goodsPicture, goodsCount, orderId,typeName,costPrice,typeId,goodsId,createTime
    </sql>
    <delete id="deleteByOrderId">
        delete from t_order_meal_goods where orderId in
         <foreach collection="mealIds" separator="," item="orderId" open="(" close=")">
            #{orderId}
         </foreach>
    </delete>
    <select id="costTotal" resultType="java.math.BigDecimal">
        select sum(costPrice*goodsCount) from t_order_meal_goods
        <where>

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

@@ -30,6 +30,9 @@
        id, boardId, mealType, mealPerson, orderMoney, payMoney, payType, createTime, updateTime, disabled,
            createBy, updateBy, orderNum, status,isCover,shopId,generatorId,remark,mealTime
    </sql>
    <delete id="deleteByShopId">
        delete from t_order_meal where shopId = #{shopId}
    </delete>
    <select id="pageList" resultType="com.ruoyi.system.vo.TOrderMealVO">
        select
        tom.id, tom.boardId, tom.mealType, tom.mealPerson, tom.orderMoney, tom.payMoney, tom.payType, tom.createTime, tom.updateTime, tom.disabled,

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

@@ -21,6 +21,12 @@
    <sql id="Base_Column_List">
        id, orderId, goodsNum, goodsName, goodsCostPrice, goodsSalePrice, goodsCount, thisSalePrice, goodsPicture,typeId,goodsId
    </sql>
    <delete id="deleteByOrderId">
        DELETE FROM t_order_sale_goods WHERE orderId in
         <foreach collection="saleIds" item="orderId" separator="," open="(" close=")">
             #{orderId}
         </foreach>
    </delete>
    <select id="costTotal" resultType="java.math.BigDecimal">
        select sum(goodsCostPrice) from t_order_sale_goods
        <where>

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

@@ -26,6 +26,9 @@
    <sql id="Base_Column_List">
        id, orderTime, remark, createTime, updateTime, disabled, createBy, updateBy, orderNum, status,orderMoney,payMoney,shopId,generatorId,payType,isCover
    </sql>
    <delete id="deleteByShopId">
        delete from t_order_sale where shopId = #{shopId}
    </delete>
    <select id="pageList" resultType="com.ruoyi.system.vo.TOrderSaleVO">
        select id, orderTime, remark, createTime, updateTime, disabled, createBy, updateBy, orderNum, status,orderMoney,payMoney,shopId,generatorId,payType,isCover
        from t_order_sale

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

@@ -20,6 +20,12 @@
    <sql id="Base_Column_List">
        id, orderId, goodsNum, goodsName, costPrice, salePrice, goodsPicture, stockCount,thisCostPrice,goodsId
    </sql>
    <delete id="deleteByOrderId">
        delete from t_order_stock_goods where orderId in
          <foreach collection="stockIds" close=")" open="(" separator="," item="orderId">
              #{orderId}
          </foreach>
    </delete>
    <select id="getListByTimeAndShopId" resultType="com.ruoyi.system.domain.TOrderStockGoods">
        select t.id, t.orderId, t.goodsNum, t.goodsName, t.costPrice, t.salePrice, t.goodsPicture, t.stockCount,t.thisCostPrice,t.goodsId
        from t_order_stock_goods t

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

@@ -22,6 +22,9 @@
    <sql id="Base_Column_List">
        id, stockNum, stockTime, createTime, updateTime, disabled, createBy, updateBy,isCover,shopId,generatorId,stockTotalPrice
    </sql>
    <delete id="deleteByShopId">
        DELETE FROM t_order_stock WHERE shopId = #{shopId}
    </delete>
    <select id="pageList" resultType="com.ruoyi.system.vo.TOrderStockVO">
        SELECT <include refid="Base_Column_List"></include>
        FROM t_order_stock