From 0e2f30e179b0669b674b8c4086488128a548e385 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 三月 2025 21:37:32 +0800
Subject: [PATCH] 惠民卡代码生成，部分接口
---
cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml | 13
cloud-server-activity/src/main/java/com/dsh/activity/model/response/HuiminCardVO.java | 22 +
cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminAgreementService.java | 23 +
cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreement.java | 52 +++
cloud-server-activity/src/main/java/com/dsh/activity/model/response/HuiminAgreementVO.java | 25 +
cloud-server-activity/src/main/resources/mapper/PayHuiminMapper.xml | 7
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java | 135 +++++++++
cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminCardMapper.java | 18 +
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminAgreementServiceImpl.java | 25 +
cloud-server-activity/src/main/java/com/dsh/activity/mapper/PayHuiminMapper.java | 17 +
cloud-server-activity/src/main/resources/mapper/HuiminAgreementMapper.xml | 6
cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminCardService.java | 24 +
cloud-server-activity/src/main/java/com/dsh/activity/service/PayHuiminService.java | 20 +
cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminAgreementMapper.java | 18 +
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminAgreementSettingServiceImpl.java | 25 +
cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminAgreementSettingMapper.java | 13
cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreementSetting.java | 51 +++
cloud-server-activity/src/main/java/com/dsh/activity/entity/TPayHuimin.java | 115 ++++++++
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminCardServiceImpl.java | 30 ++
cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminAgreementSettingService.java | 23 +
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/PayHuiminServiceImpl.java | 19 +
cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java | 139 +++++++++
cloud-server-activity/src/main/resources/mapper/HuiminAgreementSettingMapper.xml | 6
23 files changed, 826 insertions(+), 0 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
new file mode 100644
index 0000000..3173671
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
@@ -0,0 +1,135 @@
+package com.dsh.activity.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dsh.activity.entity.*;
+import com.dsh.activity.feignclient.account.AppUserClient;
+import com.dsh.activity.feignclient.account.CityClient;
+import com.dsh.activity.feignclient.account.StoreStaffClient;
+import com.dsh.activity.feignclient.account.StudentClient;
+import com.dsh.activity.feignclient.account.model.AppUserByNameAndPhoneDTO;
+import com.dsh.activity.feignclient.model.CouponExamineListSearch;
+import com.dsh.activity.feignclient.model.CouponListOfSearch;
+import com.dsh.activity.feignclient.model.TAppUser;
+import com.dsh.activity.feignclient.other.OperatorClient;
+import com.dsh.activity.feignclient.other.RegionClient;
+import com.dsh.activity.feignclient.other.StoreClient;
+import com.dsh.activity.feignclient.other.model.CityDataAndProvinceDataVo;
+import com.dsh.activity.feignclient.other.model.Store;
+import com.dsh.activity.feignclient.other.model.StoreInfoDto;
+import com.dsh.activity.feignclient.other.model.TOperatorCity;
+import com.dsh.activity.model.CouponListVo;
+import com.dsh.activity.model.CouponRecordQuery;
+import com.dsh.activity.model.request.CommodityRequest;
+import com.dsh.activity.model.request.CouponDataVo;
+import com.dsh.activity.model.request.CouponPackageReq;
+import com.dsh.activity.model.response.CouponPackageResp;
+import com.dsh.activity.model.response.HuiminAgreementVO;
+import com.dsh.activity.model.response.HuiminCardVO;
+import com.dsh.activity.service.*;
+import com.dsh.activity.util.GDMapGeocodingUtil;
+import com.dsh.activity.util.ResultUtil;
+import com.dsh.activity.util.TokenUtil;
+import com.dsh.activity.util.ToolUtil;
+import com.google.gson.Gson;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/6/24 11:27
+ */
+@RestController
+@RequestMapping("/huimin")
+@Api(tags = "惠民卡新增")
+public class HuiminController {
+
+ @Autowired
+ private ICouponService couponService;
+
+
+ @Autowired
+ private HuiminAgreementService huiminAgreementService;
+
+ @Autowired
+ private HuiminAgreementSettingService huiminAgreementSettingService;
+
+ @Resource
+ private HuiminCardService huiminCardService;
+ @Resource
+ private PayHuiminService payHuiminService;
+
+
+ @Autowired
+ private TokenUtil tokenUtil;
+
+
+
+
+
+
+ /**
+ * 查询注册赠送优惠券 判断当前优惠券限领数量
+ */
+ @ResponseBody
+ @PostMapping("/getHuiminAgreementAndList")
+ @ApiOperation(value = "惠民卡富文本内容-惠民卡列表")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "页码，首页1", name = "pageSize", dataType = "int", required = true),
+ @ApiImplicitParam(value = "页条数", name = "pageNo", dataType = "int", required = true),
+ @ApiImplicitParam(value = "门店id", name = "storeId", dataType = "int", required = true),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<HuiminAgreementVO> getHuiminAgreementAndList(Integer pageSize, Integer pageNo,Integer storeId) {
+ try {
+ Integer uid = tokenUtil.getUserIdFormRedis();
+ if (null == uid) {
+ return ResultUtil.tokenErr();
+ }
+ pageNo = (pageNo - 1) * pageSize;
+ HuiminAgreementVO huiminAgreementVO = new HuiminAgreementVO();
+ List<THuiminCard> list = huiminCardService.list(new LambdaQueryWrapper<THuiminCard>()
+ .eq(THuiminCard::getStoreId, storeId));
+ if (list.isEmpty()){
+ // 没有配置惠民卡 展示富文本内容
+ huiminAgreementVO.setShowType(1);
+ }else{
+ huiminAgreementVO.setShowType(2);
+ }
+ List<THuiminCard> cardList = huiminCardService.getHuiminAgreementAndList(pageNo,pageSize,storeId);
+ List<TPayHuimin> payHuimins = payHuiminService.list(new LambdaQueryWrapper<TPayHuimin>()
+ .eq(TPayHuimin::getAppUserId, uid)
+ .ge(TPayHuimin::getEndTime,new Date())
+ .eq(TPayHuimin::getStatus, 1));
+ List<HuiminCardVO> huiminCardVOS = new ArrayList<>();
+ for (THuiminCard huiminCardVO : cardList) {
+ HuiminCardVO huiminCardVO1 = new HuiminCardVO();
+ huiminCardVO1.setId(huiminCardVO.getId());
+ List<TPayHuimin> collect = payHuimins.stream().filter(e -> e.getCardId().equals(huiminCardVO.getId())).collect(Collectors.toList());
+ if (!collect.isEmpty()){
+ huiminCardVO1.setCover(huiminCardVO.getBuyCover());
+ }else{
+ huiminCardVO1.setCover(huiminCardVO.getUnBuyCover());
+ }
+ huiminCardVOS.add(huiminCardVO1);
+ }
+ huiminAgreementVO.setCardList(huiminCardVOS);
+ return ResultUtil.success(huiminAgreementVO);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResultUtil.success(new HuiminAgreementVO());
+ }
+ }
+
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreement.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreement.java
new file mode 100644
index 0000000..7bd27ae
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreement.java
@@ -0,0 +1,52 @@
+package com.dsh.activity.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 惠民卡协议管理
+ * </p>
+ *
+ * @since 2023-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_huimin_agreement")
+public class THuiminAgreement extends Model<THuiminAgreement> {
+ private static final long serialVersionUID = 1L;
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 运营商id 选择默认传null
+ */
+ @TableField("operatorId")
+ private Integer operatorId;
+ /**
+ *添加人员说明文案
+ */
+ @TableField("addUserRemark")
+ private String addUserRemark;
+ /**
+ *选择人员说明文案
+ */
+ @TableField("selectUserRemark")
+ private String selectUserRemark;
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreementSetting.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreementSetting.java
new file mode 100644
index 0000000..e0b2979
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreementSetting.java
@@ -0,0 +1,51 @@
+package com.dsh.activity.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 惠民卡协议配置 关联惠民卡协议管理
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_points_merchandise_city")
+public class THuiminAgreementSetting extends Model<THuiminAgreementSetting> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 协议名称
+ */
+ @TableField("agreementName")
+ private String agreementName;
+ /**
+ *协议内容
+ */
+ @TableField("agreementContent")
+ private String agreementContent;
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java
new file mode 100644
index 0000000..c638c4c
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java
@@ -0,0 +1,139 @@
+package com.dsh.activity.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 惠民卡
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_huimin_card")
+public class THuiminCard extends Model<THuiminCard> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 惠民卡名称
+ */
+ @TableField("huiMinName")
+ private String huiMinName;
+ /**
+ *惠民卡类型1年度2年内
+ */
+ @TableField("huiMinType")
+ private String huiMinType;
+ /**
+ *售卖金额
+ */
+ @TableField("salesMoney")
+ private BigDecimal salesMoney;
+ /**
+ *已购买封面
+ */
+ @TableField("buyCover")
+ private String buyCover;
+ /**
+ *未购买封面
+ */
+ @TableField("unBuyCover")
+ private String unBuyCover;
+ /**
+ *已购买使用说明
+ */
+ @TableField("buyRemark")
+ private String buyRemark;
+ /**
+ *未购买使用说明
+ */
+ @TableField("unBuyRemark")
+ private String unBuyRemark;
+ /**
+ *发放数量 为空表示不限
+ */
+ @TableField("grantCount")
+ private Integer grantCount;
+ /**
+ * 限购数量 为空表示不限
+ */
+ @TableField("limitCount")
+ private Integer limitCount;
+ /**
+ *轮播图 逗号分隔
+ */
+ @TableField("banner")
+ private String banner;
+ /**
+ *有效期 不填表示永久
+ */
+ @TableField("endTime")
+ private Date endTime;
+ /**
+ *可使用时间段，周，多个逗号分隔
+ */
+ @TableField("useWeeks")
+ private String useWeeks;
+ /**
+ *可使用时间段，时分秒，多个逗号分隔
+ */
+ @TableField("useTimes")
+ private String useTimes;
+ /**
+ *不可用时间段，yyyy-MM-dd HH:mm:ss,多个逗号分隔
+ */
+ @TableField("unUseTimes")
+ private String unUseTimes;
+ /**
+ *使用范围1门店2场地
+ */
+ @TableField("useScope")
+ private String useScope;
+ /**
+ *根据适用范围，存储门店id或场地id，多个逗号分隔
+ */
+ @TableField("useIds")
+ private String useIds;
+ /**
+ *惠民卡介绍
+ */
+ @TableField("introduce")
+ private String introduce;
+ /**
+ *排序
+ */
+ @TableField("sort")
+ private String sort;
+ /**
+ *门店id
+ */
+ @TableField("storeId")
+ private Integer storeId;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/TPayHuimin.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/TPayHuimin.java
new file mode 100644
index 0000000..284d0bb
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/TPayHuimin.java
@@ -0,0 +1,115 @@
+package com.dsh.activity.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 惠民卡
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_pay_huimin")
+public class TPayHuimin extends Model<TPayHuimin> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 金额
+ */
+ @TableField("salesMoney")
+ private BigDecimal salesMoney;
+ /**
+ *购买用户id
+ */
+ @TableField("appUserId")
+ private Integer appUserId;
+ /**
+ *绑定人员id,多个逗号拼接，关联student表
+ */
+ @TableField("studentId")
+ private String studentId;
+ /**
+ *有效期
+ */
+ @TableField("endTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ private Date endTime;
+ /**
+ *创建时间
+ */
+ @TableField("insertTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ private Date insertTime;
+ /**
+ *付款时间
+ */
+ @TableField("paymentTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ private Date paymentTime;
+ /**
+ *退款时间
+ */
+ @TableField("refundTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ private Date refundTime;
+ /**
+ *状态1使用中2已退款
+ */
+ @TableField("status")
+ private Integer status;
+ /**
+ *付款方式1微信2支付宝
+ */
+ @TableField("paymentType")
+ private Integer paymentType;
+ /**
+ *退款状态 1未退款 2已退款 3线下退款（使用过或超过七日退款）
+ */
+ @TableField("refundStatus")
+ private Integer refundStatus;
+ /**
+ *惠民卡id
+ */
+ @TableField("cardId")
+ private Integer cardId;
+ /**
+ *订单号
+ */
+ @TableField("code")
+ private String code;
+ /**
+ *第三方支付流水号
+ */
+ @TableField("orderNumber")
+ private String orderNumber;
+
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminAgreementMapper.java b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminAgreementMapper.java
new file mode 100644
index 0000000..f165d0c
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminAgreementMapper.java
@@ -0,0 +1,18 @@
+package com.dsh.activity.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsh.activity.entity.BenefitsVideoClassification;
+import com.dsh.activity.entity.THuiminAgreement;
+import com.dsh.activity.model.QueryBenefitsVedioVO;
+import com.dsh.activity.model.TQueryBenefitsVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/11 17:30
+ */
+public interface HuiminAgreementMapper extends BaseMapper<THuiminAgreement> {
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminAgreementSettingMapper.java b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminAgreementSettingMapper.java
new file mode 100644
index 0000000..2e53f77
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminAgreementSettingMapper.java
@@ -0,0 +1,13 @@
+package com.dsh.activity.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsh.activity.entity.THuiminAgreement;
+import com.dsh.activity.entity.THuiminAgreementSetting;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/11 17:30
+ */
+public interface HuiminAgreementSettingMapper extends BaseMapper<THuiminAgreementSetting> {
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminCardMapper.java b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminCardMapper.java
new file mode 100644
index 0000000..a688147
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminCardMapper.java
@@ -0,0 +1,18 @@
+package com.dsh.activity.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsh.activity.entity.THuiminAgreement;
+import com.dsh.activity.entity.THuiminCard;
+import com.dsh.activity.model.response.HuiminCardVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/11 17:30
+ */
+public interface HuiminCardMapper extends BaseMapper<THuiminCard> {
+
+ List<THuiminCard> getHuiminAgreementAndList(@Param("pageNo") Integer pageNo,@Param("pageSize") Integer pageSize , @Param("storeId")Integer storeId);
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/PayHuiminMapper.java b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/PayHuiminMapper.java
new file mode 100644
index 0000000..c2c01b5
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/PayHuiminMapper.java
@@ -0,0 +1,17 @@
+package com.dsh.activity.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsh.activity.entity.THuiminCard;
+import com.dsh.activity.entity.TPayHuimin;
+import com.dsh.activity.model.response.HuiminCardVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/11 17:30
+ */
+public interface PayHuiminMapper extends BaseMapper<TPayHuimin> {
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/response/HuiminAgreementVO.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/response/HuiminAgreementVO.java
new file mode 100644
index 0000000..4c840be
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/response/HuiminAgreementVO.java
@@ -0,0 +1,25 @@
+package com.dsh.activity.model.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "惠民卡富文本内容-惠民卡列表")
+public class HuiminAgreementVO {
+
+ @ApiModelProperty("展示内容 1展示富文本内容 2展示惠民卡列表")
+ private Integer showType;
+ @ApiModelProperty("富文本内容")
+ private String introduce;
+ @ApiModelProperty("惠民卡列表")
+ private List<HuiminCardVO> cardList;
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/response/HuiminCardVO.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/response/HuiminCardVO.java
new file mode 100644
index 0000000..c93533b
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/response/HuiminCardVO.java
@@ -0,0 +1,22 @@
+package com.dsh.activity.model.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "惠民卡列表VO")
+public class HuiminCardVO {
+
+ @ApiModelProperty("惠民卡id")
+ private Integer id;
+ @ApiModelProperty("封面图")
+ private String cover;
+
+
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminAgreementService.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminAgreementService.java
new file mode 100644
index 0000000..501003d
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminAgreementService.java
@@ -0,0 +1,23 @@
+package com.dsh.activity.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.activity.entity.BenefitsVideos;
+import com.dsh.activity.entity.THuiminAgreement;
+import com.dsh.activity.model.BenefitsVideoClassificationListVo;
+import com.dsh.activity.model.BenefitsVideosInfoVo;
+import com.dsh.activity.model.BenefitsVideosListVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 福利视频 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-06
+ */
+public interface HuiminAgreementService extends IService<THuiminAgreement> {
+
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminAgreementSettingService.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminAgreementSettingService.java
new file mode 100644
index 0000000..06f23bd
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminAgreementSettingService.java
@@ -0,0 +1,23 @@
+package com.dsh.activity.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.activity.entity.BenefitsVideos;
+import com.dsh.activity.entity.THuiminAgreementSetting;
+import com.dsh.activity.model.BenefitsVideoClassificationListVo;
+import com.dsh.activity.model.BenefitsVideosInfoVo;
+import com.dsh.activity.model.BenefitsVideosListVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 福利视频 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-06
+ */
+public interface HuiminAgreementSettingService extends IService<THuiminAgreementSetting> {
+
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminCardService.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminCardService.java
new file mode 100644
index 0000000..7f83175
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminCardService.java
@@ -0,0 +1,24 @@
+package com.dsh.activity.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.activity.entity.BenefitsVideos;
+import com.dsh.activity.entity.THuiminCard;
+import com.dsh.activity.model.BenefitsVideoClassificationListVo;
+import com.dsh.activity.model.BenefitsVideosInfoVo;
+import com.dsh.activity.model.BenefitsVideosListVo;
+import com.dsh.activity.model.response.HuiminCardVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 福利视频 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-06
+ */
+public interface HuiminCardService extends IService<THuiminCard> {
+
+ List<THuiminCard> getHuiminAgreementAndList(Integer pageNo, Integer pageSize, Integer storeId);
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/PayHuiminService.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/PayHuiminService.java
new file mode 100644
index 0000000..7e417fd
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/PayHuiminService.java
@@ -0,0 +1,20 @@
+package com.dsh.activity.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.activity.entity.THuiminCard;
+import com.dsh.activity.entity.TPayHuimin;
+import com.dsh.activity.model.response.HuiminCardVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 福利视频 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-06
+ */
+public interface PayHuiminService extends IService<TPayHuimin> {
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminAgreementServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminAgreementServiceImpl.java
new file mode 100644
index 0000000..01ddcef
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminAgreementServiceImpl.java
@@ -0,0 +1,25 @@
+package com.dsh.activity.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.activity.entity.BenefitsVideoClassification;
+import com.dsh.activity.entity.THuiminAgreement;
+import com.dsh.activity.mapper.BenefitsVideoClassificationMapper;
+import com.dsh.activity.mapper.HuiminAgreementMapper;
+import com.dsh.activity.model.BenefitsVedioChangeStateVO;
+import com.dsh.activity.model.QueryBenefitsVedioVO;
+import com.dsh.activity.model.TQueryBenefitsVO;
+import com.dsh.activity.service.HuiminAgreementService;
+import com.dsh.activity.service.IBenefitsVideoClassificationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/11 17:31
+ */
+@Service
+public class HuiminAgreementServiceImpl extends ServiceImpl<HuiminAgreementMapper, THuiminAgreement> implements HuiminAgreementService {
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminAgreementSettingServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminAgreementSettingServiceImpl.java
new file mode 100644
index 0000000..d7cab73
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminAgreementSettingServiceImpl.java
@@ -0,0 +1,25 @@
+package com.dsh.activity.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.activity.entity.BenefitsVideoClassification;
+import com.dsh.activity.entity.THuiminAgreementSetting;
+import com.dsh.activity.mapper.BenefitsVideoClassificationMapper;
+import com.dsh.activity.mapper.HuiminAgreementSettingMapper;
+import com.dsh.activity.model.BenefitsVedioChangeStateVO;
+import com.dsh.activity.model.QueryBenefitsVedioVO;
+import com.dsh.activity.model.TQueryBenefitsVO;
+import com.dsh.activity.service.HuiminAgreementSettingService;
+import com.dsh.activity.service.IBenefitsVideoClassificationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/11 17:31
+ */
+@Service
+public class HuiminAgreementSettingServiceImpl extends ServiceImpl<HuiminAgreementSettingMapper, THuiminAgreementSetting> implements HuiminAgreementSettingService {
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminCardServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminCardServiceImpl.java
new file mode 100644
index 0000000..15c6549
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminCardServiceImpl.java
@@ -0,0 +1,30 @@
+package com.dsh.activity.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.activity.entity.BenefitsVideoClassification;
+import com.dsh.activity.entity.THuiminCard;
+import com.dsh.activity.mapper.BenefitsVideoClassificationMapper;
+import com.dsh.activity.mapper.HuiminCardMapper;
+import com.dsh.activity.model.BenefitsVedioChangeStateVO;
+import com.dsh.activity.model.QueryBenefitsVedioVO;
+import com.dsh.activity.model.TQueryBenefitsVO;
+import com.dsh.activity.model.response.HuiminCardVO;
+import com.dsh.activity.service.HuiminCardService;
+import com.dsh.activity.service.IBenefitsVideoClassificationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/11 17:31
+ */
+@Service
+public class HuiminCardServiceImpl extends ServiceImpl<HuiminCardMapper, THuiminCard> implements HuiminCardService {
+
+ @Override
+ public List<THuiminCard> getHuiminAgreementAndList(Integer pageNo, Integer pageSize, Integer storeId) {
+ return this.baseMapper.getHuiminAgreementAndList(pageNo,pageSize,storeId);
+ }
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/PayHuiminServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/PayHuiminServiceImpl.java
new file mode 100644
index 0000000..baa0086
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/PayHuiminServiceImpl.java
@@ -0,0 +1,19 @@
+package com.dsh.activity.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.activity.entity.THuiminAgreement;
+import com.dsh.activity.entity.TPayHuimin;
+import com.dsh.activity.mapper.HuiminAgreementMapper;
+import com.dsh.activity.mapper.PayHuiminMapper;
+import com.dsh.activity.service.HuiminAgreementService;
+import com.dsh.activity.service.PayHuiminService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/11 17:31
+ */
+@Service
+public class PayHuiminServiceImpl extends ServiceImpl<PayHuiminMapper, TPayHuimin> implements PayHuiminService {
+
+}
diff --git a/cloud-server-activity/src/main/resources/mapper/HuiminAgreementMapper.xml b/cloud-server-activity/src/main/resources/mapper/HuiminAgreementMapper.xml
new file mode 100644
index 0000000..5744397
--- /dev/null
+++ b/cloud-server-activity/src/main/resources/mapper/HuiminAgreementMapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsh.activity.mapper.HuiminAgreementMapper">
+
+
+</mapper>
diff --git a/cloud-server-activity/src/main/resources/mapper/HuiminAgreementSettingMapper.xml b/cloud-server-activity/src/main/resources/mapper/HuiminAgreementSettingMapper.xml
new file mode 100644
index 0000000..fe445c5
--- /dev/null
+++ b/cloud-server-activity/src/main/resources/mapper/HuiminAgreementSettingMapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsh.activity.mapper.HuiminAgreementSettingMapper">
+
+
+</mapper>
diff --git a/cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml b/cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml
new file mode 100644
index 0000000..7f5681f
--- /dev/null
+++ b/cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsh.activity.mapper.HuiminCardMapper">
+
+
+ <select id="getHuiminAgreementAndList" resultType="com.dsh.activity.entity.THuiminCard">
+ select t1.* from t_huimin_card t1
+ where t1.storeId = #{storeId}
+ order by t1.sort desc
+ limit #{pageNo}, #{pageSize}
+
+ </select>
+</mapper>
diff --git a/cloud-server-activity/src/main/resources/mapper/PayHuiminMapper.xml b/cloud-server-activity/src/main/resources/mapper/PayHuiminMapper.xml
new file mode 100644
index 0000000..39d32f1
--- /dev/null
+++ b/cloud-server-activity/src/main/resources/mapper/PayHuiminMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsh.activity.mapper.PayHuiminMapper">
+
+
+
+</mapper>
--
Gitblit v1.7.1