Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-17 c3552aecdf5bede004b63981bab80aca5d462154

Merge remote-tracking branch 'origin/master'

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

@@ -139,5 +139,9 @@
    @ApiModelProperty(value = "地区价格")
    private List<GoodsArea> goodsAreaList;

    public String getIdStr() {
        return String.valueOf(id);
    }


}

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

@@ -39,4 +39,8 @@
    private Long appUserId;


    public String getIdStr() {
        return String.valueOf(id);
    }

}

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

@@ -38,5 +38,25 @@
    @TableField("shop_id")
    private Integer shopId;

    @ApiModelProperty(value = "门店名称")
    @TableField(exist = false)
    private String shopName;

    @ApiModelProperty(value = "店长名称")
    @TableField(exist = false)
    private String ownerName;

    @ApiModelProperty(value = "联系电话")
    @TableField(exist = false)
    private String phone;

    @ApiModelProperty(value = "门店地址")
    @TableField(exist = false)
    private String address;

    public String getIdStr(){
        return String.valueOf(id);
    }


}

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

@@ -78,6 +78,18 @@
    }

    /**
     * 更新上/下架状态
     */
    @PutMapping("/manageGoodsStatus/{goodsId}/{status}")
    @ApiOperation(value = "商品上/下架", tags = {"管理后台-商品管理"})
    public R<Void> manageGoodsStatus(@PathVariable("goodsId") Long goodsId,
                                     @PathVariable("status") Integer status){
        goodsService.lambdaUpdate().eq(Goods::getId, goodsId).set(Goods::getStatus, status).update();
        return R.ok();
    }


    /**
     * 后台商品删除
     */
    @DeleteMapping("/manageGoodsDelete/{goodsId}")

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java

@@ -253,6 +253,14 @@
        // 指定门店
        List<GoodsShop> goodsShops = goodsShopService.list(new LambdaQueryWrapper<GoodsShop>()
                .eq(GoodsShop::getGoodsId, goodsId));

        for (GoodsShop goodsShop : goodsShops) {
            Shop shop = shopMapper.selectById(goodsShop.getShopId());
            goodsShop.setShopName(shop.getName());
            goodsShop.setOwnerName(shop.getShopManager());
            goodsShop.setPhone(shop.getPhone());
            goodsShop.setAddress(shop.getAddress());
        }
        goods.setGoodsShopList(goodsShops);

        // 指定用户