bug修改

liujie

2025-10-13 5d4ebe6d0b7dda230b19f4913bdeb60556b46678

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

@@ -1,8 +1,27 @@
package com.ruoyi.web.controller.api;


import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.BaseModel;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TErpGoodsUpdateStatusDto;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TSysGoodsExchangeQuery;
import com.ruoyi.system.query.TSysGoodsQuery;
import com.ruoyi.system.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -14,7 +33,184 @@
 */
@RestController
@RequestMapping("/t-sys-goods")
@Api(tags = "积分商品管理")
public class TSysGoodsController {

    private final TSysGoodsService sysGoodsService;
    private final TokenService tokenService;
    private final TCrmSupplierService crmSupplierService;
    private final TSysGoodsExchangeService sysGoodsExchangeService;


    @Autowired
    public TSysGoodsController(TokenService tokenService, TSysGoodsService sysGoodsService, TCrmSupplierService crmSupplierService, TSysGoodsExchangeService sysGoodsExchangeService) {
        this.sysGoodsService = sysGoodsService;
        this.tokenService = tokenService;
        this.crmSupplierService = crmSupplierService;
        this.sysGoodsExchangeService = sysGoodsExchangeService;

    }

    /**
     * 获取积分商品列表
     */
    @ApiOperation(value = "获取积分商品列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TSysGoods>> pageList(@RequestBody TSysGoodsQuery query) {

        SysUser user = tokenService.getLoginUser().getUser();
        Integer roleType = user.getRoleType();
        PageInfo<TSysGoods> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if (roleType == 4) {
            // 供应商
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            LambdaQueryWrapper<TSysGoods> tSysGoodsLambdaQueryWrapper = new LambdaQueryWrapper<>();
            tSysGoodsLambdaQueryWrapper.eq(TSysGoods::getSupplierId, crmSupplier.getId());
            if (query.getGoodsName() != null && !query.getGoodsName().isEmpty()) {
                tSysGoodsLambdaQueryWrapper.like(TSysGoods::getGoodsName, query.getGoodsName());
            }
            if (query.getStatus() != null) {
                tSysGoodsLambdaQueryWrapper.eq(TSysGoods::getStatus, query.getStatus());
            }
            tSysGoodsLambdaQueryWrapper.orderByDesc(BaseModel::getCreateTime);

            Page<TSysGoods> page = sysGoodsService.page(pageInfo, tSysGoodsLambdaQueryWrapper);
            List<TSysGoods> records = page.getRecords();
            if (!records.isEmpty()) {
                List<TSysGoodsExchange> list = sysGoodsExchangeService.list(new LambdaQueryWrapper<TSysGoodsExchange>().in(TSysGoodsExchange::getGoodsId, records.stream().map(TSysGoods::getId).collect(Collectors.toList())));
                records.forEach(item -> {
                    item.setExchangeQuantity(list.stream().filter(item1 -> item1.getGoodsId().equals(item.getId())).mapToInt(TSysGoodsExchange::getGoodsCount).sum());
                    item.setSurplusQuantity(item.getGoodsTotal() - item.getExchangeQuantity());
                });
            }
            pageInfo.setRecords(records);
            return R.ok(pageInfo);
        }
        return R.ok(pageInfo);
    }



    @ApiOperation(value = "添加积分商品")
    @PostMapping(value = "/add")
    public R<String> add(@RequestBody TSysGoods goods) {
        SysUser user = tokenService.getLoginUser().getUser();
        Integer roleType = user.getRoleType();
        if (roleType == 4) {
            // 供应商
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            goods.setSupplierId(crmSupplier.getId());
            sysGoodsService.save(goods);
            return R.ok(goods.getId());
        }
        return R.ok();
    }

