java/HongRuiTang.git

			@@ -3,18 +3,24 @@
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.security.utils.SecurityUtils;
			import com.ruoyi.order.domain.dto.*;
			import com.ruoyi.order.domain.vo.*;
			import com.ruoyi.order.domain.dto.MerConsumerGoodsDto;
			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.MerServiceRecordPageVo;
			import com.ruoyi.order.service.order.ConsumerGoodsService;
			import com.ruoyi.order.service.order.UserServiceRecordService;
			import com.ruoyi.system.api.domain.poji.member.Member;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiOperation;
			import lombok.Data;
			import org.springframework.beans.factory.annotation.Autowired;
			import lombok.extern.log4j.Log4j2;
			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;

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

			@Autowired
			@Resource
			private ConsumerGoodsService consumerGoodsService;

			@Autowired
			@Resource
			private UserServiceRecordService userServiceRecordService;

			@RequestMapping(value = "/listMerConsumerGoods", method = RequestMethod.POST)