Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinE...

44323

2024-05-22 57145eb45c9b339eecc97a5037c60c2f8da8f8fd

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

@@ -3,7 +3,6 @@

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.goods.domain.*;
@@ -11,6 +10,7 @@
import com.ruoyi.goods.dto.GoodQueryDTO;
import com.ruoyi.goods.dto.GoodsTypeQuery;
import com.ruoyi.goods.service.*;
import com.ruoyi.goods.vo.GoodDetailVO;
import com.ruoyi.goods.vo.TGoodsVO;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -22,9 +22,7 @@

import javax.annotation.Resource;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -166,8 +164,8 @@
     */
    @GetMapping("/exchangeRecord")
    @ApiOperation(value = "兑换记录", tags = {"兑换记录"})
    public AjaxResult<List<TOrder>> exchangeRecord() {
        return AjaxResult.success(orderService.lambdaQuery().eq(TOrder::getUserId, tokenService.getLoginUserStudy().getUserid())
    public R<List<TOrder>> exchangeRecord() {
        return R.ok(orderService.lambdaQuery().eq(TOrder::getUserId, tokenService.getLoginUserStudy().getUserid())
                .orderByDesc(TOrder::getCreateTime).list());
    }

@@ -176,10 +174,13 @@
     */
    @GetMapping("/confirm")
    @ApiOperation(value = "确认收货", tags = {"兑换记录"})
    public AjaxResult confirm(@RequestParam Integer id) {
    @ApiImplicitParams({
            @ApiImplicitParam(value = "订单id", name = "id", dataType = "String", required = true)
    })
    public R<Boolean> confirm(@RequestParam Integer id) {
        TOrder byId = orderService.getById(id);
        byId.setState(3);
        return AjaxResult.success(orderService.updateById(byId));
        return R.ok(orderService.updateById(byId));
    }

    /**
@@ -187,8 +188,8 @@
     */
    @GetMapping("/shopAddress")
    @ApiOperation(value = "获取用户收货地址", tags = {"获取用户收货地址"})
    public AjaxResult<List<Recipient>> shopAddress() {
        return AjaxResult.success(recipientService.lambdaQuery().eq(Recipient::getUserId,
    public R<List<Recipient>> shopAddress() {
        return R.ok(recipientService.lambdaQuery().eq(Recipient::getUserId,
                tokenService.getLoginUserStudy().getUserid()).list());
    }

@@ -197,9 +198,9 @@
     */
    @PostMapping("/addressSaveOrUpdate")
    @ApiOperation(value = "新增收货地址/修改收货地址", tags = {"新增收货地址/修改收货地址"})
    public AjaxResult<String> addressSave(@RequestBody Recipient recipient) {
    public R<String> addressSave(@RequestBody Recipient recipient) {
        recipient.setUserId(tokenService.getLoginUserStudy().getUserid());
        return AjaxResult.success(recipientService.addressSaveOrUpdate(recipient));
        return R.ok(recipientService.addressSaveOrUpdate(recipient));
    }

    /**
@@ -210,8 +211,8 @@
    @ApiImplicitParams({
            @ApiImplicitParam(value = "地址信息id", name = "id", dataType = "String", required = true)
    })
    public AjaxResult<String> addressDelete(@RequestParam String id) {
        return AjaxResult.success(recipientService.removeById(id) ? "删除成功！" : "删除失败！");
    public R<String> addressDelete(@RequestParam String id) {
        return R.ok(recipientService.removeById(id) ? "删除成功！" : "删除失败！");
    }

    /**
@@ -222,11 +223,12 @@
    @GetMapping("/updateOrderAddress")
    @ApiOperation(value = "修改订单收货地址", tags = {"修改订单收货地址"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true),
            @ApiImplicitParam(value = "订单id", name = "orderId", dataType = "String", required = true),
            @ApiImplicitParam(value = "完整收货地址", name = "address", dataType = "String", required = true)
    })
    public AjaxResult<Boolean> updateOrderAddress(@RequestParam String orderId, @RequestParam String address) {
        return AjaxResult.success(orderService.lambdaUpdate().set(TOrder::getConsigneeAddress, address)
    public R<Boolean> updateOrderAddress(@RequestParam String orderId,
                                                  @RequestParam String address) {
        return R.ok(orderService.lambdaUpdate().set(TOrder::getConsigneeAddress, address)
                .eq(TOrder::getId, orderId).eq(TOrder::getState, 1).update());
    }

@@ -235,18 +237,16 @@
     */
    @GetMapping("/addressTree")
    @ApiOperation(value = "收货地址省市区三级联动", tags = {"收货地址省市区三级联动"})
    public AjaxResult<List<Region>> addressTree() {
        return AjaxResult.success(regionService.addressTree());
    public R<List<Region>> addressTree() {
        return R.ok(regionService.addressTree());
    }

    /**
     * 可兑换商品推荐
     * 远程调用
     */
    @GetMapping("/goodRecommend")
    @ApiOperation(value = "可兑换商品推荐", tags = {"可兑换商品推荐"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
    })
    public R<List<TGoodsVO>> goodRecommend() {
        return R.ok(goodsService.goodRecommend(tokenService.getLoginUserStudy().getUserid()));
    }
@@ -261,21 +261,14 @@
    @ApiImplicitParams({
            @ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
    })
    public AjaxResult<Map<String, Object>> goodDetail(@RequestParam String goodId) {
        Map<String, Object> result = new HashMap<>(8);
    public R<GoodDetailVO> goodDetail(@RequestParam String goodId) {
        // 商品详情
        TGoods goods = goodsService.lambdaQuery().eq(TGoods::getId, goodId).one();
        result.put("goodDetail", goods);
        // 商品分类详情
        result.put("goodTypeDetail", goodsTypeService.lambdaQuery().in(TGoodsType::getId, Arrays.asList(goods.getTypeIds().split(","))).list());
        List<TGoodsType> goodsTypes = goodsTypeService.lambdaQuery().in(TGoodsType::getId, Arrays.asList(goods.getTypeIds().split(","))).list();
        // 已兑换人数
        result.put("number", goods.getBasicCount() + orderService.getGoodBuyNumber(goods.getId()));
        // 用户收货地址
        if (tokenService.getLoginUserStudy().getUserid() != null) {
            result.put("address", recipientService.lambdaQuery()
                    .eq(Recipient::getUserId, tokenService.getLoginUserStudy().getUserid()).eq(Recipient::getIsDefault, 1).one());
        }
        return AjaxResult.success(result);
        int number = goods.getBasicCount() + orderService.getGoodBuyNumber(goods.getId());
        return R.ok(new GoodDetailVO(goods, goodsTypes, number));
    }

    /**
@@ -286,10 +279,11 @@
    @ApiImplicitParams({
            @ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
    })
    public AjaxResult<Map<String, Object>> redeemNow(@RequestParam String goodId) {
    public R<GoodDetailVO> redeemNow(@RequestParam String goodId) {
        Recipient recipient = recipientService.lambdaQuery()
                .eq(Recipient::getUserId, tokenService.getLoginUserStudy().getUserid()).eq(Recipient::getIsDefault, 1).one();
        return AjaxResult.success(goodsService.redeemNow(goodId, recipient));
                .eq(Recipient::getUserId, tokenService.getLoginUserStudy().getUserid())
                .eq(Recipient::getIsDefault, 1).one();
        return R.ok(goodsService.redeemNow(goodId, recipient));
    }

    /**
@@ -299,9 +293,9 @@
     */
    @PostMapping("/goodExchange")
    @ApiOperation(value = "商品兑换-确认", tags = {"商品兑换-确认"})
    public AjaxResult<Object> goodExchange(@RequestBody GoodExchangeDTO goodExchange) {
    public R<Boolean> goodExchange(@RequestBody GoodExchangeDTO goodExchange) {
        Recipient recipient = recipientService.getById(goodExchange.getRecipientId());
        return AjaxResult.success(goodsService.goodExchange(goodExchange, recipient));
        return R.ok(goodsService.goodExchange(goodExchange, recipient));
    }

}