bug

jiangqs

2023-08-25 156e141e55a8abf486157d1fa89d25e23f4a06a3

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java

@@ -4,18 +4,22 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.domain.dto.MerConsumerGoodsDto;
import com.ruoyi.order.domain.dto.MerMemberNoClearOrderDto;
import com.ruoyi.order.domain.dto.MerConsumerGoodsPageDto;
import com.ruoyi.order.domain.dto.MerServiceRecordPageDto;
import com.ruoyi.order.domain.dto.MerSureConsumerGoodsDto;
import com.ruoyi.order.domain.vo.MerConsumerGoodsListVo;
import com.ruoyi.order.domain.vo.MerConsumerGoodsVo;
import com.ruoyi.order.domain.vo.MerMemberNoClearOrderVo;
import com.ruoyi.order.domain.vo.MerServiceRecordPageVo;
import com.ruoyi.order.service.order.ConsumerGoodsService;
import com.ruoyi.order.service.order.UserServiceRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

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

/**
@@ -25,11 +29,16 @@
 * @date 2023年05月05日
 * @version: 1.0
 */
@Data
@Api(value = "商户端服务相关接口", tags = "商户端服务相关接口", description = "商户端服务相关接口")
@RestController
@RequestMapping("/mer/consumer")
public class MerConsumerController {

    @Autowired
    @Resource
    private ConsumerGoodsService consumerGoodsService;

    @Resource
    private UserServiceRecordService userServiceRecordService;

    @RequestMapping(value = "/listMerConsumerGoods", method = RequestMethod.POST)
    @ApiOperation(value = "获取用户服务列表")
@@ -41,6 +50,8 @@
    }




    @RequestMapping(value = "/sureMerConsumerGoods", method = RequestMethod.POST)
    @ApiOperation(value = "确认商品次数")
    public R sureMerConsumerGoods(@RequestBody MerSureConsumerGoodsDto merSureConsumerGoodsDto) {
@@ -49,4 +60,36 @@
        consumerGoodsService.sureMerConsumerGoods(merSureConsumerGoodsDto);
        return R.ok();
    }

    @RequestMapping(value = "/useMerConsumerGoods", method = RequestMethod.POST)
    @ApiOperation(value = "消费服务商品")
    public R useMerConsumerGoods(@RequestBody MerSureConsumerGoodsDto merSureConsumerGoodsDto) {
        Long userId = SecurityUtils.getUserId();
        merSureConsumerGoodsDto.setUserId(userId);
        consumerGoodsService.useMerConsumerGoods(merSureConsumerGoodsDto);
        return R.ok();
    }

    @RequestMapping(value = "/pageMerConsumerGoodsNum", method = RequestMethod.POST)
    @ApiOperation(value = "分页获取用户服务次数列表")
    public R<Page<MerConsumerGoodsListVo>> pageMerConsumerGoodsNum(@RequestBody MerConsumerGoodsPageDto merConsumerGoodsPageDto) {
        Long userId = SecurityUtils.getUserId();
        merConsumerGoodsPageDto.setUserId(userId);
        Page<MerConsumerGoodsListVo> page = new Page<>();
        page.setSize(merConsumerGoodsPageDto.getPageSize());
        page.setCurrent(merConsumerGoodsPageDto.getPageNum());
        List<MerConsumerGoodsListVo> merConsumerGoodsListVos = consumerGoodsService.pageMerConsumerGoodsNum(page,merConsumerGoodsPageDto);
        return R.ok(page.setRecords(merConsumerGoodsListVos));
    }

    @RequestMapping(value = "/pageMerMemberServiceRecord", method = RequestMethod.POST)
    @ApiOperation(value = "分页获取用户服务记录")
    public R<Page<MerServiceRecordPageVo>> pageMerMemberServiceRecord(@RequestBody MerServiceRecordPageDto merServiceRecordPageDto) {
        Long userId = SecurityUtils.getUserId();
        Page<MerServiceRecordPageVo> page = new Page<>();
        page.setSize(merServiceRecordPageDto.getPageSize());
        page.setCurrent(merServiceRecordPageDto.getPageNum());
        List<MerServiceRecordPageVo> merServiceRecordPageVoList = userServiceRecordService.pageMerMemberServiceRecord(page,merServiceRecordPageDto);
        return R.ok(page.setRecords(merServiceRecordPageVoList));
    }
}