    @ApiOperation(value = "编辑积分商品")
    @PostMapping(value = "/update")
    public R<String> update(@RequestBody TSysGoods goods) {
        SysUser user = tokenService.getLoginUser().getUser();
        Integer roleType = user.getRoleType();

        List<TSysGoodsExchange> list = sysGoodsExchangeService.list(new LambdaQueryWrapper<TSysGoodsExchange>().eq(TSysGoodsExchange::getGoodsId, goods.getId()));
        int sum = list.stream().mapToInt(TSysGoodsExchange::getGoodsCount).sum();
        if(goods.getGoodsTotal()< sum){
            return R.fail("商品总数不能小于已兑换数量");
        }
        if (roleType == 4) {
            // 供应商
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            goods.setSupplierId(crmSupplier.getId());
            sysGoodsService.updateById(goods);
            return R.ok(goods.getId());
        }
        return R.ok();
    }



    @ApiOperation(value = "删除积分商品")
    @DeleteMapping(value = "/delete/{id}")
    public R<String> delete(@PathVariable String id) {
        SysUser user = tokenService.getLoginUser().getUser();
        Integer roleType = user.getRoleType();
        if (roleType == 4) {
            // 供应商
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            TSysGoods goods = sysGoodsService.getById(id);
            if(goods.getSupplierId().equals(crmSupplier.getId())){
                sysGoodsService.removeById(id);
            }else {
                return R.fail("没有权限");
            }
        }
        return R.ok();
    }


    @ApiOperation(value = "积分商品 上下架")
    @PostMapping(value = "/updateStatus")
    public R<String> updateStatus(@RequestBody @Valid TErpGoodsUpdateStatusDto dto) {
        SysUser user = tokenService.getLoginUser().getUser();
        Integer roleType = user.getRoleType();
        if (roleType == 4) {
            // 供应商
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            TSysGoods goods = sysGoodsService.getById(dto.getId());
            if(goods.getSupplierId().equals(crmSupplier.getId())){
                goods.setStatus(dto.getState());
                sysGoodsService.updateById(goods);
            }else {
                return R.fail("没有权限");
            }
        }
        return R.ok();
    }


    // 获取兑换记录
    @ApiOperation(value = "获取兑换记录")
    @PostMapping(value = "/getExchangeRecord")
    public R<PageInfo<TSysGoodsExchange>> getExchangeRecord(@RequestBody @Valid TSysGoodsExchangeQuery query) {
        PageInfo<TSysGoodsExchange> page = new PageInfo<>(query.getPageNum(), query.getPageSize());
        LambdaQueryWrapper<TSysGoodsExchange> wrapper = new LambdaQueryWrapper<TSysGoodsExchange>().eq(TSysGoodsExchange::getGoodsId, query.getId());
        if(query.getClinicName()!=null && !query.getClinicName().isEmpty()){
            wrapper.like(TSysGoodsExchange::getClinicName, query.getClinicName());
        }
        if(query.getTime()!=null && !query.getTime().isEmpty()){
            wrapper.between(TSysGoodsExchange::getCreateTime, query.getTime().split(" - ")[0]+ " 00:00:00", query.getTime().split(" - ")[1]+ " 23:59:59");
        }
        if(query.getStatus()!=null){
            wrapper.eq(TSysGoodsExchange::getStatus, query.getStatus());
        }
        wrapper.orderByDesc(BaseModel::getCreateTime);
        PageInfo<TSysGoodsExchange> page1 = sysGoodsExchangeService.page(page, wrapper);
        return R.ok(page1);
    }

    // 获取兑换记录
    @ApiOperation(value = "发货")
    @PostMapping(value = "/sendGoods")
    public R<?> sendGoods(@RequestBody @Valid TSysGoodsExchange exchange) {
        TSysGoodsExchange exchange1 = sysGoodsExchangeService.getById(exchange.getId());
        if(exchange1.getStatus()==2){
            return R.fail("该订单已发货");
        }
        exchange1.setStatus(2);
        exchange1.setLogisticsNumber(exchange1.getLogisticsNumber());
        sysGoodsExchangeService.updateById(exchange1);
        return R.ok();
    }

}