+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 工作端-兑换核销入参
+ *
+ * @author wgf
+ * @since v1.0.0 2021-09-23
+ */
+@Data
+public class ExchangedCheckFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 兑换ID
+ */
+ @NotBlank(message = "兑换ID不能为空")
+ private String exchangeId;
+
+
+
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/form/ExchangedListFormDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/form/ExchangedListFormDTO.java
new file mode 100644
index 000000000..fa091980c
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/form/ExchangedListFormDTO.java
@@ -0,0 +1,67 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 工作端-核销记录入参
+ *
+ * @author wgf
+ * @since v1.0.0 2021-09-23
+ */
+@Data
+public class ExchangedListFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 页码，从1开始
+ */
+ @Min(value = 1, message = "页码必须大于0")
+ private int pageIndex;
+
+ /**
+ * 页容量，默认20页
+ */
+ @Min(value = 1, message = "每页条数必须大于必须大于0")
+ private int pageSize = 10;
+
+ /**
+ * 第一页查询发起时的时间
+ */
+ @NotBlank(message = "时间戳不能为空")
+ private String timestamp;
+
+ /**
+ * 检索内容
+ */
+ private String searchKey;
+
+ /**
+ * 核销人ID
+ */
+ private String checkSysUserId;
+
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/ExchangedCheckResultDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/ExchangedCheckResultDTO.java
new file mode 100644
index 000000000..72011bf41
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/ExchangedCheckResultDTO.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 工作端-兑换核销
+ *
+ * @author wgf
+ * @since v1.0.0 2021-09-23
+ */
+@Data
+public class ExchangedCheckResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 是否成功
+ */
+ private Boolean isSuccess;
+
+ /**
+ * 信息
+ */
+ private String message;
+
+
+
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/ExchangedListResultDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/ExchangedListResultDTO.java
new file mode 100644
index 000000000..b1af60e63
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/ExchangedListResultDTO.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 工作端-核销记录
+ *
+ * @author wgf
+ * @since v1.0.0 2021-09-23
+ */
+@Data
+public class ExchangedListResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * id
+ */
+ private String id;
+
+ /**
+ * 商品
+ */
+ private String name;
+
+ /**
+ * 兑换人姓名
+ */
+ private String userName;
+
+ /**
+ * 商品图片
+ */
+ private String headPic;
+
+ /**
+ * 核销时间
+ */
+ private String checkTime;
+
+ /**
+ * 核销人姓名
+ */
+ private String checkSysUserName;
+
+
+
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/AppAcitveController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/AppAcitveController.java
new file mode 100644
index 000000000..02aa1e4d8
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/AppAcitveController.java
@@ -0,0 +1,85 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.AcitveProductExchangeDTO;
+import com.elink.esua.epdc.dto.form.ExchangedCheckFormDTO;
+import com.elink.esua.epdc.dto.form.ExchangedListFormDTO;
+import com.elink.esua.epdc.dto.result.ExchangedCheckResultDTO;
+import com.elink.esua.epdc.dto.result.ExchangedListResultDTO;
+import com.elink.esua.epdc.excel.AcitveProductExchangeExcel;
+import com.elink.esua.epdc.service.AcitveProductExchangeService;
+import com.elink.esua.epdc.service.AppAcitveService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 接口
+ *
+ * @author wgf
+ * @since v1.0.0 2021-09-23
+ */
+@RestController
+@RequestMapping("appAcitve")
+public class AppAcitveController {
+
+ @Autowired
+ private AppAcitveService appAcitveService;
+
+
+ /**
+ * 工作端-核销记录
+ * @param formDto
+ * @return
+ */
+ @GetMapping("getExchangedList")
+ public Result> getExchangedList(@RequestBody ExchangedListFormDTO formDto){
+ //效验数据
+ ValidatorUtils.validateEntity(formDto);
+ Result> result = appAcitveService.getExchangedList(formDto);
+ return result;
+ }
+
+ /**
+ * 工作端-核销记录
+ * @param formDto
+ * @return
+ */
+ @GetMapping("exchangedCheck")
+ public Result exchangedCheck(@RequestBody ExchangedCheckFormDTO formDto){
+ //效验数据
+ ValidatorUtils.validateEntity(formDto);
+ Result result = appAcitveService.exchangedCheck(formDto);
+ return result;
+ }
+
+
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AppAcitveDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AppAcitveDao.java
new file mode 100644
index 000000000..1f8d217a2
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AppAcitveDao.java
@@ -0,0 +1,52 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.AcitveProductExchangeDTO;
+import com.elink.esua.epdc.dto.form.ExchangedCheckFormDTO;
+import com.elink.esua.epdc.dto.form.ExchangedListFormDTO;
+import com.elink.esua.epdc.dto.result.ExchangedListResultDTO;
+import com.elink.esua.epdc.entity.AcitveProductExchangeEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 接口
+ *
+ * @author wgf
+ * @since v1.0.0 2021-09-23
+ */
+@Mapper
+public interface AppAcitveDao {
+
+ /**
+ * 条件查询
+ * @param formDto
+ * @return
+ */
+ List getExchangedList(ExchangedListFormDTO formDto);
+
+ List checkState(ExchangedCheckFormDTO formDto);
+
+ Integer checkPower(@Param("deptId") String deptId, @Param("productId") String productId);
+
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/AppAcitveService.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/AppAcitveService.java
new file mode 100644
index 000000000..8549bb684
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/AppAcitveService.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.AcitveProductExchangeDTO;
+import com.elink.esua.epdc.dto.form.ExchangedCheckFormDTO;
+import com.elink.esua.epdc.dto.form.ExchangedListFormDTO;
+import com.elink.esua.epdc.dto.result.ExchangedCheckResultDTO;
+import com.elink.esua.epdc.dto.result.ExchangedListResultDTO;
+import com.elink.esua.epdc.entity.AcitveProductExchangeEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 接口
+ *
+ * @author wgf
+ * @since v1.0.0 2021-09-23
+ */
+public interface AppAcitveService {
+
+ Result> getExchangedList(ExchangedListFormDTO formDto);
+
+ Result exchangedCheck(ExchangedCheckFormDTO formDto);
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AppAcitveServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AppAcitveServiceImpl.java
new file mode 100644
index 000000000..18183b88f
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AppAcitveServiceImpl.java
@@ -0,0 +1,117 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *