合并代码

puzhibing

2024-12-26 e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5

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

@@ -2,30 +2,25 @@


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.Goods;
import com.ruoyi.other.api.domain.GoodsBargainPrice;
import com.ruoyi.other.api.domain.GoodsBargainPriceDetail;
import com.ruoyi.other.api.vo.GetGoodsBargainPrice;
import com.ruoyi.other.service.GoodsBargainPriceDetailService;
import com.ruoyi.other.service.GoodsBargainPriceService;
import com.ruoyi.other.service.GoodsService;
import com.ruoyi.other.vo.AddGoodsBargainPriceVo;
import com.ruoyi.other.vo.GoodsBargainPriceInfo;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.models.auth.In;
import io.swagger.annotations.*;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.List;

import static com.alibaba.nacos.shaded.org.checkerframework.checker.units.UnitsTools.g;

/**
 * <p>
@@ -49,15 +44,10 @@
    @Resource
    private TokenService tokenService;

    @Resource
    private GoodsService goodsService;


    /**
     * 根据商品id和会员等级获取门店特价
     *
     * @param goodsBargainPrice
     * @return
     */
    @PostMapping("/getGoodsBargainPrice")
    public R<GoodsBargainPriceDetail> getGoodsBargainPrice(@RequestBody GetGoodsBargainPrice goodsBargainPrice) {
@@ -80,7 +70,7 @@
     * 新增
     */
    @PostMapping("/add")
    @ApiOperation(value = "新增", tags = {"后台管理-门店特殊售价"})
    @ApiOperation(value = "新增", tags = {"管理后台-商品管理-门店特殊售价"})
    @Transactional(rollbackFor = Exception.class)
    public R<Void> add(@RequestBody GoodsBargainPrice goodsBargainPrice) {
        LoginUser loginUserApplet = tokenService.getLoginUserApplet();
@@ -106,7 +96,7 @@
     * 删除
     */
    @DeleteMapping("/delete")
    @ApiOperation(value = "删除", tags = {"后台管理-门店特殊售价"})
    @ApiOperation(value = "删除", tags = {"管理后台-商品管理-门店特殊售价-"})
    public R<Void> delete(@ApiParam("id") @RequestParam("id") Integer id) {
        goodsBargainPriceService.removeById(id);
        goodsBargainPriceDetailService.remove(new LambdaQueryWrapper<GoodsBargainPriceDetail>()
@@ -118,7 +108,7 @@
     * 修改
     */
    @PutMapping("/edit")
    @ApiOperation(value = "修改", tags = {"后台管理-门店特殊售价"})
    @ApiOperation(value = "修改", tags = {"管理后台-商品管理-门店特殊售价"})
    @Transactional(rollbackFor = Exception.class)
    public R<Void> edit(@RequestBody GoodsBargainPrice goodsBargainPrice) {
        goodsBargainPriceService.updateById(goodsBargainPrice);
@@ -132,7 +122,7 @@
     * 详情
     */
    @GetMapping("/detail")
    @ApiOperation(value = "详情", tags = {"后台管理-门店特殊售价"})
    @ApiOperation(value = "详情", tags = {"管理后台-商品管理-门店特殊售价"})
    public R<GoodsBargainPrice> detail(@ApiParam("id") @RequestParam("id") Integer id) {
        GoodsBargainPrice goodsBargainPrice = goodsBargainPriceService.getById(id);
        List<GoodsBargainPriceDetail> goodsBargainPriceDetailList = goodsBargainPriceDetailService.list(new LambdaQueryWrapper<GoodsBargainPriceDetail>()
@@ -145,29 +135,64 @@
     * 列表
     */
    @GetMapping("/list")
    @ApiOperation(value = "列表", tags = {"后台管理-门店特殊售价"})
    public R<Page<GoodsBargainPrice>> list(@ApiParam("页码") @RequestParam(value = "pageNum", required = false) Integer pageNum,
    @ApiOperation(value = "列表", tags = {"管理后台-商品管理-门店特殊售价"})
    public R<IPage<GoodsBargainPrice>> list(@ApiParam("页码") @RequestParam(value = "pageNum", required = false) Integer pageNum,
                                           @ApiParam("每页数量") @RequestParam(value = "pageSize", required = false) Integer pageSize,
                                           @ApiParam("商品id") @RequestParam(value = "goodsId", required = false) Integer goodsId,
                                           @ApiParam("商品名称") @RequestParam(value = "goodsName", required = false) String goodsName,
                                           @ApiParam("商品类型") @RequestParam(value = "goodsType", required = false) Integer goodsType,
                                           @ApiParam("所属分类") @RequestParam(value = "categoryId", required = false) Integer categoryId,
                                           @ApiParam("审核状态") @RequestParam(value = "auditStatus", required = false) Integer auditStatus) {


        List<Integer> goodsIds = goodsService.listObjs(new LambdaQueryWrapper<Goods>()
                .select(Goods::getId)
                .eq(StringUtils.isNotEmpty(goodsName), Goods::getName, goodsName)
                .eq(goodsType != null, Goods::getType, goodsType)
                .eq(categoryId != null, Goods::getGoodsCategoryId, categoryId));

        goodsIds.add(goodsId);
        Page<GoodsBargainPrice> page = goodsBargainPriceService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<GoodsBargainPrice>()
                .eq(!CollectionUtils.isEmpty(goodsIds), GoodsBargainPrice::getGoodsId, goodsId)
                .eq(auditStatus != null, GoodsBargainPrice::getAuditStatus, auditStatus));
        return R.ok(page);
        GoodsBargainPrice bargainPrice = new GoodsBargainPrice();
        bargainPrice.setGoodsName(goodsName);
        bargainPrice.setGoodsId(goodsId);
        bargainPrice.setGoodsType(goodsType);
        bargainPrice.setCategoryId(categoryId);
        bargainPrice.setAuditStatus(auditStatus);
        IPage<GoodsBargainPrice> goodsBargainPriceIPage = goodsBargainPriceService.queryGoodsBargainPricePage(Page.of(pageNum, pageSize), bargainPrice);
        return R.ok(goodsBargainPriceIPage);
    }
    
    
    
    
    @ResponseBody
    @GetMapping("/getGoodsBargainPriceInfo/{id}")
    @ApiOperation(value = "获取商品特殊售价详情", tags = {"门店后台-商品管理"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "商品id", name = "id", required = true, dataType = "int"),
    })
    public R<GoodsBargainPriceInfo> getGoodsBargainPriceInfo(@PathVariable("id") Integer id){
        GoodsBargainPriceInfo goodsBargainPriceInfo = goodsBargainPriceService.getGoodsBargainPriceInfo(id);
        return R.ok(goodsBargainPriceInfo);
    }
    
    
    
    
    @ResponseBody
    @PostMapping("/addGoodsBargainPrice")
    @ApiOperation(value = "保存商品特殊售价", tags = {"门店后台-商品管理"})
    public R addGoodsBargainPrice(@RequestBody AddGoodsBargainPriceVo vo){
        return goodsBargainPriceService.addGoodsBargainPrice(vo);
    }

    /**
     * 审核商品
     */
    @PostMapping("/auditGoods")
    @ApiOperation(value = "审核商品", tags = {"管理后台-商品管理-门店特殊售价"})
    public R<Void> auditGoods(@RequestBody GoodsBargainPrice goodsBargainPrice) {
        LoginUser loginUser = tokenService.getLoginUser();
        Integer id = goodsBargainPrice.getId();
        GoodsBargainPrice bargainPrice = goodsBargainPriceService.getById(id);
        bargainPrice.setAuditStatus(goodsBargainPrice.getAuditStatus());
        bargainPrice.setAuditMsg(goodsBargainPrice.getAuditMsg());
        bargainPrice.setAuditUserId(loginUser.getUserid());
        bargainPrice.setAuditTime(LocalDateTime.now());
        goodsBargainPriceService.updateById(bargainPrice);
        return R.ok();
    }

}