diff --git a/xhpc-modules/pom.xml b/xhpc-modules/pom.xml
index 498e62f6..bb11e8aa 100644
--- a/xhpc-modules/pom.xml
+++ b/xhpc-modules/pom.xml
@@ -24,6 +24,7 @@
xhpc-data-big-screen
xhpc-workorder
xhpc-tenant
+ xhpc-activity
xhpc-log
diff --git a/xhpc-modules/xhpc-activity/.gitignore b/xhpc-modules/xhpc-activity/.gitignore
new file mode 100644
index 00000000..54283dd4
--- /dev/null
+++ b/xhpc-modules/xhpc-activity/.gitignore
@@ -0,0 +1,35 @@
+HELP.md
+target/
+.mvn/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea/
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/xhpc-modules/xhpc-activity/pom.xml b/xhpc-modules/xhpc-activity/pom.xml
new file mode 100644
index 00000000..66f6c9cd
--- /dev/null
+++ b/xhpc-modules/xhpc-activity/pom.xml
@@ -0,0 +1,136 @@
+
+
+
+ com.ruoyi
+ xhpc-modules
+ 3.0.0
+
+ 4.0.0
+
+ xhpc-activity
+
+
+ 活动服务
+
+
+ 8
+ 8
+
+
+
+
+ org.mybatis.spring.boot
+ mybatis-spring-boot-starter
+
+
+ org.mybatis
+ mybatis
+ 3.5.6
+
+
+ com.github.pagehelper
+ pagehelper-spring-boot-starter
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-sentinel
+
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+
+ mysql
+ mysql-connector-java
+
+
+
+
+ com.ruoyi
+ ruoyi-common-datasource
+
+
+
+
+ com.ruoyi
+ ruoyi-common-core
+
+
+
+ com.ruoyi
+ xhpc-common
+ 3.0.0
+ compile
+
+
+
+ org.apache.ant
+ ant
+ 1.10.12
+
+
+ com.aliyun.oss
+ aliyun-sdk-oss
+ 3.10.2
+ compile
+
+
+ com.ruoyi
+ ruoyi-common-log
+
+
+
+
+
+ ${project.artifactId}
+
+
+ src/main/resources
+
+
+ src/main/java
+
+ **/*.xml
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+ 2.4.0
+
+
+
+ repackage
+
+
+
+
+
+
+
+
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/XhpcActivityApplication.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/XhpcActivityApplication.java
new file mode 100644
index 00000000..8ee7ac02
--- /dev/null
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/XhpcActivityApplication.java
@@ -0,0 +1,24 @@
+package com.xhpc;
+
+import com.xhpc.common.security.annotation.EnableCustomConfig;
+import com.xhpc.common.security.annotation.EnableRyFeignClients;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+
+@EnableCustomConfig
+@EnableRyFeignClients
+@EnableFeignClients
+@SpringBootApplication
+@MapperScan("com.xhpc.activity.mapper")
+public class XhpcActivityApplication {
+
+ public static void main(String[] args) {
+
+
+ SpringApplication.run(XhpcActivityApplication.class, args);
+
+ }
+}
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcActivityCashController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcActivityCashController.java
new file mode 100644
index 00000000..c7183db0
--- /dev/null
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcActivityCashController.java
@@ -0,0 +1,152 @@
+package com.xhpc.activity.controller;
+
+
+import com.xhpc.activity.domain.XhpcActivityCashDomain;
+import com.xhpc.activity.domain.XhpcActivityRecordDomain;
+import com.xhpc.activity.service.XhpcActivityCashService;
+import com.xhpc.common.core.domain.R;
+import com.xhpc.common.core.web.controller.BaseController;
+import com.xhpc.common.core.web.page.TableDataInfo;
+import com.xhpc.common.log.annotation.Log;
+import com.xhpc.common.log.enums.BusinessType;
+import com.xhpc.common.util.LogUserUtils;
+import com.xhpc.system.api.model.LoginUser;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/activity/cash")
+public class XhpcActivityCashController extends BaseController {
+
+ @Resource
+ XhpcActivityCashService cashService;
+
+ @Resource
+ LogUserUtils logUserUtils;
+
+
+ @GetMapping("/getPage")
+ public TableDataInfo getPage(HttpServletRequest request,
+ String status) {
+
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+ startPage();
+ Map params = new HashMap<>();
+ params.put("tenantId", loginUser.getTenantId());
+ params.put("status", status);
+ return getDataTable(cashService.getPage(params));
+ }
+
+
+ @GetMapping("/getNameList")
+ public R getNameList(HttpServletRequest request) {
+
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+
+ Map params = new HashMap<>();
+ params.put("tenantId", loginUser.getTenantId());
+ return R.ok(cashService.getNameList(params));
+ }
+
+
+ @GetMapping("/detail")
+ public R getDetail(@RequestParam("activityId") Integer activityId) {
+
+ return R.ok(cashService.getDomainByPk(activityId));
+ }
+
+
+ @Log(title = "活动管理-新增现金红包活动", businessType = BusinessType.INSERT)
+ @PostMapping("/")
+ public R insertDomain(HttpServletRequest request, @RequestBody XhpcActivityCashDomain domain) {
+
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+ domain.setCreateBy(loginUser.getUserid().toString());
+ domain.setUpdateBy(loginUser.getUserid().toString());
+ domain.setTenantId(loginUser.getTenantId());
+ return R.ok(cashService.insertDomain(domain));
+ }
+
+
+ @Log(title = "活动管理-更新现金红包活动", businessType = BusinessType.UPDATE)
+ @PutMapping("/detail")
+ public R updateDomain(HttpServletRequest request, @RequestBody XhpcActivityCashDomain domain) {
+
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+ domain.setUpdateBy(loginUser.getUserid().toString());
+ return R.ok(cashService.updateDomain(domain));
+ }
+
+
+ @Log(title = "活动管理-审核现金红包活动", businessType = BusinessType.UPDATE)
+ @PutMapping("/check")
+ public R updateDomainConfig(HttpServletRequest request, @RequestBody XhpcActivityCashDomain domain) {
+
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+ domain.setCheckBy(loginUser.getUserid().toString());
+ return R.ok(cashService.checkDomain(domain));
+ }
+
+
+ @Log(title = "活动管理-更新现金红包活动状态", businessType = BusinessType.UPDATE)
+ @PutMapping("/status")
+ public R updateDomainStatus(HttpServletRequest request, @RequestBody XhpcActivityCashDomain domain) {
+
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+ domain.setUpdateBy(loginUser.getUserid().toString());
+ return R.ok(cashService.updateDomainStatus(domain));
+ }
+
+
+ @Log(title = "活动管理-删除现金红包活动", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{activityId}")
+ public R deleteDomainByPk(@PathVariable("activityId") Integer activityId) {
+
+ return R.ok(cashService.deleteByPk(activityId));
+ }
+
+
+ @GetMapping("/userList")
+ public TableDataInfo getUserList(@RequestParam("activityId")Integer activityId,
+ @RequestParam("userType") String userType,
+ @RequestParam("userAccount")String userAccount,
+ @RequestParam("pageNum")Integer pageNum,
+ @RequestParam("pageSize")Integer pageSize){
+
+ Map params = new HashMap<>();
+ params.put("activityId", activityId);
+ params.put("userType", userType);
+ params.put("userAccount", userAccount);
+ params.put("pageNum", pageNum);
+ params.put("pageSize", pageSize);
+
+ return getDataTable(cashService.getUserList(params));
+ }
+
+
+
+ @Log(title = "活动管理-领取红包", businessType = BusinessType.INSERT)
+ @PostMapping("/receive")
+ public R insertCashReceive(@RequestBody XhpcActivityRecordDomain domain) {
+
+ return R.ok(cashService.insertReceiveDomain(domain));
+ }
+
+
+ @GetMapping("/getReceivePage")
+ public TableDataInfo getReceivePage(HttpServletRequest request,
+ Integer activityId) {
+
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+ startPage();
+ Map params = new HashMap<>();
+ params.put("tenantId", loginUser.getTenantId());
+ params.put("activityId", activityId);
+ return getDataTable(cashService.getReceivePage(params));
+ }
+
+}
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcActivityDiscountController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcActivityDiscountController.java
new file mode 100644
index 00000000..2f52d576
--- /dev/null
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcActivityDiscountController.java
@@ -0,0 +1,122 @@
+package com.xhpc.activity.controller;
+
+
+import com.xhpc.activity.domain.XhpcActivityDiscountDomain;
+import com.xhpc.activity.service.XhpcActivityDiscountService;
+import com.xhpc.common.core.domain.R;
+import com.xhpc.common.core.web.controller.BaseController;
+import com.xhpc.common.core.web.page.TableDataInfo;
+import com.xhpc.common.log.annotation.Log;
+import com.xhpc.common.log.enums.BusinessType;
+import com.xhpc.common.util.LogUserUtils;
+import com.xhpc.system.api.model.LoginUser;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/activity/discount")
+public class XhpcActivityDiscountController extends BaseController {
+
+ @Resource
+ XhpcActivityDiscountService discountService;
+
+ @Resource
+ LogUserUtils logUserUtils;
+
+
+ @GetMapping("/getPage")
+ public TableDataInfo getPage(HttpServletRequest request,
+ String status){
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+ startPage();
+ Map params = new HashMap<>();
+ params.put("tenantId", loginUser.getTenantId());
+ params.put("status", status);
+ return getDataTable(discountService.getPage(params));
+ }
+
+
+ @GetMapping("/getNameList")
+ public R getNameList(HttpServletRequest request){
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+
+ Map params = new HashMap<>();
+ params.put("tenantId", loginUser.getTenantId());
+ return R.ok(discountService.getNameList(params));
+ }
+
+
+ @GetMapping("/detail")
+ public R getDetail(@RequestParam("activityId")Integer activityId){
+ return R.ok(discountService.getDomainByPk(activityId));
+ }
+
+
+ @GetMapping("/userList")
+ public TableDataInfo getUserList(@RequestParam("activityId")Integer activityId,
+ @RequestParam("userType") String userType,
+ @RequestParam("userAccount")String userAccount,
+ @RequestParam("pageNum")Integer pageNum,
+ @RequestParam("pageSize")Integer pageSize){
+
+ Map params = new HashMap<>();
+ params.put("activityId", activityId);
+ params.put("userType", userType);
+ params.put("userAccount", userAccount);
+ params.put("pageNum", pageNum);
+ params.put("pageSize", pageSize);
+
+ return getDataTable(discountService.getUserList(params));
+ }
+
+
+ @Log(title = "活动管理-新增折扣活动", businessType = BusinessType.INSERT)
+ @PostMapping("/")
+ public R insertDomain(HttpServletRequest request, @RequestBody XhpcActivityDiscountDomain domain){
+
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+ domain.setCreateBy(loginUser.getUserid().toString());
+ domain.setUpdateBy(loginUser.getUserid().toString());
+ domain.setTenantId(loginUser.getTenantId());
+
+ return R.ok(discountService.insertDomain(domain));
+ }
+
+
+ @Log(title = "活动管理-更新折扣活动", businessType = BusinessType.UPDATE)
+ @PutMapping("/detail")
+ public R updateDomain(HttpServletRequest request, @RequestBody XhpcActivityDiscountDomain domain){
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+ domain.setUpdateBy(loginUser.getUserid().toString());
+ return R.ok(discountService.updateDomain(domain));
+ }
+
+
+ @Log(title = "活动管理-审核折扣活动", businessType = BusinessType.UPDATE)
+ @PutMapping("/check")
+ public R updateDomainConfig(HttpServletRequest request, @RequestBody XhpcActivityDiscountDomain domain){
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+ domain.setCheckBy(loginUser.getUserid().toString());
+ return R.ok(discountService.checkDomain(domain));
+ }
+
+
+ @Log(title = "活动管理-更新折扣活动状态", businessType = BusinessType.UPDATE)
+ @PutMapping("/status")
+ public R updateDomainStatus(HttpServletRequest request, @RequestBody XhpcActivityDiscountDomain domain){
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+ domain.setUpdateBy(loginUser.getUserid().toString());
+ return R.ok(discountService.updateDomainStatus(domain));
+ }
+
+
+ @Log(title = "活动管理-删除折扣活动", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{activityId}")
+ public R deleteDomainByPk(@PathVariable("activityId")Integer activityId){
+ return R.ok(discountService.deleteByPk(activityId));
+ }
+}
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcActivityInternetController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcActivityInternetController.java
new file mode 100644
index 00000000..49967b43
--- /dev/null
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcActivityInternetController.java
@@ -0,0 +1,107 @@
+package com.xhpc.activity.controller;
+
+
+import com.xhpc.activity.domain.XhpcActivityInternetDomain;
+import com.xhpc.activity.service.XhpcActivityInternetService;
+import com.xhpc.common.core.domain.R;
+import com.xhpc.common.core.web.controller.BaseController;
+import com.xhpc.common.core.web.page.TableDataInfo;
+import com.xhpc.common.log.annotation.Log;
+import com.xhpc.common.log.enums.BusinessType;
+import com.xhpc.common.util.LogUserUtils;
+import com.xhpc.system.api.model.LoginUser;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/activity/internet")
+public class XhpcActivityInternetController extends BaseController {
+
+ @Resource
+ XhpcActivityInternetService internetService;
+
+ @Resource
+ LogUserUtils logUserUtils;
+
+
+ @GetMapping("/getPage")
+ public TableDataInfo getPage(HttpServletRequest request,
+ String status){
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+ startPage();
+ Map params = new HashMap<>();
+ params.put("tenantId", loginUser.getTenantId());
+ params.put("status", status);
+ return getDataTable(internetService.getPage(params));
+ }
+
+
+ @GetMapping("/getNameList")
+ public R getNameList(HttpServletRequest request){
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+
+ Map params = new HashMap<>();
+ params.put("tenantId", loginUser.getTenantId());
+ return R.ok(internetService.getNameList(params));
+ }
+
+
+ @GetMapping("/detail")
+ public R getDetail(@RequestParam("activityId")Integer activityId){
+ return R.ok(internetService.getDomainByPk(activityId));
+ }
+
+
+ @Log(title = "活动管理-新增流量方活动", businessType = BusinessType.INSERT)
+ @PostMapping("/")
+ public R insertDomain(HttpServletRequest request, @RequestBody XhpcActivityInternetDomain domain){
+
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+ domain.setCreateBy(loginUser.getUserid().toString());
+ domain.setUpdateBy(loginUser.getUserid().toString());
+ domain.setTenantId(loginUser.getTenantId());
+ domain.setStatus(Short.valueOf("1"));
+
+ return R.ok(internetService.insertDomain(domain));
+ }
+
+
+ @Log(title = "活动管理-更新流量方活动模板", businessType = BusinessType.UPDATE)
+ @PutMapping("/detail")
+ public R updateDomain(HttpServletRequest request, @RequestBody XhpcActivityInternetDomain domain){
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+ domain.setUpdateBy(loginUser.getUserid().toString());
+ return R.ok(internetService.updateDomain(domain));
+ }
+
+
+ @Log(title = "活动管理-更新流量方活动状态", businessType = BusinessType.UPDATE)
+ @PutMapping("/status")
+ public R updateDomainStatus(HttpServletRequest request, @RequestBody XhpcActivityInternetDomain domain){
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+ domain.setUpdateBy(loginUser.getUserid().toString());
+ return R.ok(internetService.updateDomainStatus(domain));
+ }
+
+
+ @Log(title = "活动管理-审核流量方活动", businessType = BusinessType.UPDATE)
+ @PutMapping("/check")
+ public R checkDomain(HttpServletRequest request, @RequestBody XhpcActivityInternetDomain domain){
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+ domain.setCheckBy(loginUser.getUserid().toString());
+ return R.ok(internetService.checkDomain(domain));
+ }
+
+
+ @Log(title = "活动管理-删除流量方活动", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{activityId}")
+ public R deleteDomainByPk(@PathVariable("activityId")Integer activityId){
+ return R.ok(internetService.deleteByPk(activityId));
+ }
+
+
+}
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcActivityTemplateController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcActivityTemplateController.java
new file mode 100644
index 00000000..69eb78b5
--- /dev/null
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcActivityTemplateController.java
@@ -0,0 +1,96 @@
+package com.xhpc.activity.controller;
+
+
+import com.xhpc.activity.domain.XhpcActivityTemplateDomain;
+import com.xhpc.activity.service.XhpcActivityTemplateService;
+import com.xhpc.common.core.domain.R;
+import com.xhpc.common.core.web.controller.BaseController;
+import com.xhpc.common.core.web.page.TableDataInfo;
+import com.xhpc.common.log.annotation.Log;
+import com.xhpc.common.log.enums.BusinessType;
+import com.xhpc.common.util.LogUserUtils;
+import com.xhpc.system.api.model.LoginUser;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/activity/template")
+public class XhpcActivityTemplateController extends BaseController {
+
+ @Resource
+ XhpcActivityTemplateService templateService;
+
+ @Resource
+ LogUserUtils logUserUtils;
+
+
+ @GetMapping("/getPage")
+ public TableDataInfo getPage(HttpServletRequest request,
+ String status){
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+ startPage();
+ Map params = new HashMap<>();
+ params.put("tenantId", loginUser.getTenantId());
+ params.put("status", status);
+ return getDataTable(templateService.getPage(params));
+ }
+
+
+ @GetMapping("/getNameList")
+ public R getNameList(HttpServletRequest request){
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+
+ Map params = new HashMap<>();
+ params.put("tenantId", loginUser.getTenantId());
+ return R.ok(templateService.getNameList(params));
+ }
+
+
+ @GetMapping("/detail")
+ public R getDetail(@RequestParam("templateId")Integer templateId){
+ return R.ok(templateService.getDomainByPk(templateId));
+ }
+
+
+ @Log(title = "活动管理-新增折扣活动模版", businessType = BusinessType.INSERT)
+ @PostMapping("/")
+ public R insertDomain(HttpServletRequest request, @RequestBody XhpcActivityTemplateDomain domain){
+
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+ domain.setCreateBy(loginUser.getUserid().toString());
+ domain.setUpdateBy(loginUser.getUserid().toString());
+ domain.setTenantId(loginUser.getTenantId());
+
+ return R.ok(templateService.insertDomain(domain));
+ }
+
+
+ @Log(title = "活动管理-更新折扣活动模板", businessType = BusinessType.UPDATE)
+ @PutMapping("/detail")
+ public R updateDomain(HttpServletRequest request, @RequestBody XhpcActivityTemplateDomain domain){
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+ domain.setUpdateBy(loginUser.getUserid().toString());
+ return R.ok(templateService.updateDomain(domain));
+ }
+
+
+ @Log(title = "活动管理-更新折扣活动模板状态", businessType = BusinessType.UPDATE)
+ @PutMapping("/status")
+ public R updateDomainStatus(HttpServletRequest request, @RequestBody XhpcActivityTemplateDomain domain){
+ LoginUser loginUser = logUserUtils.getLogUser(request);
+ domain.setUpdateBy(loginUser.getUserid().toString());
+ return R.ok(templateService.updateDomainStatus(domain));
+ }
+
+
+ @Log(title = "活动管理-删除折扣活动模板", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{templateId}")
+ public R deleteDomainByPk(@PathVariable("templateId")Integer templateId){
+ return R.ok(templateService.deleteByPk(templateId));
+ }
+
+}
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityCashDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityCashDomain.java
new file mode 100644
index 00000000..423b9781
--- /dev/null
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityCashDomain.java
@@ -0,0 +1,110 @@
+package com.xhpc.activity.domain;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import lombok.Data;
+
+/**
+ * xhpc_activity_cash
+ * @author
+ */
+@Data
+public class XhpcActivityCashDomain implements Serializable {
+ /**
+ * 活动ID
+ */
+ private Integer activityId;
+
+ /**
+ * 活动名称
+ */
+ private String activityName;
+
+ /**
+ * 开始时间
+ */
+ private Date startTime;
+
+ /**
+ * 结束时间
+ */
+ private Date endTime;
+
+ /**
+ * 领取次数
+ */
+ private Integer receiveCount;
+
+ /**
+ * 红包金额
+ */
+ private BigDecimal amount;
+
+ /**
+ * C端用户ID(-1表示全部)
+ */
+ private String appUserList;
+
+ /**
+ * 社区用户ID列表(-1表示全部)
+ */
+ private String comUserList;
+
+ /**
+ * B端用户ID列表(-1表示全部)
+ */
+ private String cusUserList;
+
+ /**
+ * 租户ID
+ */
+ private String tenantId;
+
+ /**
+ * 状态(0-编辑,1-提交待审核,2-审核失败,3-审核通过,4-立即失效)
+ */
+ private Short status;
+
+ /**
+ * 删除标记(0-正常,2-已删除)
+ */
+ private Short delFlag;
+
+ /**
+ * 创建人
+ */
+ private String createBy;
+
+ /**
+ * 更新时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新人
+ */
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+ /**
+ * 审核人
+ */
+ private String checkBy;
+
+ /**
+ * 审核时间
+ */
+ private Date checkTime;
+
+
+ private List checkImgList;
+
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityDiscountDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityDiscountDomain.java
new file mode 100644
index 00000000..51fd0d39
--- /dev/null
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityDiscountDomain.java
@@ -0,0 +1,119 @@
+package com.xhpc.activity.domain;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * xhpc_activity_discount
+ * @author
+ */
+@Data
+public class XhpcActivityDiscountDomain implements Serializable {
+ /**
+ * 活动ID
+ */
+ private Integer activityId;
+
+ /**
+ * 活动名称
+ */
+ private String activityName;
+
+ /**
+ * 模板ID
+ */
+ private Integer templateId;
+
+ /**
+ * C端用户列表(以逗号分隔,-1表示全部用户)
+ */
+ private String appUserList;
+
+ /**
+ * 社区用户列表(以逗号分隔,-1表示全部用户)
+ */
+ private String comUserList;
+
+ /**
+ * B端用户列表(以逗号分隔,-1表示全部用户)
+ */
+ private String cusUserList;
+
+ /**
+ * 场站列表
+ */
+ private String stationList;
+
+ /**
+ * 租户ID
+ */
+ private String tenantId;
+
+
+ /**
+ * 开始时间
+ */
+ private Date startTime;
+
+ /**
+ * 结束时间
+ */
+ private Date endTime;
+
+ /**
+ * 状态(0-编辑,1-提交待审核,2-审核失败,3-审核通过,4-立即失效)
+ */
+ private Short status = 0;
+
+ /**
+ * 删除标识(0-正常,2-删除)
+ */
+ private Short delFlag = 0;
+
+ /**
+ * 创建人
+ */
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新人
+ */
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+
+ /**
+ * 审核人
+ */
+ private String checkBy;
+
+ /**
+ * 审核时间
+ */
+ private Date checkTime;
+
+ private XhpcActivityTemplateDomain templateDomain;
+
+ /**
+ * 优惠类型(1-总金额,2-服务费,3-电量)
+ */
+ private Short discountType;
+
+ /**
+ * 优惠比率
+ */
+ private BigDecimal discountRate;
+
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityFormulaDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityFormulaDomain.java
new file mode 100644
index 00000000..668a2525
--- /dev/null
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityFormulaDomain.java
@@ -0,0 +1,65 @@
+package com.xhpc.activity.domain;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * xhpc_activity_formula
+ * @author
+ */
+@Data
+public class XhpcActivityFormulaDomain implements Serializable {
+ /**
+ * 活动计算ID
+ */
+ private Long activityFormulaId;
+
+ /**
+ * 活动ID
+ */
+ private Integer activityId;
+
+ /**
+ * 开始时间
+ */
+ private String startTime;
+
+ /**
+ * 结束时间
+ */
+ private String endTime;
+
+ /**
+ * 服务费
+ */
+ private BigDecimal servicePrice;
+
+ /**
+ * 计算公式
+ */
+ private String computeFormula;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 创建人
+ */
+ private String createBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+ /**
+ * 更新人
+ */
+ private String updateBy;
+
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityImgDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityImgDomain.java
new file mode 100644
index 00000000..b105c329
--- /dev/null
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityImgDomain.java
@@ -0,0 +1,54 @@
+package com.xhpc.activity.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * xhpc_activity_img
+ * @author
+ */
+@Data
+public class XhpcActivityImgDomain implements Serializable {
+ /**
+ * 图片ID
+ */
+ private Long activityImgId;
+
+ /**
+ * 活动类型(CASH, DISCOUNT)
+ */
+ private String activityType;
+
+ /**
+ * 活动ID
+ */
+ private Integer activityId;
+
+ /**
+ * 图片名称
+ */
+ private String imgName;
+
+ /**
+ * 图片地址
+ */
+ private String imgUrl;
+
+ /**
+ * 删除标志(0-正常,2-已删除)
+ */
+ private Short delFlag;
+
+ /**
+ * 创建人
+ */
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityInternetDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityInternetDomain.java
new file mode 100644
index 00000000..6edf8b32
--- /dev/null
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityInternetDomain.java
@@ -0,0 +1,112 @@
+package com.xhpc.activity.domain;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import lombok.Data;
+
+/**
+ * xhpc_activity_internet
+ * @author
+ */
+@Data
+public class XhpcActivityInternetDomain implements Serializable {
+ /**
+ * 活动ID
+ */
+ private Integer activityId;
+
+ /**
+ * 活动名称
+ */
+ private String activityName;
+
+ /**
+ * 流量方名称
+ */
+ private String internetName;
+
+ /**
+ * 计算类型(1-总金额,2-服务费,3-电量)
+ */
+ private Short computeType;
+
+ /**
+ * 服务费
+ */
+ private BigDecimal servicePrice;
+
+ /**
+ * 计算公式
+ */
+ private String computeFormula;
+
+ /**
+ * 开始时间
+ */
+ private Date startTime;
+
+ /**
+ * 结束时间
+ */
+ private Date endTime;
+
+ /**
+ * 参与场站列表
+ */
+ private String stationList;
+
+ /**
+ * 租户ID
+ */
+ private String tenantId;
+
+ /**
+ * 状态(0-编辑,1-提交生效,2-审核失败,3-审核成功,4-失效)
+ */
+ private Short status;
+
+ /**
+ * 删除标志(0-正常,2-删除)
+ */
+ private Short delFlag;
+
+ /**
+ * 创建人
+ */
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新人
+ */
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+ /**
+ * 审核人
+ */
+ private String checkBy;
+
+ /**
+ * 审核时间
+ */
+ private Date checkTime;
+
+ /**
+ * 分时段费用计算公式列表
+ */
+ List formulaList;
+
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityRecordDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityRecordDomain.java
new file mode 100644
index 00000000..6aeadcdd
--- /dev/null
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityRecordDomain.java
@@ -0,0 +1,50 @@
+package com.xhpc.activity.domain;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * xhpc_activity_record
+ * @author
+ */
+@Data
+public class XhpcActivityRecordDomain implements Serializable {
+ /**
+ * 活动参与记录ID
+ */
+ private Long activityRecordId;
+
+ /**
+ * 活动类型(CASH,DISCOUNT)
+ */
+ private String activityType;
+
+ /**
+ * 活动ID
+ */
+ private Integer activityId;
+
+ /**
+ * 人员类型(0 C端用户 1 流量方用户 2社区用户 3B端用户)
+ */
+ private Short source;
+
+ /**
+ * 用户ID
+ */
+ private String userId;
+
+ /**
+ * 红包金额
+ */
+ private BigDecimal amount;
+
+ /**
+ * 领取时间
+ */
+ private Date createTime;
+
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityTemplateDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityTemplateDomain.java
new file mode 100644
index 00000000..a3bd2f64
--- /dev/null
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityTemplateDomain.java
@@ -0,0 +1,95 @@
+package com.xhpc.activity.domain;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * xhpc_activity_template
+ * @author
+ */
+@Data
+public class XhpcActivityTemplateDomain implements Serializable {
+ /**
+ * 模板ID
+ */
+ private Integer activityTemplateId;
+
+ /**
+ * 模板名称
+ */
+ private String templateName;
+
+ /**
+ * 优惠类型(1-总金额,2-服务费,3-电量)
+ */
+ private Short discountType;
+
+ /**
+ * 优惠比率
+ */
+ private BigDecimal discountRate;
+
+ /**
+ * 开始时间
+ */
+ private Date startTime;
+
+ /**
+ * 结束时间
+ */
+ private Date endTime;
+
+ /**
+ * 折扣次数
+ */
+ private Short discountCount;
+
+ /**
+ * 小程序弹出次数
+ */
+ private Short miniDisplay;
+
+ /**
+ * 活动背景图
+ */
+ private String backgroundUrl;
+
+ /**
+ * 状态(0-编辑未发布,1-已发布,2-已失效)
+ */
+ private Short status;
+
+ /**
+ * 删除标识(0-正常,2-删除)
+ */
+ private Short delFlag;
+
+ /**
+ * 租户ID
+ */
+ private String tenantId;
+
+ /**
+ * 创建人
+ */
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新人
+ */
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/enums/ActivityTypeEnum.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/enums/ActivityTypeEnum.java
new file mode 100644
index 00000000..841fd551
--- /dev/null
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/enums/ActivityTypeEnum.java
@@ -0,0 +1,51 @@
+package com.xhpc.activity.enums;
+
+
+
+public enum ActivityTypeEnum {
+
+ CASH("CASH", "现金活动"),
+ DISCOUNT("DISCOUNT", "折扣活动"),
+ ;
+
+
+ private final String code;
+ private final String name;
+
+ ActivityTypeEnum(String code, String name){
+ this.code = code;
+ this.name = name;
+ }
+
+ //根据code获取name
+ public static String getNameByCode(String code) {
+ for (ActivityTypeEnum typeEnum : ActivityTypeEnum.values()) {
+ //移除交办
+ if (typeEnum.code.equals(code)) {
+ return typeEnum.name;
+ }
+ }
+ return "";
+ }
+
+ //根据name获取code
+ public static String getCodeByName(String name) {
+ for (ActivityTypeEnum typeEnum : ActivityTypeEnum.values()) {
+ //移除交办
+ if (typeEnum.name.equals(name)) {
+ return typeEnum.code;
+ }
+ }
+ return null;
+ }
+
+ public String getCode() {
+
+ return code;
+ }
+
+ public String getName() {
+
+ return name;
+ }
+}
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcActivityCashMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcActivityCashMapper.java
new file mode 100644
index 00000000..baf78e32
--- /dev/null
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcActivityCashMapper.java
@@ -0,0 +1,39 @@
+package com.xhpc.activity.mapper;
+
+
+import com.xhpc.activity.domain.XhpcActivityCashDomain;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface XhpcActivityCashMapper {
+
+ List selectByParams(@Param("params") Map params);
+
+ List