Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-10 9d1b09f48020e2321693a0475cd87131dda57b22

Merge remote-tracking branch 'origin/master'

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TechnicianSubscribe.java

@@ -32,7 +32,7 @@

    @ApiModelProperty(value = "主键")
    @TableId("id")
    private Integer id;
    private Long id;

    @ApiModelProperty(value = "用户id")
    @TableField("app_user_id")
@@ -77,7 +77,7 @@
    private String idStr;


    public void setId(Integer id) {
    public void setId(Long id) {
        this.id = id;
        this.idStr = String.valueOf(id);
    }

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -201,7 +201,7 @@
    public void writeOff(String code,Integer shopId) {
        LoginUser loginUserApplet = tokenService.getLoginUserApplet();
        Order order = orderMapper.selectOne(new LambdaQueryWrapper<Order>()
                .eq(Order::getOrderNumber, code));
                .eq(Order::getId, code));
        boolean check = check(order, shopId, loginUserApplet.getUserid());
        if (!check){
            throw new ServiceException("订单不存在");

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java

@@ -34,14 +34,14 @@

    @PostMapping("/addGoodsCategory")
    @ApiOperation(value = "添加商品分类", tags = {"管理后台-商品分类"})
    public R<Void> addGoodsCategory(GoodsCategory goodsCategory){
    public R<Void> addGoodsCategory(@RequestBody GoodsCategory goodsCategory){
        goodsCategoryService.save(goodsCategory);
        return R.ok();
    }

    @PutMapping("/updateGoodsCategory")
    @ApiOperation(value = "修改商品分类", tags = {"管理后台-商品分类"})
    public R<Void> updateGoodsCategory(GoodsCategory goodsCategory){
    public R<Void> updateGoodsCategory(@RequestBody GoodsCategory goodsCategory){
        goodsCategoryService.updateById(goodsCategory);
        return R.ok();
    }