代码提交

44323

2024-05-21 a2762d243c7f5585b7996eeb8e9aeb0634af0167

 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java

@@ -3,7 +3,9 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.goods.domain.*;
import com.ruoyi.goods.dto.GoodExchangeDTO;
@@ -11,6 +13,7 @@
import com.ruoyi.goods.dto.GoodsTypeQuery;
import com.ruoyi.goods.service.*;
import com.ruoyi.goods.vo.TGoodsVO;
import com.ruoyi.system.api.model.LoginUserParent;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -165,6 +168,16 @@
        return R.ok(orderService.lambdaQuery().eq(TOrder::getUserId, SecurityUtils.getUserId())
                .orderByDesc(TOrder::getCreateTime).list());
    }
    /**
     * 兑换记录
     */
    @GetMapping("/confirm")
    @ApiOperation(value = "确认收货", tags = {"兑换记录"})
    public AjaxResult confirm(@RequestParam Integer id) {
        TOrder byId = orderService.getById(id);
        byId.setState(3);
        return AjaxResult.success(orderService.updateById(byId));
    }

    /**
     * 获取用户收货地址
@@ -172,7 +185,8 @@
    @GetMapping("/shopAddress")
    @ApiOperation(value = "获取用户收货地址", tags = {"获取用户收货地址"})
    public R<List<Recipient>> shopAddress() {
        return R.ok(recipientService.lambdaQuery().eq(Recipient::getUserId, SecurityUtils.getUserId()).list());
        return R.ok(recipientService.lambdaQuery().eq(Recipient::getUserId,
                SecurityUtils.getUserId()).list());
    }

    /**
@@ -181,6 +195,7 @@
    @PostMapping("/addressSaveOrUpdate")
    @ApiOperation(value = "新增收货地址/修改收货地址", tags = {"新增收货地址/修改收货地址"})
    public R<String> addressSave(@RequestBody Recipient recipient) {
        recipient.setUserId(SecurityUtils.getUserId().intValue());
        return R.ok(recipientService.addressSaveOrUpdate(recipient));
    }

@@ -219,9 +234,8 @@
     */
    @GetMapping("/goodRecommend")
    @ApiOperation(value = "可兑换商品推荐", tags = {"可兑换商品推荐"})
    public R<List<TGoodsVO>> goodRecommend(@RequestParam String userId) {
        List<TGoodsVO> res = goodsService.goodRecommend(userId);
        return R.ok(res);
    public R<List<TGoodsVO>> goodRecommend(String userId) {
        return R.ok(goodsService.goodRecommend(userId));
    }

    /**