商户端会员和平台活动

jiangqs

2023-06-30 08b2a4048452bef8d99ac5a700dd5aa6a4121699

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

@@ -3,23 +3,22 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.MerPageDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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;

import static org.reflections.Reflections.log;

/**
 * @author jqs34
@@ -33,9 +32,8 @@
@RequestMapping("/mer/order")
public class MerOrderController {

    @Autowired
    @Resource
    private OrderService orderService;



    @RequestMapping(value = "/verifyCode", method = RequestMethod.POST)
@@ -55,7 +53,7 @@
                merVerifyCodeVo.setMerVerifyOrderVo(merVerifyOrderVo);
                break;
            case 2:
                MerVerifyCouponVo merVerifyCouponVo = null;
                MerVerifyCouponVo merVerifyCouponVo = orderService.verifyCoupon(verifyCode);
                merVerifyCodeVo.setMerVerifyCouponVo(merVerifyCouponVo);
                break;
            case 3:
@@ -75,6 +73,15 @@
        merVerifyOrderDto.setUserId(userId);
        MerVerifyOrderVo merVerifyOrderVo = orderService.sureVerifyOrder(merVerifyOrderDto);
        return R.ok(merVerifyOrderVo);
    }

    @RequestMapping(value = "/sureVerifyCoupon", method = RequestMethod.POST)
    @ApiOperation(value = "核销优惠券")
    public R<MerVerifyCouponVo> sureVerifyCoupon(@RequestBody MerVerifyCouponDto merVerifyCouponDto) {
        Long userId = SecurityUtils.getUserId();
        merVerifyCouponDto.setUserId(userId);
        MerVerifyCouponVo merVerifyCouponVo = orderService.sureVerifyCoupon(merVerifyCouponDto);
        return R.ok(merVerifyCouponVo);
    }


@@ -129,7 +136,10 @@
        Page<MerMemberNoClearOrderVo> page = new Page<>();
        page.setSize(merMemberNoClearOrderDto.getPageSize());
        page.setCurrent(merMemberNoClearOrderDto.getPageNum());
        log.info("merMemberNoClearOrderDto----"+merMemberNoClearOrderDto.toString());
        List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderService.pageMerMemberOrder(page,merMemberNoClearOrderDto);
        return R.ok(page.setRecords(merMemberNoClearOrderVoList));
    }


}