feat: 積分充值基礎體系

src/main/java/cn/com/poc/common/constant/BizSnKeyEnum.java

@@ -8,6 +8,17 @@ package cn.com.poc.common.constant;
 public enum BizSnKeyEnum {
 
 
+    /**
+     * 权益流水编号
+     */
+    equitySn("","ES"),
+
+    /**
+     * 积分流水编号
+     */
+    pointSn("","PO"),
+
+
     /**
      * 渠道号
      */

src/main/java/cn/com/poc/equity/aggregate/MemberEquityService.java

+package cn.com.poc.equity.aggregate;
+
+import cn.com.poc.equity.constants.EquityEnum;
+import cn.com.poc.equity.constants.ModifyEventEnum;
+import cn.com.poc.equity.domain.modifyEquityInfo.ModifyEventInfo;
+
+/**
+ * 用户权益服务
+ *
+ * @author alex.yao
+ * @date 2024/12/6
+ */
+public interface MemberEquityService {
+
+    /**
+     * 新用户权益初始化
+     *
+     * @param memberId 用户id
+     */
+    void initMemberEquity(Long memberId) throws Exception;
+
+
+    /**
+     * 新增积分
+     *
+     * @param memberId        用户id
+     * @param pointNum        积分数
+     * @param validityUnit    积分过期时间
+     * @param modifyEventEnum 修改事件枚举 - 礼品 / 充值
+     * @param modifyEventInfo 修改事件信息详情
+     * @return 返回扣减积分流水号
+     */
+    String addPoint(Long memberId, Long pointNum, EquityEnum.VALIDITY_UNIT validityUnit, ModifyEventEnum modifyEventEnum, ModifyEventInfo modifyEventInfo) throws Exception;
+
+
+    /**
+     * 扣减积分
+     *
+     * @param memberId        用户id
+     * @param pointNum        积分数
+     * @param modifyEventEnum 修改事件枚举 - 使用 / 过期
+     * @param modifyEventInfo 修改事件信息详情
+     * @return 返回扣减积分流水号
+     */
+    String reducePoint(Long memberId, Long pointNum, ModifyEventEnum modifyEventEnum, ModifyEventInfo modifyEventInfo) throws Exception;
+
+    /**
+     * 积分回滚
+     * 若是充值，则删除积分数据
+     * 若是消费，则恢复积分数据
+     *
+     * @param transactionSn 需要回滚的积分流水号
+     */
+    void rollbackPoint(String transactionSn) throws Exception;
+
+
+    /**
+     * 用户权益等级变更
+     * 注意：如果权益变更事件为top_up, 需要调用addPoint方法最加积分发放
+     *
+     * @param memberId        用户id
+     * @param modifyEventEnum 变更事件
+     * @param type            权益等级类型
+     * @param validityUnit    权益等级有效期
+     * @param modifyEventInfo 修改事件信息详情
+     * @return 返回权益等级变更流水号
+     */
+    String changeEquityLevel(Long memberId, ModifyEventEnum modifyEventEnum, EquityEnum.TYPE type, EquityEnum.VALIDITY_UNIT validityUnit, ModifyEventInfo modifyEventInfo) throws Exception;
+}

src/main/java/cn/com/poc/equity/aggregate/impl/EquityServiceImpl.java

@@ -9,6 +9,7 @@ import cn.com.poc.equity.domain.AgentEquity;
 import cn.com.poc.equity.entity.BizPaymentPackageConfigurationEntity;
 import cn.com.poc.equity.service.BizPaymentPackageConfigurationService;
 import cn.com.poc.thirdparty.resource.demand.dgTools.constants.CurrencyEnum;
+import cn.com.poc.thirdparty.resource.demand.pay.constants.DgtoolsPayOrderConstants;
 import cn.com.poc.thirdparty.resource.demand.pay.entity.DgtoolsPayOrderEntity;
 import cn.com.poc.thirdparty.resource.demand.pay.service.DgtoolsPayOrderService;
 import cn.com.yict.framemax.core.i18n.I18nMessageException;
@@ -81,7 +82,7 @@ public class EquityServiceImpl implements EquityService {
         BizPaymentPackageConfigurationEntity packageConfiguration = paymentPackageConfigurationEntities.get(0);
         DgtoolsPayOrderEntity dgtoolsPayOrderEntity = new DgtoolsPayOrderEntity();
         dgtoolsPayOrderEntity.setAmount(packageConfiguration.getAmount());
-        dgtoolsPayOrderEntity.setPayOrderType(type.name() + "_" + domain.name());
+        dgtoolsPayOrderEntity.setPayOrderType(domain.name());
         dgtoolsPayOrderEntity.setMemberId(memberId.intValue());
         dgtoolsPayOrderEntity.setCurrency(CurrencyEnum.CHINA.getCurrencyCode());
         dgtoolsPayOrderEntity.setDescription(packageConfiguration.getName());

src/main/java/cn/com/poc/equity/constants/EquityEnum.java

@@ -44,10 +44,10 @@ public class EquityEnum {
     }
 
     /**
-     * 有效期单位 month-月 year-年
+     * 有效期单位 month-月 year-年 indefinite-永久有效
      */
     public enum VALIDITY_UNIT {
-        month, year;
+        month, year, indefinite;
 
         public static boolean isMatch(String validityUnit) {
             VALIDITY_UNIT[] values = values();

src/main/java/cn/com/poc/equity/constants/ModifyEventEnum.java

+package cn.com.poc.equity.constants;
+
+/**
+ * 积分/权益 变更事件类型
+ *
+ * @author alex.yao
+ * @date 2024/12/6
+ */
+public enum ModifyEventEnum {
+
+    // 礼品
+    gift,
+
+    // 过期
+    expired,
+
+    // 充值
+    top_up,
+
+    // 消费
+    use,
+
+    // 回滚
+    rollback,
+}

src/main/java/cn/com/poc/equity/convert/BizMemberEquityConvert.java

+package cn.com.poc.equity.convert;	
+
+import cn.com.poc.equity.model.BizMemberEquityModel;
+import cn.com.poc.equity.entity.BizMemberEquityEntity;
+import cn.com.poc.equity.dto.BizMemberEquityDto;
+
+
+public class BizMemberEquityConvert {
+
+    public static BizMemberEquityEntity modelToEntity(BizMemberEquityModel model){
+        BizMemberEquityEntity entity = new BizMemberEquityEntity();
+        entity.setId(model.getId());
+        entity.setMemberId(model.getMemberId());
+        entity.setEquityLevel(model.getEquityLevel());
+        entity.setExpiredDate(model.getExpiredDate());
+        entity.setEquityConfig(model.getEquityConfig());
+        entity.setIsDeleted(model.getIsDeleted());
+        entity.setCreator(model.getCreator());
+        entity.setCreatedTime(model.getCreatedTime());
+        entity.setModifier(model.getModifier());
+        entity.setModifiedTime(model.getModifiedTime());
+        entity.setSysVersion(model.getSysVersion());
+        return entity;
+    }
+
+    public static BizMemberEquityModel entityToModel(BizMemberEquityEntity entity){
+        BizMemberEquityModel model = new BizMemberEquityModel();
+        model.setId(entity.getId());
+        model.setMemberId(entity.getMemberId());
+        model.setEquityLevel(entity.getEquityLevel());
+        model.setExpiredDate(entity.getExpiredDate());
+        model.setEquityConfig(entity.getEquityConfig());
+        model.setIsDeleted(entity.getIsDeleted());
+        model.setCreator(entity.getCreator());
+        model.setCreatedTime(entity.getCreatedTime());
+        model.setModifier(entity.getModifier());
+        model.setModifiedTime(entity.getModifiedTime());
+        model.setSysVersion(entity.getSysVersion());
+        return model;
+    }
+    
+    public static BizMemberEquityDto entityToDto(BizMemberEquityEntity entity){
+        BizMemberEquityDto dto = new BizMemberEquityDto();
+        dto.setId(entity.getId());
+        dto.setMemberId(entity.getMemberId());
+        dto.setEquityLevel(entity.getEquityLevel());
+        dto.setExpiredDate(entity.getExpiredDate());
+        dto.setEquityConfig(entity.getEquityConfig());
+        dto.setIsDeleted(entity.getIsDeleted());
+        dto.setCreator(entity.getCreator());
+        dto.setCreatedTime(entity.getCreatedTime());
+        dto.setModifier(entity.getModifier());
+        dto.setModifiedTime(entity.getModifiedTime());
+        dto.setSysVersion(entity.getSysVersion());
+        return dto;
+    }
+
+    public static BizMemberEquityEntity dtoToEntity(BizMemberEquityDto dto){
+        BizMemberEquityEntity entity = new BizMemberEquityEntity();
+        entity.setId(dto.getId());
+        entity.setMemberId(dto.getMemberId());
+        entity.setEquityLevel(dto.getEquityLevel());
+        entity.setExpiredDate(dto.getExpiredDate());
+        entity.setEquityConfig(dto.getEquityConfig());
+        entity.setIsDeleted(dto.getIsDeleted());
+        entity.setCreator(dto.getCreator());
+        entity.setCreatedTime(dto.getCreatedTime());
+        entity.setModifier(dto.getModifier());
+        entity.setModifiedTime(dto.getModifiedTime());
+        entity.setSysVersion(dto.getSysVersion());
+        return entity;
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/convert/BizMemberEquityTransactionHistoryConvert.java

+package cn.com.poc.equity.convert;	
+
+import cn.com.poc.equity.model.BizMemberEquityTransactionHistoryModel;
+import cn.com.poc.equity.entity.BizMemberEquityTransactionHistoryEntity;
+import cn.com.poc.equity.dto.BizMemberEquityTransactionHistoryDto;
+
+
+public class BizMemberEquityTransactionHistoryConvert {
+
+    public static BizMemberEquityTransactionHistoryEntity modelToEntity(BizMemberEquityTransactionHistoryModel model){
+        BizMemberEquityTransactionHistoryEntity entity = new BizMemberEquityTransactionHistoryEntity();
+        entity.setId(model.getId());
+        entity.setTransactionSn(model.getTransactionSn());
+        entity.setMemberId(model.getMemberId());
+        entity.setOriginalEquityLevel(model.getOriginalEquityLevel());
+        entity.setModifyEquityLevel(model.getModifyEquityLevel());
+        entity.setModifyEvent(model.getModifyEvent());
+        entity.setModifyEventInfo(model.getModifyEventInfo());
+        entity.setTargetEquityId(model.getTargetEquityId());
+        entity.setIsDeleted(model.getIsDeleted());
+        entity.setCreator(model.getCreator());
+        entity.setCreatedTime(model.getCreatedTime());
+        entity.setModifier(model.getModifier());
+        entity.setModifiedTime(model.getModifiedTime());
+        entity.setSysVersion(model.getSysVersion());
+        return entity;
+    }
+
+    public static BizMemberEquityTransactionHistoryModel entityToModel(BizMemberEquityTransactionHistoryEntity entity){
+        BizMemberEquityTransactionHistoryModel model = new BizMemberEquityTransactionHistoryModel();
+        model.setId(entity.getId());
+        model.setTransactionSn(entity.getTransactionSn());
+        model.setMemberId(entity.getMemberId());
+        model.setOriginalEquityLevel(entity.getOriginalEquityLevel());
+        model.setModifyEquityLevel(entity.getModifyEquityLevel());
+        model.setModifyEvent(entity.getModifyEvent());
+        model.setModifyEventInfo(entity.getModifyEventInfo());
+        model.setTargetEquityId(entity.getTargetEquityId());
+        model.setIsDeleted(entity.getIsDeleted());
+        model.setCreator(entity.getCreator());
+        model.setCreatedTime(entity.getCreatedTime());
+        model.setModifier(entity.getModifier());
+        model.setModifiedTime(entity.getModifiedTime());
+        model.setSysVersion(entity.getSysVersion());
+        return model;
+    }
+    
+    public static BizMemberEquityTransactionHistoryDto entityToDto(BizMemberEquityTransactionHistoryEntity entity){
+        BizMemberEquityTransactionHistoryDto dto = new BizMemberEquityTransactionHistoryDto();
+        dto.setId(entity.getId());
+        dto.setTransactionSn(entity.getTransactionSn());
+        dto.setMemberId(entity.getMemberId());
+        dto.setOriginalEquityLevel(entity.getOriginalEquityLevel());
+        dto.setModifyEquityLevel(entity.getModifyEquityLevel());
+        dto.setModifyEvent(entity.getModifyEvent());
+        dto.setModifyEventInfo(entity.getModifyEventInfo());
+        dto.setTargetEquityId(entity.getTargetEquityId());
+        dto.setIsDeleted(entity.getIsDeleted());
+        dto.setCreator(entity.getCreator());
+        dto.setCreatedTime(entity.getCreatedTime());
+        dto.setModifier(entity.getModifier());
+        dto.setModifiedTime(entity.getModifiedTime());
+        dto.setSysVersion(entity.getSysVersion());
+        return dto;
+    }
+
+    public static BizMemberEquityTransactionHistoryEntity dtoToEntity(BizMemberEquityTransactionHistoryDto dto){
+        BizMemberEquityTransactionHistoryEntity entity = new BizMemberEquityTransactionHistoryEntity();
+        entity.setId(dto.getId());
+        entity.setTransactionSn(dto.getTransactionSn());
+        entity.setMemberId(dto.getMemberId());
+        entity.setOriginalEquityLevel(dto.getOriginalEquityLevel());
+        entity.setModifyEquityLevel(dto.getModifyEquityLevel());
+        entity.setModifyEvent(dto.getModifyEvent());
+        entity.setModifyEventInfo(dto.getModifyEventInfo());
+        entity.setTargetEquityId(dto.getTargetEquityId());
+        entity.setIsDeleted(dto.getIsDeleted());
+        entity.setCreator(dto.getCreator());
+        entity.setCreatedTime(dto.getCreatedTime());
+        entity.setModifier(dto.getModifier());
+        entity.setModifiedTime(dto.getModifiedTime());
+        entity.setSysVersion(dto.getSysVersion());
+        return entity;
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/convert/BizMemberPointTransactionHistoryConvert.java

+package cn.com.poc.equity.convert;
+
+import cn.com.poc.equity.model.BizMemberPointTransactionHistoryModel;
+import cn.com.poc.equity.entity.BizMemberPointTransactionHistoryEntity;
+import cn.com.poc.equity.dto.BizMemberPointTransactionHistoryDto;
+
+
+public class BizMemberPointTransactionHistoryConvert {
+
+    public static BizMemberPointTransactionHistoryEntity modelToEntity(BizMemberPointTransactionHistoryModel model) {
+        BizMemberPointTransactionHistoryEntity entity = new BizMemberPointTransactionHistoryEntity();
+        entity.setId(model.getId());
+        entity.setTransactionSn(model.getTransactionSn());
+        entity.setMemberId(model.getMemberId());
+        entity.setModifyEvent(model.getModifyEvent());
+        entity.setModifyEventInfo(model.getModifyEventInfo());
+        entity.setModifyTargetId(model.getModifyTargetId());
+        entity.setPointChangeNum(model.getPointChangeNum());
+        entity.setIsDeleted(model.getIsDeleted());
+        entity.setCreator(model.getCreator());
+        entity.setCreatedTime(model.getCreatedTime());
+        entity.setModifier(model.getModifier());
+        entity.setModifiedTime(model.getModifiedTime());
+        entity.setSysVersion(model.getSysVersion());
+        return entity;
+    }
+
+    public static BizMemberPointTransactionHistoryModel entityToModel(BizMemberPointTransactionHistoryEntity entity) {
+        BizMemberPointTransactionHistoryModel model = new BizMemberPointTransactionHistoryModel();
+        model.setId(entity.getId());
+        model.setTransactionSn(entity.getTransactionSn());
+        model.setMemberId(entity.getMemberId());
+        model.setModifyEvent(entity.getModifyEvent());
+        model.setModifyEventInfo(entity.getModifyEventInfo());
+        model.setModifyTargetId(entity.getModifyTargetId());
+        model.setPointChangeNum(entity.getPointChangeNum());
+        model.setIsDeleted(entity.getIsDeleted());
+        model.setCreator(entity.getCreator());
+        model.setCreatedTime(entity.getCreatedTime());
+        model.setModifier(entity.getModifier());
+        model.setModifiedTime(entity.getModifiedTime());
+        model.setSysVersion(entity.getSysVersion());
+        return model;
+    }
+
+    public static BizMemberPointTransactionHistoryDto entityToDto(BizMemberPointTransactionHistoryEntity entity) {
+        BizMemberPointTransactionHistoryDto dto = new BizMemberPointTransactionHistoryDto();
+        dto.setId(entity.getId());
+        dto.setTransactionSn(entity.getTransactionSn());
+        dto.setMemberId(entity.getMemberId());
+        dto.setModifyEvent(entity.getModifyEvent());
+        dto.setModifyEventInfo(entity.getModifyEventInfo());
+        dto.setModifyTargetId(entity.getModifyTargetId());
+        dto.setPointChangeNum(entity.getPointChangeNum());
+        dto.setIsDeleted(entity.getIsDeleted());
+        dto.setCreator(entity.getCreator());
+        dto.setCreatedTime(entity.getCreatedTime());
+        dto.setModifier(entity.getModifier());
+        dto.setModifiedTime(entity.getModifiedTime());
+        dto.setSysVersion(entity.getSysVersion());
+        return dto;
+    }
+
+    public static BizMemberPointTransactionHistoryEntity dtoToEntity(BizMemberPointTransactionHistoryDto dto) {
+        BizMemberPointTransactionHistoryEntity entity = new BizMemberPointTransactionHistoryEntity();
+        entity.setId(dto.getId());
+        entity.setTransactionSn(dto.getTransactionSn());
+        entity.setMemberId(dto.getMemberId());
+        entity.setModifyEvent(dto.getModifyEvent());
+        entity.setModifyEventInfo(dto.getModifyEventInfo());
+        entity.setModifyTargetId(dto.getModifyTargetId());
+        entity.setPointChangeNum(dto.getPointChangeNum());
+        entity.setIsDeleted(dto.getIsDeleted());
+        entity.setCreator(dto.getCreator());
+        entity.setCreatedTime(dto.getCreatedTime());
+        entity.setModifier(dto.getModifier());
+        entity.setModifiedTime(dto.getModifiedTime());
+        entity.setSysVersion(dto.getSysVersion());
+        return entity;
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/convert/BizMemberPointsConvert.java

+package cn.com.poc.equity.convert;	
+
+import cn.com.poc.equity.model.BizMemberPointsModel;
+import cn.com.poc.equity.entity.BizMemberPointsEntity;
+import cn.com.poc.equity.dto.BizMemberPointsDto;
+
+
+public class BizMemberPointsConvert {
+
+    public static BizMemberPointsEntity modelToEntity(BizMemberPointsModel model){
+        BizMemberPointsEntity entity = new BizMemberPointsEntity();
+        entity.setId(model.getId());
+        entity.setMemberId(model.getMemberId());
+        entity.setTotalPoints(model.getTotalPoints());
+        entity.setUsagePoints(model.getUsagePoints());
+        entity.setExpiredTime(model.getExpiredTime());
+        entity.setIsDeleted(model.getIsDeleted());
+        entity.setCreator(model.getCreator());
+        entity.setCreatedTime(model.getCreatedTime());
+        entity.setModifier(model.getModifier());
+        entity.setModifiedTime(model.getModifiedTime());
+        entity.setSysVersion(model.getSysVersion());
+        return entity;
+    }
+
+    public static BizMemberPointsModel entityToModel(BizMemberPointsEntity entity){
+        BizMemberPointsModel model = new BizMemberPointsModel();
+        model.setId(entity.getId());
+        model.setMemberId(entity.getMemberId());
+        model.setTotalPoints(entity.getTotalPoints());
+        model.setUsagePoints(entity.getUsagePoints());
+        model.setExpiredTime(entity.getExpiredTime());
+        model.setIsDeleted(entity.getIsDeleted());
+        model.setCreator(entity.getCreator());
+        model.setCreatedTime(entity.getCreatedTime());
+        model.setModifier(entity.getModifier());
+        model.setModifiedTime(entity.getModifiedTime());
+        model.setSysVersion(entity.getSysVersion());
+        return model;
+    }
+    
+    public static BizMemberPointsDto entityToDto(BizMemberPointsEntity entity){
+        BizMemberPointsDto dto = new BizMemberPointsDto();
+        dto.setId(entity.getId());
+        dto.setMemberId(entity.getMemberId());
+        dto.setTotalPoints(entity.getTotalPoints());
+        dto.setUsagePoints(entity.getUsagePoints());
+        dto.setExpiredTime(entity.getExpiredTime());
+        dto.setIsDeleted(entity.getIsDeleted());
+        dto.setCreator(entity.getCreator());
+        dto.setCreatedTime(entity.getCreatedTime());
+        dto.setModifier(entity.getModifier());
+        dto.setModifiedTime(entity.getModifiedTime());
+        dto.setSysVersion(entity.getSysVersion());
+        return dto;
+    }
+
+    public static BizMemberPointsEntity dtoToEntity(BizMemberPointsDto dto){
+        BizMemberPointsEntity entity = new BizMemberPointsEntity();
+        entity.setId(dto.getId());
+        entity.setMemberId(dto.getMemberId());
+        entity.setTotalPoints(dto.getTotalPoints());
+        entity.setUsagePoints(dto.getUsagePoints());
+        entity.setExpiredTime(dto.getExpiredTime());
+        entity.setIsDeleted(dto.getIsDeleted());
+        entity.setCreator(dto.getCreator());
+        entity.setCreatedTime(dto.getCreatedTime());
+        entity.setModifier(dto.getModifier());
+        entity.setModifiedTime(dto.getModifiedTime());
+        entity.setSysVersion(dto.getSysVersion());
+        return entity;
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/domain/EquityInfo.java

+package cn.com.poc.equity.domain;
+
+import cn.com.poc.equity.constants.EquityEnum;
+
+import java.util.Date;
+
+/**
+ * @author alex.yao
+ * @date 2024/12/6
+ */
+public class EquityInfo {
+
+    private EquityEnum.TYPE equityLevel;
+
+    private Date expiredDate;
+
+    private Integer agentNum;
+
+    private Integer knowledgeNum;
+
+    public EquityEnum.TYPE getEquityLevel() {
+        return equityLevel;
+    }
+
+    public void setEquityLevel(EquityEnum.TYPE equityLevel) {
+        this.equityLevel = equityLevel;
+    }
+
+    public Date getExpiredDate() {
+        return expiredDate;
+    }
+
+    public void setExpiredDate(Date expiredDate) {
+        this.expiredDate = expiredDate;
+    }
+
+    public Integer getAgentNum() {
+        return agentNum;
+    }
+
+    public void setAgentNum(Integer agentNum) {
+        this.agentNum = agentNum;
+    }
+
+    public Integer getKnowledgeNum() {
+        return knowledgeNum;
+    }
+
+    public void setKnowledgeNum(Integer knowledgeNum) {
+        this.knowledgeNum = knowledgeNum;
+    }
+}

src/main/java/cn/com/poc/equity/domain/modifyEquityInfo/AgentUseModifyEventInfo.java

+package cn.com.poc.equity.domain.modifyEquityInfo;
+
+/**
+ * agent应用使用事件信息
+ *
+ * @author alex.yao
+ * @date 2024/12/6
+ */
+public class AgentUseModifyEventInfo extends ModifyEventInfo {
+
+    private String agentId;
+
+    public String getAgentId() {
+        return agentId;
+    }
+
+    public void setAgentId(String agentId) {
+        this.agentId = agentId;
+    }
+
+    @Override
+    public void setModifyType() {
+        this.modifyType = "use";
+    }
+
+    @Override
+    public String getModifyType() {
+        return  "use";
+    }
+}

src/main/java/cn/com/poc/equity/domain/modifyEquityInfo/ExpiredModifyEventInfo.java

+package cn.com.poc.equity.domain.modifyEquityInfo;
+
+/**
+ * @author alex.yao
+ * @date 2024/12/6
+ */
+public class ExpiredModifyEventInfo extends ModifyEventInfo {
+
+    @Override
+    public void setModifyType() {
+        this.modifyType = "expired";
+    }
+
+    @Override
+    public String getModifyType() {
+        return "expired";
+    }
+}

src/main/java/cn/com/poc/equity/domain/modifyEquityInfo/InitModifyEventInfo.java

+package cn.com.poc.equity.domain.modifyEquityInfo;
+
+/**
+ * @author alex.yao
+ * @date 2024/12/6
+ */
+public class InitModifyEventInfo extends ModifyEventInfo {
+
+    @Override
+    public void setModifyType() {
+        this.modifyType = "init";
+    }
+
+    @Override
+    public String getModifyType() {
+        return  "init";
+    }
+}

src/main/java/cn/com/poc/equity/domain/modifyEquityInfo/ModifyEventInfo.java

+package cn.com.poc.equity.domain.modifyEquityInfo;
+
+/**
+ * @author alex.yao
+ * @date 2024/12/6
+ */
+public abstract class ModifyEventInfo {
+
+    String modifyType;
+
+    public abstract void setModifyType();
+
+    public abstract String getModifyType();
+
+}

src/main/java/cn/com/poc/equity/domain/modifyEquityInfo/PayModifyEventInfo.java

+package cn.com.poc.equity.domain.modifyEquityInfo;
+
+/**
+ * 支付充值事件信息
+ *
+ * @author alex.yao
+ * @date 2024/12/6
+ */
+public class PayModifyEventInfo extends ModifyEventInfo {
+
+    private String payOrderSn;
+
+    public String getPayOrderSn() {
+        return payOrderSn;
+    }
+
+    public void setPayOrderSn(String payOrderSn) {
+        this.payOrderSn = payOrderSn;
+    }
+
+    @Override
+    public void setModifyType() {
+        this.modifyType = "pay";
+    }
+
+    @Override
+    public String getModifyType() {
+        return "pay";
+    }
+}

src/main/java/cn/com/poc/equity/domain/modifyEquityInfo/RollbackModifyEventInfo.java

+package cn.com.poc.equity.domain.modifyEquityInfo;
+
+/**
+ * @author alex.yao
+ * @date 2024/12/6
+ */
+public class RollbackModifyEventInfo extends ModifyEventInfo{
+
+    private String transactionSn;
+
+    public String getTransactionSn() {
+        return transactionSn;
+    }
+
+    public void setTransactionSn(String transactionSn) {
+        this.transactionSn = transactionSn;
+    }
+
+    @Override
+    public void setModifyType() {
+        this.modifyType= "rollback";
+    }
+
+    @Override
+    public String getModifyType() {
+        return "rollback";
+    }
+}

src/main/java/cn/com/poc/equity/dto/BizMemberEquityDto.java

+package cn.com.poc.equity.dto;	
+
+
+public class BizMemberEquityDto {
+
+    private static final long serialVersionUID = 1L;
+	/** id
+    *主键ID
+    */ 
+    private java.lang.Long id;
+
+    public java.lang.Long getId(){
+        return this.id;
+    }
+    
+    public void setId(java.lang.Long id){
+        this.id = id;
+    }
+	/** member_id
+    *用户ID
+    */ 
+    private java.lang.Long memberId;
+
+    public java.lang.Long getMemberId(){
+        return this.memberId;
+    }
+    
+    public void setMemberId(java.lang.Long memberId){
+        this.memberId = memberId;
+    }
+	/** equity_level
+    *权益等级 normal-普通版 professional-专业版 ， ultimate-旗舰版
+    */ 
+    private java.lang.String equityLevel;
+
+    public java.lang.String getEquityLevel(){
+        return this.equityLevel;
+    }
+    
+    public void setEquityLevel(java.lang.String equityLevel){
+        this.equityLevel = equityLevel;
+    }
+	/** expired_date
+    *权益过期时间
+    */ 
+    private java.util.Date expiredDate;
+
+    public java.util.Date getExpiredDate(){
+        return this.expiredDate;
+    }
+    
+    public void setExpiredDate(java.util.Date expiredDate){
+        this.expiredDate = expiredDate;
+    }
+	/** equity_config
+    *权益配置- 知识库最大创建数   应用最大创建数
+    */ 
+    private java.lang.String equityConfig;
+
+    public java.lang.String getEquityConfig(){
+        return this.equityConfig;
+    }
+    
+    public void setEquityConfig(java.lang.String equityConfig){
+        this.equityConfig = equityConfig;
+    }
+	/** is_deleted
+    *是否删除 Y 是  N 否
+    */ 
+    private java.lang.String isDeleted;
+
+    public java.lang.String getIsDeleted(){
+        return this.isDeleted;
+    }
+    
+    public void setIsDeleted(java.lang.String isDeleted){
+        this.isDeleted = isDeleted;
+    }
+	/** CREATOR
+    *创建人
+    */ 
+    private java.lang.String creator;
+
+    public java.lang.String getCreator(){
+        return this.creator;
+    }
+    
+    public void setCreator(java.lang.String creator){
+        this.creator = creator;
+    }
+	/** CREATED_TIME
+    *创建时间
+    */ 
+    private java.util.Date createdTime;
+
+    public java.util.Date getCreatedTime(){
+        return this.createdTime;
+    }
+    
+    public void setCreatedTime(java.util.Date createdTime){
+        this.createdTime = createdTime;
+    }
+	/** MODIFIER
+    *修改人
+    */ 
+    private java.lang.String modifier;
+
+    public java.lang.String getModifier(){
+        return this.modifier;
+    }
+    
+    public void setModifier(java.lang.String modifier){
+        this.modifier = modifier;
+    }
+	/** MODIFIED_TIME
+    *修改时间
+    */ 
+    private java.util.Date modifiedTime;
+
+    public java.util.Date getModifiedTime(){
+        return this.modifiedTime;
+    }
+    
+    public void setModifiedTime(java.util.Date modifiedTime){
+        this.modifiedTime = modifiedTime;
+    }
+	/** SYS_VERSION
+    *乐观锁,版本号
+    */ 
+    private java.lang.Integer sysVersion;
+
+    public java.lang.Integer getSysVersion(){
+        return this.sysVersion;
+    }
+    
+    public void setSysVersion(java.lang.Integer sysVersion){
+        this.sysVersion = sysVersion;
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/dto/BizMemberEquityTransactionHistoryDto.java

+package cn.com.poc.equity.dto;	
+
+
+public class BizMemberEquityTransactionHistoryDto {
+
+    private static final long serialVersionUID = 1L;
+	/** id
+    *主键id
+    */ 
+    private java.lang.Long id;
+
+    public java.lang.Long getId(){
+        return this.id;
+    }
+    
+    public void setId(java.lang.Long id){
+        this.id = id;
+    }
+	/** transaction_sn
+    *变更流水号
+    */ 
+    private java.lang.String transactionSn;
+
+    public java.lang.String getTransactionSn(){
+        return this.transactionSn;
+    }
+    
+    public void setTransactionSn(java.lang.String transactionSn){
+        this.transactionSn = transactionSn;
+    }
+	/** member_id
+    *目标用户id
+    */ 
+    private java.lang.Long memberId;
+
+    public java.lang.Long getMemberId(){
+        return this.memberId;
+    }
+    
+    public void setMemberId(java.lang.Long memberId){
+        this.memberId = memberId;
+    }
+	/** original_equity_level
+    *原有权益等级
+    */ 
+    private java.lang.String originalEquityLevel;
+
+    public java.lang.String getOriginalEquityLevel(){
+        return this.originalEquityLevel;
+    }
+    
+    public void setOriginalEquityLevel(java.lang.String originalEquityLevel){
+        this.originalEquityLevel = originalEquityLevel;
+    }
+	/** modify_equity_level
+    *更改后权益等级
+    */ 
+    private java.lang.String modifyEquityLevel;
+
+    public java.lang.String getModifyEquityLevel(){
+        return this.modifyEquityLevel;
+    }
+    
+    public void setModifyEquityLevel(java.lang.String modifyEquityLevel){
+        this.modifyEquityLevel = modifyEquityLevel;
+    }
+	/** modify_event
+    *变更事件  expired-过期  top_up-充值
+    */ 
+    private java.lang.String modifyEvent;
+
+    public java.lang.String getModifyEvent(){
+        return this.modifyEvent;
+    }
+    
+    public void setModifyEvent(java.lang.String modifyEvent){
+        this.modifyEvent = modifyEvent;
+    }
+	/** modify_event_info
+    *变更事件详情
+    */ 
+    private java.lang.String modifyEventInfo;
+
+    public java.lang.String getModifyEventInfo(){
+        return this.modifyEventInfo;
+    }
+    
+    public void setModifyEventInfo(java.lang.String modifyEventInfo){
+        this.modifyEventInfo = modifyEventInfo;
+    }
+	/** target_equity_id
+    *目标用户权益id
+    */ 
+    private java.lang.Long targetEquityId;
+
+    public java.lang.Long getTargetEquityId(){
+        return this.targetEquityId;
+    }
+    
+    public void setTargetEquityId(java.lang.Long targetEquityId){
+        this.targetEquityId = targetEquityId;
+    }
+	/** is_deleted
+    *是否删除 Y 是  N 否
+    */ 
+    private java.lang.String isDeleted;
+
+    public java.lang.String getIsDeleted(){
+        return this.isDeleted;
+    }
+    
+    public void setIsDeleted(java.lang.String isDeleted){
+        this.isDeleted = isDeleted;
+    }
+	/** CREATOR
+    *创建人
+    */ 
+    private java.lang.String creator;
+
+    public java.lang.String getCreator(){
+        return this.creator;
+    }
+    
+    public void setCreator(java.lang.String creator){
+        this.creator = creator;
+    }
+	/** CREATED_TIME
+    *创建时间
+    */ 
+    private java.util.Date createdTime;
+
+    public java.util.Date getCreatedTime(){
+        return this.createdTime;
+    }
+    
+    public void setCreatedTime(java.util.Date createdTime){
+        this.createdTime = createdTime;
+    }
+	/** MODIFIER
+    *修改人
+    */ 
+    private java.lang.String modifier;
+
+    public java.lang.String getModifier(){
+        return this.modifier;
+    }
+    
+    public void setModifier(java.lang.String modifier){
+        this.modifier = modifier;
+    }
+	/** MODIFIED_TIME
+    *修改时间
+    */ 
+    private java.util.Date modifiedTime;
+
+    public java.util.Date getModifiedTime(){
+        return this.modifiedTime;
+    }
+    
+    public void setModifiedTime(java.util.Date modifiedTime){
+        this.modifiedTime = modifiedTime;
+    }
+	/** SYS_VERSION
+    *乐观锁,版本号
+    */ 
+    private java.lang.Integer sysVersion;
+
+    public java.lang.Integer getSysVersion(){
+        return this.sysVersion;
+    }
+    
+    public void setSysVersion(java.lang.Integer sysVersion){
+        this.sysVersion = sysVersion;
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/dto/BizMemberPointTransactionHistoryDto.java

+package cn.com.poc.equity.dto;	
+
+
+public class BizMemberPointTransactionHistoryDto {
+
+    private static final long serialVersionUID = 1L;
+	/** id
+    *
+    */ 
+    private java.lang.Long id;
+
+    public java.lang.Long getId(){
+        return this.id;
+    }
+    
+    public void setId(java.lang.Long id){
+        this.id = id;
+    }
+	/** transaction_sn
+    *变更流水号
+    */ 
+    private java.lang.String transactionSn;
+
+    public java.lang.String getTransactionSn(){
+        return this.transactionSn;
+    }
+    
+    public void setTransactionSn(java.lang.String transactionSn){
+        this.transactionSn = transactionSn;
+    }
+    /** member_id
+     *目标用户id
+     */
+    private java.lang.Long memberId;
+
+    public java.lang.Long getMemberId(){
+        return this.memberId;
+    }
+
+    public void setMemberId(java.lang.Long memberId){
+        this.memberId = memberId;
+    }
+	/** modify_event
+    *变更事件  expired-过期  top_up-充值 use-使用
+    */ 
+    private java.lang.String modifyEvent;
+
+    public java.lang.String getModifyEvent(){
+        return this.modifyEvent;
+    }
+    
+    public void setModifyEvent(java.lang.String modifyEvent){
+        this.modifyEvent = modifyEvent;
+    }
+	/** modify_event_info
+    *变更事件详情
+    */ 
+    private java.lang.String modifyEventInfo;
+
+    public java.lang.String getModifyEventInfo(){
+        return this.modifyEventInfo;
+    }
+    
+    public void setModifyEventInfo(java.lang.String modifyEventInfo){
+        this.modifyEventInfo = modifyEventInfo;
+    }
+	/** modify_target_id
+    *变更 用户积分表主键id
+    */ 
+    private java.lang.Long modifyTargetId;
+
+    public java.lang.Long getModifyTargetId(){
+        return this.modifyTargetId;
+    }
+    
+    public void setModifyTargetId(java.lang.Long modifyTargetId){
+        this.modifyTargetId = modifyTargetId;
+    }
+	/** point_change_num
+    *变更数
+    */ 
+    private java.lang.Long pointChangeNum;
+
+    public java.lang.Long getPointChangeNum(){
+        return this.pointChangeNum;
+    }
+    
+    public void setPointChangeNum(java.lang.Long pointChangeNum){
+        this.pointChangeNum = pointChangeNum;
+    }
+	/** is_deleted
+    *是否删除 Y 是  N 否
+    */ 
+    private java.lang.String isDeleted;
+
+    public java.lang.String getIsDeleted(){
+        return this.isDeleted;
+    }
+    
+    public void setIsDeleted(java.lang.String isDeleted){
+        this.isDeleted = isDeleted;
+    }
+	/** CREATOR
+    *创建人
+    */ 
+    private java.lang.String creator;
+
+    public java.lang.String getCreator(){
+        return this.creator;
+    }
+    
+    public void setCreator(java.lang.String creator){
+        this.creator = creator;
+    }
+	/** CREATED_TIME
+    *创建时间
+    */ 
+    private java.util.Date createdTime;
+
+    public java.util.Date getCreatedTime(){
+        return this.createdTime;
+    }
+    
+    public void setCreatedTime(java.util.Date createdTime){
+        this.createdTime = createdTime;
+    }
+	/** MODIFIER
+    *修改人
+    */ 
+    private java.lang.String modifier;
+
+    public java.lang.String getModifier(){
+        return this.modifier;
+    }
+    
+    public void setModifier(java.lang.String modifier){
+        this.modifier = modifier;
+    }
+	/** MODIFIED_TIME
+    *修改时间
+    */ 
+    private java.util.Date modifiedTime;
+
+    public java.util.Date getModifiedTime(){
+        return this.modifiedTime;
+    }
+    
+    public void setModifiedTime(java.util.Date modifiedTime){
+        this.modifiedTime = modifiedTime;
+    }
+	/** SYS_VERSION
+    *乐观锁,版本号
+    */ 
+    private java.lang.Integer sysVersion;
+
+    public java.lang.Integer getSysVersion(){
+        return this.sysVersion;
+    }
+    
+    public void setSysVersion(java.lang.Integer sysVersion){
+        this.sysVersion = sysVersion;
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/dto/BizMemberPointsDto.java

+package cn.com.poc.equity.dto;	
+
+
+public class BizMemberPointsDto {
+
+    private static final long serialVersionUID = 1L;
+	/** id
+    *
+    */ 
+    private java.lang.Long id;
+
+    public java.lang.Long getId(){
+        return this.id;
+    }
+    
+    public void setId(java.lang.Long id){
+        this.id = id;
+    }
+	/** member_id
+    *用户id
+    */ 
+    private java.lang.Long memberId;
+
+    public java.lang.Long getMemberId(){
+        return this.memberId;
+    }
+    
+    public void setMemberId(java.lang.Long memberId){
+        this.memberId = memberId;
+    }
+	/** total_points
+    *总积分
+    */ 
+    private java.lang.Long totalPoints;
+
+    public java.lang.Long getTotalPoints(){
+        return this.totalPoints;
+    }
+    
+    public void setTotalPoints(java.lang.Long totalPoints){
+        this.totalPoints = totalPoints;
+    }
+	/** usage_points
+    *剩余可用积分
+    */ 
+    private java.lang.Long usagePoints;
+
+    public java.lang.Long getUsagePoints(){
+        return this.usagePoints;
+    }
+    
+    public void setUsagePoints(java.lang.Long usagePoints){
+        this.usagePoints = usagePoints;
+    }
+	/** expired_time
+    *积分过期时间
+    */ 
+    private java.util.Date expiredTime;
+
+    public java.util.Date getExpiredTime(){
+        return this.expiredTime;
+    }
+    
+    public void setExpiredTime(java.util.Date expiredTime){
+        this.expiredTime = expiredTime;
+    }
+	/** is_deleted
+    *是否删除 Y 是  N 否
+    */ 
+    private java.lang.String isDeleted;
+
+    public java.lang.String getIsDeleted(){
+        return this.isDeleted;
+    }
+    
+    public void setIsDeleted(java.lang.String isDeleted){
+        this.isDeleted = isDeleted;
+    }
+	/** CREATOR
+    *创建人
+    */ 
+    private java.lang.String creator;
+
+    public java.lang.String getCreator(){
+        return this.creator;
+    }
+    
+    public void setCreator(java.lang.String creator){
+        this.creator = creator;
+    }
+	/** CREATED_TIME
+    *创建时间
+    */ 
+    private java.util.Date createdTime;
+
+    public java.util.Date getCreatedTime(){
+        return this.createdTime;
+    }
+    
+    public void setCreatedTime(java.util.Date createdTime){
+        this.createdTime = createdTime;
+    }
+	/** MODIFIER
+    *修改人
+    */ 
+    private java.lang.String modifier;
+
+    public java.lang.String getModifier(){
+        return this.modifier;
+    }
+    
+    public void setModifier(java.lang.String modifier){
+        this.modifier = modifier;
+    }
+	/** MODIFIED_TIME
+    *修改时间
+    */ 
+    private java.util.Date modifiedTime;
+
+    public java.util.Date getModifiedTime(){
+        return this.modifiedTime;
+    }
+    
+    public void setModifiedTime(java.util.Date modifiedTime){
+        this.modifiedTime = modifiedTime;
+    }
+	/** SYS_VERSION
+    *乐观锁,版本号
+    */ 
+    private java.lang.Integer sysVersion;
+
+    public java.lang.Integer getSysVersion(){
+        return this.sysVersion;
+    }
+    
+    public void setSysVersion(java.lang.Integer sysVersion){
+        this.sysVersion = sysVersion;
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/entity/BizMemberEquityEntity.java

+package cn.com.poc.equity.entity;	
+
+
+public class BizMemberEquityEntity {
+
+    private static final long serialVersionUID = 1L;
+	/** id
+    *主键ID
+    */ 
+    private java.lang.Long id;
+
+    public java.lang.Long getId(){
+        return this.id;
+    }
+    
+    public void setId(java.lang.Long id){
+        this.id = id;
+    }
+	/** member_id
+    *用户ID
+    */ 
+    private java.lang.Long memberId;
+
+    public java.lang.Long getMemberId(){
+        return this.memberId;
+    }
+    
+    public void setMemberId(java.lang.Long memberId){
+        this.memberId = memberId;
+    }
+	/** equity_level
+    *权益等级 normal-普通版 professional-专业版 ， ultimate-旗舰版
+    */ 
+    private java.lang.String equityLevel;
+
+    public java.lang.String getEquityLevel(){
+        return this.equityLevel;
+    }
+    
+    public void setEquityLevel(java.lang.String equityLevel){
+        this.equityLevel = equityLevel;
+    }
+	/** expired_date
+    *权益过期时间
+    */ 
+    private java.util.Date expiredDate;
+
+    public java.util.Date getExpiredDate(){
+        return this.expiredDate;
+    }
+    
+    public void setExpiredDate(java.util.Date expiredDate){
+        this.expiredDate = expiredDate;
+    }
+	/** equity_config
+    *权益配置- 知识库最大创建数   应用最大创建数
+    */ 
+    private java.lang.String equityConfig;
+
+    public java.lang.String getEquityConfig(){
+        return this.equityConfig;
+    }
+    
+    public void setEquityConfig(java.lang.String equityConfig){
+        this.equityConfig = equityConfig;
+    }
+	/** is_deleted
+    *是否删除 Y 是  N 否
+    */ 
+    private java.lang.String isDeleted;
+
+    public java.lang.String getIsDeleted(){
+        return this.isDeleted;
+    }
+    
+    public void setIsDeleted(java.lang.String isDeleted){
+        this.isDeleted = isDeleted;
+    }
+	/** CREATOR
+    *创建人
+    */ 
+    private java.lang.String creator;
+
+    public java.lang.String getCreator(){
+        return this.creator;
+    }
+    
+    public void setCreator(java.lang.String creator){
+        this.creator = creator;
+    }
+	/** CREATED_TIME
+    *创建时间
+    */ 
+    private java.util.Date createdTime;
+
+    public java.util.Date getCreatedTime(){
+        return this.createdTime;
+    }
+    
+    public void setCreatedTime(java.util.Date createdTime){
+        this.createdTime = createdTime;
+    }
+	/** MODIFIER
+    *修改人
+    */ 
+    private java.lang.String modifier;
+
+    public java.lang.String getModifier(){
+        return this.modifier;
+    }
+    
+    public void setModifier(java.lang.String modifier){
+        this.modifier = modifier;
+    }
+	/** MODIFIED_TIME
+    *修改时间
+    */ 
+    private java.util.Date modifiedTime;
+
+    public java.util.Date getModifiedTime(){
+        return this.modifiedTime;
+    }
+    
+    public void setModifiedTime(java.util.Date modifiedTime){
+        this.modifiedTime = modifiedTime;
+    }
+	/** SYS_VERSION
+    *乐观锁,版本号
+    */ 
+    private java.lang.Integer sysVersion;
+
+    public java.lang.Integer getSysVersion(){
+        return this.sysVersion;
+    }
+    
+    public void setSysVersion(java.lang.Integer sysVersion){
+        this.sysVersion = sysVersion;
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/entity/BizMemberEquityTransactionHistoryEntity.java

+package cn.com.poc.equity.entity;	
+
+
+public class BizMemberEquityTransactionHistoryEntity {
+
+    private static final long serialVersionUID = 1L;
+	/** id
+    *主键id
+    */ 
+    private java.lang.Long id;
+
+    public java.lang.Long getId(){
+        return this.id;
+    }
+    
+    public void setId(java.lang.Long id){
+        this.id = id;
+    }
+	/** transaction_sn
+    *变更流水号
+    */ 
+    private java.lang.String transactionSn;
+
+    public java.lang.String getTransactionSn(){
+        return this.transactionSn;
+    }
+    
+    public void setTransactionSn(java.lang.String transactionSn){
+        this.transactionSn = transactionSn;
+    }
+	/** member_id
+    *目标用户id
+    */ 
+    private java.lang.Long memberId;
+
+    public java.lang.Long getMemberId(){
+        return this.memberId;
+    }
+    
+    public void setMemberId(java.lang.Long memberId){
+        this.memberId = memberId;
+    }
+	/** original_equity_level
+    *原有权益等级
+    */ 
+    private java.lang.String originalEquityLevel;
+
+    public java.lang.String getOriginalEquityLevel(){
+        return this.originalEquityLevel;
+    }
+    
+    public void setOriginalEquityLevel(java.lang.String originalEquityLevel){
+        this.originalEquityLevel = originalEquityLevel;
+    }
+	/** modify_equity_level
+    *更改后权益等级
+    */ 
+    private java.lang.String modifyEquityLevel;
+
+    public java.lang.String getModifyEquityLevel(){
+        return this.modifyEquityLevel;
+    }
+    
+    public void setModifyEquityLevel(java.lang.String modifyEquityLevel){
+        this.modifyEquityLevel = modifyEquityLevel;
+    }
+	/** modify_event
+    *变更事件  expired-过期  top_up-充值
+    */ 
+    private java.lang.String modifyEvent;
+
+    public java.lang.String getModifyEvent(){
+        return this.modifyEvent;
+    }
+    
+    public void setModifyEvent(java.lang.String modifyEvent){
+        this.modifyEvent = modifyEvent;
+    }
+	/** modify_event_info
+    *变更事件详情
+    */ 
+    private java.lang.String modifyEventInfo;
+
+    public java.lang.String getModifyEventInfo(){
+        return this.modifyEventInfo;
+    }
+    
+    public void setModifyEventInfo(java.lang.String modifyEventInfo){
+        this.modifyEventInfo = modifyEventInfo;
+    }
+	/** target_equity_id
+    *目标用户权益id
+    */ 
+    private java.lang.Long targetEquityId;
+
+    public java.lang.Long getTargetEquityId(){
+        return this.targetEquityId;
+    }
+    
+    public void setTargetEquityId(java.lang.Long targetEquityId){
+        this.targetEquityId = targetEquityId;
+    }
+	/** is_deleted
+    *是否删除 Y 是  N 否
+    */ 
+    private java.lang.String isDeleted;
+
+    public java.lang.String getIsDeleted(){
+        return this.isDeleted;
+    }
+    
+    public void setIsDeleted(java.lang.String isDeleted){
+        this.isDeleted = isDeleted;
+    }
+	/** CREATOR
+    *创建人
+    */ 
+    private java.lang.String creator;
+
+    public java.lang.String getCreator(){
+        return this.creator;
+    }
+    
+    public void setCreator(java.lang.String creator){
+        this.creator = creator;
+    }
+	/** CREATED_TIME
+    *创建时间
+    */ 
+    private java.util.Date createdTime;
+
+    public java.util.Date getCreatedTime(){
+        return this.createdTime;
+    }
+    
+    public void setCreatedTime(java.util.Date createdTime){
+        this.createdTime = createdTime;
+    }
+	/** MODIFIER
+    *修改人
+    */ 
+    private java.lang.String modifier;
+
+    public java.lang.String getModifier(){
+        return this.modifier;
+    }
+    
+    public void setModifier(java.lang.String modifier){
+        this.modifier = modifier;
+    }
+	/** MODIFIED_TIME
+    *修改时间
+    */ 
+    private java.util.Date modifiedTime;
+
+    public java.util.Date getModifiedTime(){
+        return this.modifiedTime;
+    }
+    
+    public void setModifiedTime(java.util.Date modifiedTime){
+        this.modifiedTime = modifiedTime;
+    }
+	/** SYS_VERSION
+    *乐观锁,版本号
+    */ 
+    private java.lang.Integer sysVersion;
+
+    public java.lang.Integer getSysVersion(){
+        return this.sysVersion;
+    }
+    
+    public void setSysVersion(java.lang.Integer sysVersion){
+        this.sysVersion = sysVersion;
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/entity/BizMemberPointTransactionHistoryEntity.java

+package cn.com.poc.equity.entity;	
+
+
+public class BizMemberPointTransactionHistoryEntity {
+
+    private static final long serialVersionUID = 1L;
+	/** id
+    *
+    */ 
+    private java.lang.Long id;
+
+    public java.lang.Long getId(){
+        return this.id;
+    }
+    
+    public void setId(java.lang.Long id){
+        this.id = id;
+    }
+	/** transaction_sn
+    *变更流水号
+    */ 
+    private java.lang.String transactionSn;
+
+    public java.lang.String getTransactionSn(){
+        return this.transactionSn;
+    }
+    
+    public void setTransactionSn(java.lang.String transactionSn){
+        this.transactionSn = transactionSn;
+    }
+    /** member_id
+     *目标用户id
+     */
+    private java.lang.Long memberId;
+
+    public java.lang.Long getMemberId(){
+        return this.memberId;
+    }
+
+    public void setMemberId(java.lang.Long memberId){
+        this.memberId = memberId;
+    }
+	/** modify_event
+    *变更事件  expired-过期  top_up-充值 use-使用
+    */ 
+    private java.lang.String modifyEvent;
+
+    public java.lang.String getModifyEvent(){
+        return this.modifyEvent;
+    }
+    
+    public void setModifyEvent(java.lang.String modifyEvent){
+        this.modifyEvent = modifyEvent;
+    }
+	/** modify_event_info
+    *变更事件详情
+    */ 
+    private java.lang.String modifyEventInfo;
+
+    public java.lang.String getModifyEventInfo(){
+        return this.modifyEventInfo;
+    }
+    
+    public void setModifyEventInfo(java.lang.String modifyEventInfo){
+        this.modifyEventInfo = modifyEventInfo;
+    }
+	/** modify_target_id
+    *变更 用户积分表主键id
+    */ 
+    private java.lang.Long modifyTargetId;
+
+    public java.lang.Long getModifyTargetId(){
+        return this.modifyTargetId;
+    }
+    
+    public void setModifyTargetId(java.lang.Long modifyTargetId){
+        this.modifyTargetId = modifyTargetId;
+    }
+	/** point_change_num
+    *变更数
+    */ 
+    private java.lang.Long pointChangeNum;
+
+    public java.lang.Long getPointChangeNum(){
+        return this.pointChangeNum;
+    }
+    
+    public void setPointChangeNum(java.lang.Long pointChangeNum){
+        this.pointChangeNum = pointChangeNum;
+    }
+	/** is_deleted
+    *是否删除 Y 是  N 否
+    */ 
+    private java.lang.String isDeleted;
+
+    public java.lang.String getIsDeleted(){
+        return this.isDeleted;
+    }
+    
+    public void setIsDeleted(java.lang.String isDeleted){
+        this.isDeleted = isDeleted;
+    }
+	/** CREATOR
+    *创建人
+    */ 
+    private java.lang.String creator;
+
+    public java.lang.String getCreator(){
+        return this.creator;
+    }
+    
+    public void setCreator(java.lang.String creator){
+        this.creator = creator;
+    }
+	/** CREATED_TIME
+    *创建时间
+    */ 
+    private java.util.Date createdTime;
+
+    public java.util.Date getCreatedTime(){
+        return this.createdTime;
+    }
+    
+    public void setCreatedTime(java.util.Date createdTime){
+        this.createdTime = createdTime;
+    }
+	/** MODIFIER
+    *修改人
+    */ 
+    private java.lang.String modifier;
+
+    public java.lang.String getModifier(){
+        return this.modifier;
+    }
+    
+    public void setModifier(java.lang.String modifier){
+        this.modifier = modifier;
+    }
+	/** MODIFIED_TIME
+    *修改时间
+    */ 
+    private java.util.Date modifiedTime;
+
+    public java.util.Date getModifiedTime(){
+        return this.modifiedTime;
+    }
+    
+    public void setModifiedTime(java.util.Date modifiedTime){
+        this.modifiedTime = modifiedTime;
+    }
+	/** SYS_VERSION
+    *乐观锁,版本号
+    */ 
+    private java.lang.Integer sysVersion;
+
+    public java.lang.Integer getSysVersion(){
+        return this.sysVersion;
+    }
+    
+    public void setSysVersion(java.lang.Integer sysVersion){
+        this.sysVersion = sysVersion;
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/entity/BizMemberPointsEntity.java

+package cn.com.poc.equity.entity;
+
+
+public class BizMemberPointsEntity {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * id
+     */
+    private java.lang.Long id;
+
+    public java.lang.Long getId() {
+        return this.id;
+    }
+
+    public void setId(java.lang.Long id) {
+        this.id = id;
+    }
+
+    /**
+     * member_id
+     * 用户id
+     */
+    private java.lang.Long memberId;
+
+    public java.lang.Long getMemberId() {
+        return this.memberId;
+    }
+
+    public void setMemberId(java.lang.Long memberId) {
+        this.memberId = memberId;
+    }
+
+    /**
+     * total_points
+     * 总积分
+     */
+    private java.lang.Long totalPoints;
+
+    public java.lang.Long getTotalPoints() {
+        return this.totalPoints;
+    }
+
+    public void setTotalPoints(java.lang.Long totalPoints) {
+        this.totalPoints = totalPoints;
+    }
+
+    /**
+     * usage_points
+     * 剩余可用积分
+     */
+    private java.lang.Long usagePoints;
+
+    public java.lang.Long getUsagePoints() {
+        return this.usagePoints;
+    }
+
+    public void setUsagePoints(java.lang.Long usagePoints) {
+        this.usagePoints = usagePoints;
+    }
+
+    /**
+     * expired_time
+     * 积分过期时间
+     */
+    private java.util.Date expiredTime;
+
+    public java.util.Date getExpiredTime() {
+        return this.expiredTime;
+    }
+
+    public void setExpiredTime(java.util.Date expiredTime) {
+        this.expiredTime = expiredTime;
+    }
+
+    /**
+     * is_deleted
+     * 是否删除 Y 是  N 否
+     */
+    private java.lang.String isDeleted;
+
+    public java.lang.String getIsDeleted() {
+        return this.isDeleted;
+    }
+
+    public void setIsDeleted(java.lang.String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    /**
+     * CREATOR
+     * 创建人
+     */
+    private java.lang.String creator;
+
+    public java.lang.String getCreator() {
+        return this.creator;
+    }
+
+    public void setCreator(java.lang.String creator) {
+        this.creator = creator;
+    }
+
+    /**
+     * CREATED_TIME
+     * 创建时间
+     */
+    private java.util.Date createdTime;
+
+    public java.util.Date getCreatedTime() {
+        return this.createdTime;
+    }
+
+    public void setCreatedTime(java.util.Date createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    /**
+     * MODIFIER
+     * 修改人
+     */
+    private java.lang.String modifier;
+
+    public java.lang.String getModifier() {
+        return this.modifier;
+    }
+
+    public void setModifier(java.lang.String modifier) {
+        this.modifier = modifier;
+    }
+
+    /**
+     * MODIFIED_TIME
+     * 修改时间
+     */
+    private java.util.Date modifiedTime;
+
+    public java.util.Date getModifiedTime() {
+        return this.modifiedTime;
+    }
+
+    public void setModifiedTime(java.util.Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    /**
+     * SYS_VERSION
+     * 乐观锁,版本号
+     */
+    private java.lang.Integer sysVersion;
+
+    public java.lang.Integer getSysVersion() {
+        return this.sysVersion;
+    }
+
+    public void setSysVersion(java.lang.Integer sysVersion) {
+        this.sysVersion = sysVersion;
+    }
+
+
+    /**
+     * 扣减次数
+     */
+    public void decr(long n) {
+        this.usagePoints = this.usagePoints - n;
+    }
+
+    /**
+     * 添加次数
+     *
+     * @param n
+     */
+    public void increase(long n) {
+        this.usagePoints = this.usagePoints + n;
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/entity/BizPaymentPackageConfigurationEntity.java

@@ -232,4 +232,29 @@ public class BizPaymentPackageConfigurationEntity {
     public void setSysVersion(java.lang.Integer sysVersion){
         this.sysVersion = sysVersion;
     }
+
+    @Override
+    public String toString() {
+        return "BizPaymentPackageConfigurationEntity{" +
+                "id=" + id +
+                ", type='" + type + '\'' +
+                ", domain='" + domain + '\'' +
+                ", name='" + name + '\'' +
+                ", expiredNum=" + expiredNum +
+                ", expiredType='" + expiredType + '\'' +
+                ", amount=" + amount +
+                ", resourceCount=" + resourceCount +
+                ", originalPrice=" + originalPrice +
+                ", isShowOriginalPrice='" + isShowOriginalPrice + '\'' +
+                ", sort=" + sort +
+                ", description='" + description + '\'' +
+                ", extraData='" + extraData + '\'' +
+                ", isDeleted='" + isDeleted + '\'' +
+                ", creator='" + creator + '\'' +
+                ", createdTime=" + createdTime +
+                ", modifier='" + modifier + '\'' +
+                ", modifiedTime=" + modifiedTime +
+                ", sysVersion=" + sysVersion +
+                '}';
+    }
 }
\ No newline at end of file

src/main/java/cn/com/poc/equity/model/BizMemberEquityModel.java

+package cn.com.poc.equity.model;	
+
+import java.io.Serializable;
+import cn.com.yict.framemax.data.model.BaseModelClass;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Id;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import javax.persistence.Version;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+
+/**
+ * Model class for biz_member_equity
+ * 用户权益表
+保存用户权益等级，
+1：相同套餐叠加购买情况   积分和套餐有效期进行叠加，权益不叠加
+2： 不同套餐叠加购买情况    积分叠加，权益和时间按照最高级的套餐的权益和有效期
+ */
+@Entity
+@Table(name = "biz_member_equity")
+@DynamicInsert
+@DynamicUpdate
+public class BizMemberEquityModel extends BaseModelClass implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
+  
+    /** id
+    *主键ID
+    */ 
+    private java.lang.Long id;
+    
+    @Column(name = "id",length = 19)
+	@Id @GeneratedValue(strategy = GenerationType.AUTO) 
+    public java.lang.Long getId(){
+        return this.id;
+    }
+    
+    public void setId(java.lang.Long id){
+        this.id = id;
+        super.addValidField("id");
+    }
+    
+  
+    /** member_id
+    *用户ID
+    */ 
+    private java.lang.Long memberId;
+    
+    @Column(name = "member_id",length = 19)
+    public java.lang.Long getMemberId(){
+        return this.memberId;
+    }
+    
+    public void setMemberId(java.lang.Long memberId){
+        this.memberId = memberId;
+        super.addValidField("memberId");
+    }
+    
+  
+    /** equity_level
+    *权益等级 normal-普通版 professional-专业版 ， ultimate-旗舰版
+    */ 
+    private java.lang.String equityLevel;
+    
+    @Column(name = "equity_level",length = 100)
+    public java.lang.String getEquityLevel(){
+        return this.equityLevel;
+    }
+    
+    public void setEquityLevel(java.lang.String equityLevel){
+        this.equityLevel = equityLevel;
+        super.addValidField("equityLevel");
+    }
+    
+  
+    /** expired_date
+    *权益过期时间
+    */ 
+    private java.util.Date expiredDate;
+    
+    @Column(name = "expired_date",length = 19)
+    public java.util.Date getExpiredDate(){
+        return this.expiredDate;
+    }
+    
+    public void setExpiredDate(java.util.Date expiredDate){
+        this.expiredDate = expiredDate;
+        super.addValidField("expiredDate");
+    }
+    
+  
+    /** equity_config
+    *权益配置- 知识库最大创建数   应用最大创建数
+    */ 
+    private java.lang.String equityConfig;
+    
+    @Column(name = "equity_config",length = 1073741824)
+    public java.lang.String getEquityConfig(){
+        return this.equityConfig;
+    }
+    
+    public void setEquityConfig(java.lang.String equityConfig){
+        this.equityConfig = equityConfig;
+        super.addValidField("equityConfig");
+    }
+    
+  
+    /** is_deleted
+    *是否删除 Y 是  N 否
+    */ 
+    private java.lang.String isDeleted;
+    
+    @Column(name = "is_deleted",length = 1)
+    public java.lang.String getIsDeleted(){
+        return this.isDeleted;
+    }
+    
+    public void setIsDeleted(java.lang.String isDeleted){
+        this.isDeleted = isDeleted;
+        super.addValidField("isDeleted");
+    }
+    
+  
+    /** CREATOR
+    *创建人
+    */ 
+    private java.lang.String creator;
+    
+    @Column(name = "CREATOR",length = 11)
+    public java.lang.String getCreator(){
+        return this.creator;
+    }
+    
+    public void setCreator(java.lang.String creator){
+        this.creator = creator;
+        super.addValidField("creator");
+    }
+    
+  
+    /** CREATED_TIME
+    *创建时间
+    */ 
+    private java.util.Date createdTime;
+    
+    @Column(name = "CREATED_TIME",length = 19)
+    public java.util.Date getCreatedTime(){
+        return this.createdTime;
+    }
+    
+    public void setCreatedTime(java.util.Date createdTime){
+        this.createdTime = createdTime;
+        super.addValidField("createdTime");
+    }
+    
+  
+    /** MODIFIER
+    *修改人
+    */ 
+    private java.lang.String modifier;
+    
+    @Column(name = "MODIFIER",length = 11)
+    public java.lang.String getModifier(){
+        return this.modifier;
+    }
+    
+    public void setModifier(java.lang.String modifier){
+        this.modifier = modifier;
+        super.addValidField("modifier");
+    }
+    
+  
+    /** MODIFIED_TIME
+    *修改时间
+    */ 
+    private java.util.Date modifiedTime;
+    
+    @Column(name = "MODIFIED_TIME",length = 19)
+    public java.util.Date getModifiedTime(){
+        return this.modifiedTime;
+    }
+    
+    public void setModifiedTime(java.util.Date modifiedTime){
+        this.modifiedTime = modifiedTime;
+        super.addValidField("modifiedTime");
+    }
+    
+  
+    /** SYS_VERSION
+    *乐观锁,版本号
+    */ 
+    private java.lang.Integer sysVersion;
+    
+    @Column(name = "SYS_VERSION",length = 10)
+	@Version
+    public java.lang.Integer getSysVersion(){
+        return this.sysVersion;
+    }
+    
+    public void setSysVersion(java.lang.Integer sysVersion){
+        this.sysVersion = sysVersion;
+        super.addValidField("sysVersion");
+    }
+    
+
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/model/BizMemberEquityTransactionHistoryModel.java

+package cn.com.poc.equity.model;	
+
+import java.io.Serializable;
+import cn.com.yict.framemax.data.model.BaseModelClass;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Id;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import javax.persistence.Version;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+
+/**
+ * Model class for biz_member_equity_transaction_history
+ * 用户权益变更流水表
+ */
+@Entity
+@Table(name = "biz_member_equity_transaction_history")
+@DynamicInsert
+@DynamicUpdate
+public class BizMemberEquityTransactionHistoryModel extends BaseModelClass implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
+  
+    /** id
+    *主键id
+    */ 
+    private java.lang.Long id;
+    
+    @Column(name = "id",length = 19)
+	@Id @GeneratedValue(strategy = GenerationType.AUTO) 
+    public java.lang.Long getId(){
+        return this.id;
+    }
+    
+    public void setId(java.lang.Long id){
+        this.id = id;
+        super.addValidField("id");
+    }
+    
+  
+    /** transaction_sn
+    *变更流水号
+    */ 
+    private java.lang.String transactionSn;
+    
+    @Column(name = "transaction_sn",length = 100)
+    public java.lang.String getTransactionSn(){
+        return this.transactionSn;
+    }
+    
+    public void setTransactionSn(java.lang.String transactionSn){
+        this.transactionSn = transactionSn;
+        super.addValidField("transactionSn");
+    }
+    
+  
+    /** member_id
+    *目标用户id
+    */ 
+    private java.lang.Long memberId;
+    
+    @Column(name = "member_id",length = 19)
+    public java.lang.Long getMemberId(){
+        return this.memberId;
+    }
+    
+    public void setMemberId(java.lang.Long memberId){
+        this.memberId = memberId;
+        super.addValidField("memberId");
+    }
+    
+  
+    /** original_equity_level
+    *原有权益等级
+    */ 
+    private java.lang.String originalEquityLevel;
+    
+    @Column(name = "original_equity_level",length = 15)
+    public java.lang.String getOriginalEquityLevel(){
+        return this.originalEquityLevel;
+    }
+    
+    public void setOriginalEquityLevel(java.lang.String originalEquityLevel){
+        this.originalEquityLevel = originalEquityLevel;
+        super.addValidField("originalEquityLevel");
+    }
+    
+  
+    /** modify_equity_level
+    *更改后权益等级
+    */ 
+    private java.lang.String modifyEquityLevel;
+    
+    @Column(name = "modify_equity_level",length = 15)
+    public java.lang.String getModifyEquityLevel(){
+        return this.modifyEquityLevel;
+    }
+    
+    public void setModifyEquityLevel(java.lang.String modifyEquityLevel){
+        this.modifyEquityLevel = modifyEquityLevel;
+        super.addValidField("modifyEquityLevel");
+    }
+    
+  
+    /** modify_event
+    *变更事件  expired-过期  top_up-充值
+    */ 
+    private java.lang.String modifyEvent;
+    
+    @Column(name = "modify_event",length = 10)
+    public java.lang.String getModifyEvent(){
+        return this.modifyEvent;
+    }
+    
+    public void setModifyEvent(java.lang.String modifyEvent){
+        this.modifyEvent = modifyEvent;
+        super.addValidField("modifyEvent");
+    }
+    
+  
+    /** modify_event_info
+    *变更事件详情
+    */ 
+    private java.lang.String modifyEventInfo;
+    
+    @Column(name = "modify_event_info",length = 1073741824)
+    public java.lang.String getModifyEventInfo(){
+        return this.modifyEventInfo;
+    }
+    
+    public void setModifyEventInfo(java.lang.String modifyEventInfo){
+        this.modifyEventInfo = modifyEventInfo;
+        super.addValidField("modifyEventInfo");
+    }
+    
+  
+    /** target_equity_id
+    *目标用户权益id
+    */ 
+    private java.lang.Long targetEquityId;
+    
+    @Column(name = "target_equity_id",length = 19)
+    public java.lang.Long getTargetEquityId(){
+        return this.targetEquityId;
+    }
+    
+    public void setTargetEquityId(java.lang.Long targetEquityId){
+        this.targetEquityId = targetEquityId;
+        super.addValidField("targetEquityId");
+    }
+    
+  
+    /** is_deleted
+    *是否删除 Y 是  N 否
+    */ 
+    private java.lang.String isDeleted;
+    
+    @Column(name = "is_deleted",length = 1)
+    public java.lang.String getIsDeleted(){
+        return this.isDeleted;
+    }
+    
+    public void setIsDeleted(java.lang.String isDeleted){
+        this.isDeleted = isDeleted;
+        super.addValidField("isDeleted");
+    }
+    
+  
+    /** CREATOR
+    *创建人
+    */ 
+    private java.lang.String creator;
+    
+    @Column(name = "CREATOR",length = 11)
+    public java.lang.String getCreator(){
+        return this.creator;
+    }
+    
+    public void setCreator(java.lang.String creator){
+        this.creator = creator;
+        super.addValidField("creator");
+    }
+    
+  
+    /** CREATED_TIME
+    *创建时间
+    */ 
+    private java.util.Date createdTime;
+    
+    @Column(name = "CREATED_TIME",length = 19)
+    public java.util.Date getCreatedTime(){
+        return this.createdTime;
+    }
+    
+    public void setCreatedTime(java.util.Date createdTime){
+        this.createdTime = createdTime;
+        super.addValidField("createdTime");
+    }
+    
+  
+    /** MODIFIER
+    *修改人
+    */ 
+    private java.lang.String modifier;
+    
+    @Column(name = "MODIFIER",length = 11)
+    public java.lang.String getModifier(){
+        return this.modifier;
+    }
+    
+    public void setModifier(java.lang.String modifier){
+        this.modifier = modifier;
+        super.addValidField("modifier");
+    }
+    
+  
+    /** MODIFIED_TIME
+    *修改时间
+    */ 
+    private java.util.Date modifiedTime;
+    
+    @Column(name = "MODIFIED_TIME",length = 19)
+    public java.util.Date getModifiedTime(){
+        return this.modifiedTime;
+    }
+    
+    public void setModifiedTime(java.util.Date modifiedTime){
+        this.modifiedTime = modifiedTime;
+        super.addValidField("modifiedTime");
+    }
+    
+  
+    /** SYS_VERSION
+    *乐观锁,版本号
+    */ 
+    private java.lang.Integer sysVersion;
+    
+    @Column(name = "SYS_VERSION",length = 10)
+	@Version
+    public java.lang.Integer getSysVersion(){
+        return this.sysVersion;
+    }
+    
+    public void setSysVersion(java.lang.Integer sysVersion){
+        this.sysVersion = sysVersion;
+        super.addValidField("sysVersion");
+    }
+    
+
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/model/BizMemberPointTransactionHistoryModel.java

+package cn.com.poc.equity.model;	
+
+import java.io.Serializable;
+import cn.com.yict.framemax.data.model.BaseModelClass;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Id;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import javax.persistence.Version;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+
+/**
+ * Model class for biz_member_point_transaction_history
+ * 积分变更流水表
+ */
+@Entity
+@Table(name = "biz_member_point_transaction_history")
+@DynamicInsert
+@DynamicUpdate
+public class BizMemberPointTransactionHistoryModel extends BaseModelClass implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
+  
+    /** id
+    *
+    */ 
+    private java.lang.Long id;
+    
+    @Column(name = "id",length = 19)
+	@Id @GeneratedValue(strategy = GenerationType.AUTO) 
+    public java.lang.Long getId(){
+        return this.id;
+    }
+    
+    public void setId(java.lang.Long id){
+        this.id = id;
+        super.addValidField("id");
+    }
+    
+  
+    /** transaction_sn
+    *变更流水号
+    */ 
+    private java.lang.String transactionSn;
+    
+    @Column(name = "transaction_sn",length = 100)
+    public java.lang.String getTransactionSn(){
+        return this.transactionSn;
+    }
+    
+    public void setTransactionSn(java.lang.String transactionSn){
+        this.transactionSn = transactionSn;
+        super.addValidField("transactionSn");
+    }
+
+    /** member_id
+     *目标用户id
+     */
+    private java.lang.Long memberId;
+
+    @Column(name = "member_id",length = 19)
+    public java.lang.Long getMemberId(){
+        return this.memberId;
+    }
+
+    public void setMemberId(java.lang.Long memberId){
+        this.memberId = memberId;
+        super.addValidField("memberId");
+    }
+  
+    /** modify_event
+    *变更事件  expired-过期  top_up-充值 use-使用
+    */ 
+    private java.lang.String modifyEvent;
+    
+    @Column(name = "modify_event",length = 10)
+    public java.lang.String getModifyEvent(){
+        return this.modifyEvent;
+    }
+    
+    public void setModifyEvent(java.lang.String modifyEvent){
+        this.modifyEvent = modifyEvent;
+        super.addValidField("modifyEvent");
+    }
+    
+  
+    /** modify_event_info
+    *变更事件详情
+    */ 
+    private java.lang.String modifyEventInfo;
+    
+    @Column(name = "modify_event_info",length = 1073741824)
+    public java.lang.String getModifyEventInfo(){
+        return this.modifyEventInfo;
+    }
+    
+    public void setModifyEventInfo(java.lang.String modifyEventInfo){
+        this.modifyEventInfo = modifyEventInfo;
+        super.addValidField("modifyEventInfo");
+    }
+    
+  
+    /** modify_target_id
+    *变更 用户积分表主键id
+    */ 
+    private java.lang.Long modifyTargetId;
+    
+    @Column(name = "modify_target_id",length = 19)
+    public java.lang.Long getModifyTargetId(){
+        return this.modifyTargetId;
+    }
+    
+    public void setModifyTargetId(java.lang.Long modifyTargetId){
+        this.modifyTargetId = modifyTargetId;
+        super.addValidField("modifyTargetId");
+    }
+    
+  
+    /** point_change_num
+    *变更数
+    */ 
+    private java.lang.Long pointChangeNum;
+    
+    @Column(name = "point_change_num",length = 19)
+    public java.lang.Long getPointChangeNum(){
+        return this.pointChangeNum;
+    }
+    
+    public void setPointChangeNum(java.lang.Long pointChangeNum){
+        this.pointChangeNum = pointChangeNum;
+        super.addValidField("pointChangeNum");
+    }
+    
+  
+    /** is_deleted
+    *是否删除 Y 是  N 否
+    */ 
+    private java.lang.String isDeleted;
+    
+    @Column(name = "is_deleted",length = 1)
+    public java.lang.String getIsDeleted(){
+        return this.isDeleted;
+    }
+    
+    public void setIsDeleted(java.lang.String isDeleted){
+        this.isDeleted = isDeleted;
+        super.addValidField("isDeleted");
+    }
+    
+  
+    /** CREATOR
+    *创建人
+    */ 
+    private java.lang.String creator;
+    
+    @Column(name = "CREATOR",length = 11)
+    public java.lang.String getCreator(){
+        return this.creator;
+    }
+    
+    public void setCreator(java.lang.String creator){
+        this.creator = creator;
+        super.addValidField("creator");
+    }
+    
+  
+    /** CREATED_TIME
+    *创建时间
+    */ 
+    private java.util.Date createdTime;
+    
+    @Column(name = "CREATED_TIME",length = 19)
+    public java.util.Date getCreatedTime(){
+        return this.createdTime;
+    }
+    
+    public void setCreatedTime(java.util.Date createdTime){
+        this.createdTime = createdTime;
+        super.addValidField("createdTime");
+    }
+    
+  
+    /** MODIFIER
+    *修改人
+    */ 
+    private java.lang.String modifier;
+    
+    @Column(name = "MODIFIER",length = 11)
+    public java.lang.String getModifier(){
+        return this.modifier;
+    }
+    
+    public void setModifier(java.lang.String modifier){
+        this.modifier = modifier;
+        super.addValidField("modifier");
+    }
+    
+  
+    /** MODIFIED_TIME
+    *修改时间
+    */ 
+    private java.util.Date modifiedTime;
+    
+    @Column(name = "MODIFIED_TIME",length = 19)
+    public java.util.Date getModifiedTime(){
+        return this.modifiedTime;
+    }
+    
+    public void setModifiedTime(java.util.Date modifiedTime){
+        this.modifiedTime = modifiedTime;
+        super.addValidField("modifiedTime");
+    }
+    
+  
+    /** SYS_VERSION
+    *乐观锁,版本号
+    */ 
+    private java.lang.Integer sysVersion;
+    
+    @Column(name = "SYS_VERSION",length = 10)
+	@Version
+    public java.lang.Integer getSysVersion(){
+        return this.sysVersion;
+    }
+    
+    public void setSysVersion(java.lang.Integer sysVersion){
+        this.sysVersion = sysVersion;
+        super.addValidField("sysVersion");
+    }
+    
+
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/model/BizMemberPointsModel.java

+package cn.com.poc.equity.model;	
+
+import java.io.Serializable;
+import cn.com.yict.framemax.data.model.BaseModelClass;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Id;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import javax.persistence.Version;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+
+/**
+ * Model class for biz_member_points
+ * 用户积分表
+ */
+@Entity
+@Table(name = "biz_member_points")
+@DynamicInsert
+@DynamicUpdate
+public class BizMemberPointsModel extends BaseModelClass implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
+  
+    /** id
+    *
+    */ 
+    private java.lang.Long id;
+    
+    @Column(name = "id",length = 19)
+	@Id @GeneratedValue(strategy = GenerationType.AUTO) 
+    public java.lang.Long getId(){
+        return this.id;
+    }
+    
+    public void setId(java.lang.Long id){
+        this.id = id;
+        super.addValidField("id");
+    }
+    
+  
+    /** member_id
+    *用户id
+    */ 
+    private java.lang.Long memberId;
+    
+    @Column(name = "member_id",length = 19)
+    public java.lang.Long getMemberId(){
+        return this.memberId;
+    }
+    
+    public void setMemberId(java.lang.Long memberId){
+        this.memberId = memberId;
+        super.addValidField("memberId");
+    }
+    
+  
+    /** total_points
+    *总积分
+    */ 
+    private java.lang.Long totalPoints;
+    
+    @Column(name = "total_points",length = 19)
+    public java.lang.Long getTotalPoints(){
+        return this.totalPoints;
+    }
+    
+    public void setTotalPoints(java.lang.Long totalPoints){
+        this.totalPoints = totalPoints;
+        super.addValidField("totalPoints");
+    }
+    
+  
+    /** usage_points
+    *剩余可用积分
+    */ 
+    private java.lang.Long usagePoints;
+    
+    @Column(name = "usage_points",length = 19)
+    public java.lang.Long getUsagePoints(){
+        return this.usagePoints;
+    }
+    
+    public void setUsagePoints(java.lang.Long usagePoints){
+        this.usagePoints = usagePoints;
+        super.addValidField("usagePoints");
+    }
+    
+  
+    /** expired_time
+    *积分过期时间
+    */ 
+    private java.util.Date expiredTime;
+    
+    @Column(name = "expired_time",length = 19)
+    public java.util.Date getExpiredTime(){
+        return this.expiredTime;
+    }
+    
+    public void setExpiredTime(java.util.Date expiredTime){
+        this.expiredTime = expiredTime;
+        super.addValidField("expiredTime");
+    }
+    
+  
+    /** is_deleted
+    *是否删除 Y 是  N 否
+    */ 
+    private java.lang.String isDeleted;
+    
+    @Column(name = "is_deleted",length = 1)
+    public java.lang.String getIsDeleted(){
+        return this.isDeleted;
+    }
+    
+    public void setIsDeleted(java.lang.String isDeleted){
+        this.isDeleted = isDeleted;
+        super.addValidField("isDeleted");
+    }
+    
+  
+    /** CREATOR
+    *创建人
+    */ 
+    private java.lang.String creator;
+    
+    @Column(name = "CREATOR",length = 50)
+    public java.lang.String getCreator(){
+        return this.creator;
+    }
+    
+    public void setCreator(java.lang.String creator){
+        this.creator = creator;
+        super.addValidField("creator");
+    }
+    
+  
+    /** CREATED_TIME
+    *创建时间
+    */ 
+    private java.util.Date createdTime;
+    
+    @Column(name = "CREATED_TIME",length = 19)
+    public java.util.Date getCreatedTime(){
+        return this.createdTime;
+    }
+    
+    public void setCreatedTime(java.util.Date createdTime){
+        this.createdTime = createdTime;
+        super.addValidField("createdTime");
+    }
+    
+  
+    /** MODIFIER
+    *修改人
+    */ 
+    private java.lang.String modifier;
+    
+    @Column(name = "MODIFIER",length = 50)
+    public java.lang.String getModifier(){
+        return this.modifier;
+    }
+    
+    public void setModifier(java.lang.String modifier){
+        this.modifier = modifier;
+        super.addValidField("modifier");
+    }
+    
+  
+    /** MODIFIED_TIME
+    *修改时间
+    */ 
+    private java.util.Date modifiedTime;
+    
+    @Column(name = "MODIFIED_TIME",length = 19)
+    public java.util.Date getModifiedTime(){
+        return this.modifiedTime;
+    }
+    
+    public void setModifiedTime(java.util.Date modifiedTime){
+        this.modifiedTime = modifiedTime;
+        super.addValidField("modifiedTime");
+    }
+    
+  
+    /** SYS_VERSION
+    *乐观锁,版本号
+    */ 
+    private java.lang.Integer sysVersion;
+    
+    @Column(name = "SYS_VERSION",length = 10)
+	@Version
+    public java.lang.Integer getSysVersion(){
+        return this.sysVersion;
+    }
+    
+    public void setSysVersion(java.lang.Integer sysVersion){
+        this.sysVersion = sysVersion;
+        super.addValidField("sysVersion");
+    }
+    
+
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/processor/EquityPayPostProcessor.java

+package cn.com.poc.equity.processor;
+
+import cn.com.poc.common.utils.JsonUtils;
+import cn.com.poc.equity.aggregate.MemberEquityService;
+import cn.com.poc.equity.constants.EquityEnum;
+import cn.com.poc.equity.constants.ModifyEventEnum;
+import cn.com.poc.equity.domain.modifyEquityInfo.PayModifyEventInfo;
+import cn.com.poc.equity.entity.BizPaymentPackageConfigurationEntity;
+import cn.com.poc.thirdparty.resource.demand.pay.constants.DgtoolsPayOrderConstants;
+import cn.com.poc.thirdparty.resource.demand.pay.entity.DgtoolsPayOrderEntity;
+import cn.com.poc.thirdparty.resource.demand.pay.processor.AbstractPayPostProcessor;
+import cn.com.poc.thirdparty.resource.demand.pay.service.DgtoolsPayOrderService;
+import cn.com.yict.framemax.core.exception.BusinessException;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * @author alex.yao
+ * @date 2024/12/9
+ */
+@Component
+public class EquityPayPostProcessor implements AbstractPayPostProcessor {
+
+    @Resource
+    private MemberEquityService memberEquityService;
+
+    @Resource
+    private DgtoolsPayOrderService dgtoolsPayOrderService;
+
+    @Override
+    public boolean support(String payOrderType) {
+        return DgtoolsPayOrderConstants.PayOrderType.EQUITY.equals(payOrderType);
+    }
+
+    @Override
+    public boolean postProcessSuccess(String orderSn) {
+        try {
+            PayModifyEventInfo modifyEventInfo = new PayModifyEventInfo();
+            modifyEventInfo.setPayOrderSn(orderSn);
+            DgtoolsPayOrderEntity payOrderEntity = dgtoolsPayOrderService.findPayOrderByPaySn(orderSn);
+            if (payOrderEntity == null) {
+                throw new BusinessException("支付回调,找不到账单信息");
+            }
+            String retainInformation = payOrderEntity.getRetainInformation();
+            Integer memberId = payOrderEntity.getMemberId();
+            BizPaymentPackageConfigurationEntity bizPaymentPackageConfigurationEntity = JsonUtils.deSerialize(retainInformation, BizPaymentPackageConfigurationEntity.class);
+            String type = bizPaymentPackageConfigurationEntity.getType();
+            String domain = bizPaymentPackageConfigurationEntity.getDomain();
+            String expiredType = bizPaymentPackageConfigurationEntity.getExpiredType();
+            if (EquityEnum.DOMAIN.equity.name().equals(domain)) {
+                //更新权益
+                memberEquityService.changeEquityLevel(memberId.longValue(), ModifyEventEnum.top_up, EquityEnum.TYPE.valueOf(type), EquityEnum.VALIDITY_UNIT.valueOf(expiredType), modifyEventInfo);
+            }
+            memberEquityService.addPoint(memberId.longValue(), bizPaymentPackageConfigurationEntity.getResourceCount().longValue(), EquityEnum.VALIDITY_UNIT.valueOf(expiredType), ModifyEventEnum.top_up, modifyEventInfo);
+            return true;
+        } catch (Exception e) {
+            //todo 异常处理
+            return false;
+        }
+    }
+
+    @Override
+    public void postProcessFail(String orderSn) {
+
+    }
+}

src/main/java/cn/com/poc/equity/query/QueryEquityTransactionHistoryQuery.sql

+select distinct
+    id,
+    transaction_sn,
+    member_id,
+    original_equity_level,
+    modify_equity_level,
+    modify_event,
+    modify_event_info,
+    target_equity_id
+from
+    biz_member_equity_transaction_history
+where 
+is_deleted = 'N'
+<< and modify_event_info -> '$.payOrderSn' = :payOrderSn and modify_event_info -> '$.modifyType' = 'pay'>>
+<<and transaction_sn = :transactionSn>>
+<<and member_id = :memberId>>
+<<and modify_event = :modifyEvent>>
+<<and target_equity_id = :equityId>>
\ No newline at end of file

src/main/java/cn/com/poc/equity/query/QueryEquityTransactionHistoryQueryCondition.java

+package cn.com.poc.equity.query;   
+
+import java.io.Serializable;
+
+/**
+ * Query Condition class for QueryEquityTransactionHistoryQuery
+ */
+public class QueryEquityTransactionHistoryQueryCondition implements Serializable{
+    
+    private static final long serialVersionUID = 1L;
+    
+
+    private java.lang.String payOrderSn;
+    
+    public java.lang.String getPayOrderSn(){
+        return this.payOrderSn;
+    }
+    
+    public void setPayOrderSn(java.lang.String payOrderSn){
+        this.payOrderSn = payOrderSn;
+    }
+        
+
+    private java.lang.String transactionSn;
+    
+    public java.lang.String getTransactionSn(){
+        return this.transactionSn;
+    }
+    
+    public void setTransactionSn(java.lang.String transactionSn){
+        this.transactionSn = transactionSn;
+    }
+        
+
+    private java.lang.Long memberId;
+    
+    public java.lang.Long getMemberId(){
+        return this.memberId;
+    }
+    
+    public void setMemberId(java.lang.Long memberId){
+        this.memberId = memberId;
+    }
+        
+
+    private java.lang.String modifyEvent;
+    
+    public java.lang.String getModifyEvent(){
+        return this.modifyEvent;
+    }
+    
+    public void setModifyEvent(java.lang.String modifyEvent){
+        this.modifyEvent = modifyEvent;
+    }
+        
+
+    private java.lang.Long equityId;
+    
+    public java.lang.Long getEquityId(){
+        return this.equityId;
+    }
+    
+    public void setEquityId(java.lang.Long equityId){
+        this.equityId = equityId;
+    }
+        
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/query/QueryEquityTransactionHistoryQueryItem.java

+package cn.com.poc.equity.query;	
+
+import java.io.Serializable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import cn.com.yict.framemax.data.model.BaseItemClass;
+
+/**
+ * Query Item class for QueryEquityTransactionHistoryQuery
+ */
+@Entity
+public class QueryEquityTransactionHistoryQueryItem extends BaseItemClass implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+    
+    /** id
+    *id
+    */ 
+    private java.lang.Long id;
+    
+    @Column(name = "id")
+    public java.lang.Long getId(){
+        return this.id;
+    }
+    
+    public void setId(java.lang.Long id){
+        this.id = id;
+    }
+    
+    /** transaction_sn
+    *transaction_sn
+    */ 
+    private java.lang.String transactionSn;
+    
+    @Column(name = "transaction_sn")
+    public java.lang.String getTransactionSn(){
+        return this.transactionSn;
+    }
+    
+    public void setTransactionSn(java.lang.String transactionSn){
+        this.transactionSn = transactionSn;
+    }
+    
+    /** member_id
+    *member_id
+    */ 
+    private java.lang.Long memberId;
+    
+    @Column(name = "member_id")
+    public java.lang.Long getMemberId(){
+        return this.memberId;
+    }
+    
+    public void setMemberId(java.lang.Long memberId){
+        this.memberId = memberId;
+    }
+    
+    /** original_equity_level
+    *original_equity_level
+    */ 
+    private java.lang.String originalEquityLevel;
+    
+    @Column(name = "original_equity_level")
+    public java.lang.String getOriginalEquityLevel(){
+        return this.originalEquityLevel;
+    }
+    
+    public void setOriginalEquityLevel(java.lang.String originalEquityLevel){
+        this.originalEquityLevel = originalEquityLevel;
+    }
+    
+    /** modify_equity_level
+    *modify_equity_level
+    */ 
+    private java.lang.String modifyEquityLevel;
+    
+    @Column(name = "modify_equity_level")
+    public java.lang.String getModifyEquityLevel(){
+        return this.modifyEquityLevel;
+    }
+    
+    public void setModifyEquityLevel(java.lang.String modifyEquityLevel){
+        this.modifyEquityLevel = modifyEquityLevel;
+    }
+    
+    /** modify_event
+    *modify_event
+    */ 
+    private java.lang.String modifyEvent;
+    
+    @Column(name = "modify_event")
+    public java.lang.String getModifyEvent(){
+        return this.modifyEvent;
+    }
+    
+    public void setModifyEvent(java.lang.String modifyEvent){
+        this.modifyEvent = modifyEvent;
+    }
+    
+    /** modify_event_info
+    *modify_event_info
+    */ 
+    private java.lang.String modifyEventInfo;
+    
+    @Column(name = "modify_event_info")
+    public java.lang.String getModifyEventInfo(){
+        return this.modifyEventInfo;
+    }
+    
+    public void setModifyEventInfo(java.lang.String modifyEventInfo){
+        this.modifyEventInfo = modifyEventInfo;
+    }
+    
+    /** target_equity_id
+    *target_equity_id
+    */ 
+    private java.lang.Long targetEquityId;
+    
+    @Column(name = "target_equity_id")
+    public java.lang.Long getTargetEquityId(){
+        return this.targetEquityId;
+    }
+    
+    public void setTargetEquityId(java.lang.Long targetEquityId){
+        this.targetEquityId = targetEquityId;
+    }
+    
+} 
\ No newline at end of file

src/main/java/cn/com/poc/equity/query/QueryPointTransactionHistoryQuery.sql

+select distinct id,
+                member_id,
+                transaction_sn,
+                modify_event,
+                modify_event_info,
+                modify_target_id,
+                point_change_num,
+                is_deleted
+from biz_member_point_transaction_history
+where is_deleted = 'N'
+<<and modify_event_info -> '$.payOrderSn' = :payOrderSn and modify_event_info -> '$.modifyType' = 'pay'>>
+<<and member_id = :memberId>>
+<<and transaction_sn = :transactionSn>>
+<<and modify_event = :modifyEvent>>
+<<and modify_target_id = :modifyTargetId>>
\ No newline at end of file

src/main/java/cn/com/poc/equity/query/QueryPointTransactionHistoryQueryCondition.java

+package cn.com.poc.equity.query;   
+
+import java.io.Serializable;
+
+/**
+ * Query Condition class for QueryPointTransactionHistoryQuery
+ */
+public class QueryPointTransactionHistoryQueryCondition implements Serializable{
+    
+    private static final long serialVersionUID = 1L;
+    
+
+    private java.lang.String payOrderSn;
+    
+    public java.lang.String getPayOrderSn(){
+        return this.payOrderSn;
+    }
+    
+    public void setPayOrderSn(java.lang.String payOrderSn){
+        this.payOrderSn = payOrderSn;
+    }
+
+
+    private java.lang.Long memberId;
+
+    public java.lang.Long getMemberId(){
+        return this.memberId;
+    }
+
+    public void setMemberId(java.lang.Long memberId){
+        this.memberId = memberId;
+    }
+        
+
+    private java.lang.String transactionSn;
+    
+    public java.lang.String getTransactionSn(){
+        return this.transactionSn;
+    }
+    
+    public void setTransactionSn(java.lang.String transactionSn){
+        this.transactionSn = transactionSn;
+    }
+        
+
+    private java.lang.String modifyEvent;
+    
+    public java.lang.String getModifyEvent(){
+        return this.modifyEvent;
+    }
+    
+    public void setModifyEvent(java.lang.String modifyEvent){
+        this.modifyEvent = modifyEvent;
+    }
+        
+
+    private java.lang.Long modifyTargetId;
+    
+    public java.lang.Long getModifyTargetId(){
+        return this.modifyTargetId;
+    }
+    
+    public void setModifyTargetId(java.lang.Long modifyTargetId){
+        this.modifyTargetId = modifyTargetId;
+    }
+        
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/query/QueryPointTransactionHistoryQueryItem.java

+package cn.com.poc.equity.query;
+
+import java.io.Serializable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+
+import cn.com.yict.framemax.data.model.BaseItemClass;
+
+/**
+ * Query Item class for QueryPointTransactionHistoryQuery
+ */
+@Entity
+public class QueryPointTransactionHistoryQueryItem extends BaseItemClass implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     * id
+     */
+    private java.lang.Long id;
+
+    @Column(name = "id")
+    public java.lang.Long getId() {
+        return this.id;
+    }
+
+    public void setId(java.lang.Long id) {
+        this.id = id;
+    }
+
+    /**
+     * transaction_sn
+     * transaction_sn
+     */
+    private java.lang.String transactionSn;
+
+    @Column(name = "transaction_sn")
+    public java.lang.String getTransactionSn() {
+        return this.transactionSn;
+    }
+
+    public void setTransactionSn(java.lang.String transactionSn) {
+        this.transactionSn = transactionSn;
+    }
+
+    /**
+     * member_id
+     * 目标用户id
+     */
+    private java.lang.Long memberId;
+
+    @Column(name = "member_id")
+    public java.lang.Long getMemberId() {
+        return this.memberId;
+    }
+
+    public void setMemberId(java.lang.Long memberId) {
+        this.memberId = memberId;
+    }
+
+    /**
+     * modify_event
+     * modify_event
+     */
+    private java.lang.String modifyEvent;
+
+    @Column(name = "modify_event")
+    public java.lang.String getModifyEvent() {
+        return this.modifyEvent;
+    }
+
+    public void setModifyEvent(java.lang.String modifyEvent) {
+        this.modifyEvent = modifyEvent;
+    }
+
+    /**
+     * modify_event_info
+     * modify_event_info
+     */
+    private java.lang.String modifyEventInfo;
+
+    @Column(name = "modify_event_info")
+    public java.lang.String getModifyEventInfo() {
+        return this.modifyEventInfo;
+    }
+
+    public void setModifyEventInfo(java.lang.String modifyEventInfo) {
+        this.modifyEventInfo = modifyEventInfo;
+    }
+
+    /**
+     * modify_target_id
+     * modify_target_id
+     */
+    private java.lang.Long modifyTargetId;
+
+    @Column(name = "modify_target_id")
+    public java.lang.Long getModifyTargetId() {
+        return this.modifyTargetId;
+    }
+
+    public void setModifyTargetId(java.lang.Long modifyTargetId) {
+        this.modifyTargetId = modifyTargetId;
+    }
+
+    /**
+     * point_change_num
+     * point_change_num
+     */
+    private java.lang.Long pointChangeNum;
+
+    @Column(name = "point_change_num")
+    public java.lang.Long getPointChangeNum() {
+        return this.pointChangeNum;
+    }
+
+    public void setPointChangeNum(java.lang.Long pointChangeNum) {
+        this.pointChangeNum = pointChangeNum;
+    }
+
+    /**
+     * is_deleted
+     * is_deleted
+     */
+    private java.lang.String isDeleted;
+
+    @Column(name = "is_deleted")
+    public java.lang.String getIsDeleted() {
+        return this.isDeleted;
+    }
+
+    public void setIsDeleted(java.lang.String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+} 
\ No newline at end of file

src/main/java/cn/com/poc/equity/repository/BizMemberEquityRepository.java

+package cn.com.poc.equity.repository;	
+import cn.com.yict.framemax.data.repository.Repository;
+import cn.com.poc.equity.model.BizMemberEquityModel;
+
+public interface BizMemberEquityRepository extends Repository<BizMemberEquityModel,java.lang.Long> {
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/repository/BizMemberEquityTransactionHistoryRepository.java

+package cn.com.poc.equity.repository;	
+import cn.com.yict.framemax.data.repository.Repository;
+import cn.com.poc.equity.model.BizMemberEquityTransactionHistoryModel;
+
+public interface BizMemberEquityTransactionHistoryRepository extends Repository<BizMemberEquityTransactionHistoryModel,java.lang.Long> {
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/repository/BizMemberPointTransactionHistoryRepository.java

+package cn.com.poc.equity.repository;	
+import cn.com.yict.framemax.data.repository.Repository;
+import cn.com.poc.equity.model.BizMemberPointTransactionHistoryModel;
+
+public interface BizMemberPointTransactionHistoryRepository extends Repository<BizMemberPointTransactionHistoryModel,java.lang.Long> {
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/repository/BizMemberPointsRepository.java

+package cn.com.poc.equity.repository;	
+import cn.com.yict.framemax.data.repository.Repository;
+import cn.com.poc.equity.model.BizMemberPointsModel;
+
+public interface BizMemberPointsRepository extends Repository<BizMemberPointsModel,java.lang.Long> {
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/service/BizMemberEquityService.java

+package cn.com.poc.equity.service;
+
+import cn.com.yict.framemax.core.service.BaseService;
+import cn.com.poc.equity.entity.BizMemberEquityEntity;
+import cn.com.yict.framemax.data.model.PagingInfo;
+import java.util.Collection;
+import java.util.List;
+
+public interface BizMemberEquityService extends BaseService {
+
+    BizMemberEquityEntity get(java.lang.Long id) throws Exception;
+
+    BizMemberEquityEntity getByMemberId(java.lang.Long memberId) throws Exception;
+
+    List<BizMemberEquityEntity> findByExample(BizMemberEquityEntity example,PagingInfo pagingInfo) throws Exception;
+    
+    BizMemberEquityEntity save(BizMemberEquityEntity entity) throws Exception;
+
+    BizMemberEquityEntity update(BizMemberEquityEntity entity) throws Exception;
+
+    void deletedById(java.lang.Long id) throws Exception;
+    
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/service/BizMemberEquityTransactionHistoryService.java

+package cn.com.poc.equity.service;
+
+import cn.com.poc.equity.query.QueryEquityTransactionHistoryQueryCondition;
+import cn.com.poc.equity.query.QueryEquityTransactionHistoryQueryItem;
+import cn.com.yict.framemax.core.service.BaseService;
+import cn.com.poc.equity.entity.BizMemberEquityTransactionHistoryEntity;
+import cn.com.yict.framemax.data.model.PagingInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+public interface BizMemberEquityTransactionHistoryService extends BaseService {
+
+    BizMemberEquityTransactionHistoryEntity get(java.lang.Long id) throws Exception;
+
+    List<BizMemberEquityTransactionHistoryEntity> findByExample(BizMemberEquityTransactionHistoryEntity example, PagingInfo pagingInfo) throws Exception;
+
+    BizMemberEquityTransactionHistoryEntity save(BizMemberEquityTransactionHistoryEntity entity) throws Exception;
+
+    BizMemberEquityTransactionHistoryEntity update(BizMemberEquityTransactionHistoryEntity entity) throws Exception;
+
+    void deletedById(java.lang.Long id) throws Exception;
+
+    List<QueryEquityTransactionHistoryQueryItem> queryEquityTransactionHistory(QueryEquityTransactionHistoryQueryCondition condition, PagingInfo pagingInfo) throws Exception;
+
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/service/BizMemberPointTransactionHistoryService.java

+package cn.com.poc.equity.service;
+
+import cn.com.poc.equity.entity.BizMemberPointTransactionHistoryEntity;
+import cn.com.poc.equity.query.QueryPointTransactionHistoryQueryCondition;
+import cn.com.poc.equity.query.QueryPointTransactionHistoryQueryItem;
+import cn.com.yict.framemax.core.service.BaseService;
+import cn.com.yict.framemax.data.model.PagingInfo;
+
+import java.util.List;
+
+public interface BizMemberPointTransactionHistoryService extends BaseService {
+
+    BizMemberPointTransactionHistoryEntity get(java.lang.Long id) throws Exception;
+
+    List<BizMemberPointTransactionHistoryEntity> findByExample(BizMemberPointTransactionHistoryEntity example, PagingInfo pagingInfo) throws Exception;
+
+    BizMemberPointTransactionHistoryEntity save(BizMemberPointTransactionHistoryEntity entity) throws Exception;
+
+    BizMemberPointTransactionHistoryEntity update(BizMemberPointTransactionHistoryEntity entity) throws Exception;
+
+    void deletedById(java.lang.Long id) throws Exception;
+
+    List<QueryPointTransactionHistoryQueryItem> queryPointTransactionHistory(QueryPointTransactionHistoryQueryCondition condition, PagingInfo pagingInfo) throws Exception;
+
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/service/BizMemberPointsService.java

+package cn.com.poc.equity.service;
+
+import cn.com.poc.equity.entity.BizMemberPointsEntity;
+import cn.com.yict.framemax.core.service.BaseService;
+import cn.com.yict.framemax.data.model.PagingInfo;
+
+import java.util.List;
+
+public interface BizMemberPointsService extends BaseService {
+
+    BizMemberPointsEntity get(java.lang.Long id) throws Exception;
+
+    List<BizMemberPointsEntity> findByExample(BizMemberPointsEntity example,PagingInfo pagingInfo) throws Exception;
+    
+    BizMemberPointsEntity save(BizMemberPointsEntity entity) throws Exception;
+
+    BizMemberPointsEntity update(BizMemberPointsEntity entity) throws Exception;
+
+    void deletedById(java.lang.Long id) throws Exception;
+    
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/service/impl/BizMemberEquityServiceImpl.java

+package cn.com.poc.equity.service.impl;
+
+import cn.com.yict.framemax.core.service.impl.BaseServiceImpl;
+import cn.com.poc.equity.service.BizMemberEquityService;
+import cn.com.poc.equity.model.BizMemberEquityModel;
+import cn.com.poc.equity.entity.BizMemberEquityEntity;
+import cn.com.poc.equity.convert.BizMemberEquityConvert;
+import cn.com.poc.equity.repository.BizMemberEquityRepository;
+import cn.com.yict.framemax.data.model.PagingInfo;
+import org.springframework.stereotype.Service;
+
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.stream.Collectors;
+import java.util.List;
+import javax.annotation.Resource;
+
+import org.springframework.util.Assert;
+
+@Service
+public class BizMemberEquityServiceImpl extends BaseServiceImpl
+        implements BizMemberEquityService {
+
+    @Resource
+    private BizMemberEquityRepository repository;
+
+    public BizMemberEquityEntity get(java.lang.Long id) throws Exception {
+        Assert.notNull(id);
+        BizMemberEquityModel model = this.repository.get(id);
+        if (model == null) {
+            return null;
+        }
+        if ("Y".equals(model.getIsDeleted())) {
+            return null;
+        }
+        return BizMemberEquityConvert.modelToEntity(model);
+    }
+
+    @Override
+    public BizMemberEquityEntity getByMemberId(Long memberId) throws Exception {
+        Assert.notNull(memberId);
+        BizMemberEquityModel bizMemberEquityModel = new BizMemberEquityModel();
+        bizMemberEquityModel.setMemberId(memberId);
+        bizMemberEquityModel.setIsDeleted("N");
+        List<BizMemberEquityModel> models = this.repository.findByExample(bizMemberEquityModel, null);
+        if (CollectionUtils.isNotEmpty(models)) {
+            return BizMemberEquityConvert.modelToEntity(models.get(0));
+        }
+        return null;
+    }
+
+    public List<BizMemberEquityEntity> findByExample(BizMemberEquityEntity example, PagingInfo pagingInfo) throws Exception {
+        List<BizMemberEquityEntity> result = new ArrayList<BizMemberEquityEntity>();
+        BizMemberEquityModel model = new BizMemberEquityModel();
+        if (example != null) {
+            model = BizMemberEquityConvert.entityToModel(example);
+        }
+        model.setIsDeleted("N");
+        List<BizMemberEquityModel> models = this.repository.findByExample(model, pagingInfo);
+        if (CollectionUtils.isNotEmpty(models)) {
+            result = models.stream().map(BizMemberEquityConvert::modelToEntity).collect(Collectors.toList());
+        }
+        return result;
+    }
+
+    public BizMemberEquityEntity save(BizMemberEquityEntity entity) throws Exception {
+        Assert.notNull(entity);
+        entity.setId(null);
+        entity.setIsDeleted("N");
+        BizMemberEquityModel model = BizMemberEquityConvert.entityToModel(entity);
+        BizMemberEquityModel saveModel = this.repository.save(model);
+        return BizMemberEquityConvert.modelToEntity(saveModel);
+    }
+
+    public BizMemberEquityEntity update(BizMemberEquityEntity entity) throws Exception {
+        Assert.notNull(entity);
+        Assert.notNull(entity.getId(), "update pk can not be null");
+        BizMemberEquityModel model = this.repository.get(entity.getId());
+
+        if (entity.getMemberId() != null) {
+            model.setMemberId(entity.getMemberId());
+        }
+        if (entity.getEquityLevel() != null) {
+            model.setEquityLevel(entity.getEquityLevel());
+        }
+        if (entity.getExpiredDate() != null) {
+            model.setExpiredDate(entity.getExpiredDate());
+        }
+        if (entity.getEquityConfig() != null) {
+            model.setEquityConfig(entity.getEquityConfig());
+        }
+        if (entity.getIsDeleted() != null) {
+            model.setIsDeleted(entity.getIsDeleted());
+        }
+        if (entity.getCreator() != null) {
+            model.setCreator(entity.getCreator());
+        }
+        if (entity.getCreatedTime() != null) {
+            model.setCreatedTime(entity.getCreatedTime());
+        }
+        if (entity.getModifier() != null) {
+            model.setModifier(entity.getModifier());
+        }
+        if (entity.getModifiedTime() != null) {
+            model.setModifiedTime(entity.getModifiedTime());
+        }
+        if (entity.getSysVersion() != null) {
+            model.setSysVersion(entity.getSysVersion());
+        }
+        BizMemberEquityModel saveModel = this.repository.save(model);
+        return BizMemberEquityConvert.modelToEntity(saveModel);
+    }
+
+    public void deletedById(java.lang.Long id) throws Exception {
+        Assert.notNull(id);
+        BizMemberEquityModel model = this.repository.get(id);
+        if (model != null) {
+            if ("N".equals(model.getIsDeleted())) {
+                model.setIsDeleted("Y");
+                this.repository.save(model);
+            }
+        }
+    }
+
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/service/impl/BizMemberEquityTransactionHistoryServiceImpl.java

+package cn.com.poc.equity.service.impl;
+
+import cn.com.poc.equity.convert.BizMemberEquityTransactionHistoryConvert;
+import cn.com.poc.equity.entity.BizMemberEquityTransactionHistoryEntity;
+import cn.com.poc.equity.model.BizMemberEquityTransactionHistoryModel;
+import cn.com.poc.equity.query.QueryEquityTransactionHistoryQueryCondition;
+import cn.com.poc.equity.query.QueryEquityTransactionHistoryQueryItem;
+import cn.com.poc.equity.repository.BizMemberEquityTransactionHistoryRepository;
+import cn.com.poc.equity.service.BizMemberEquityTransactionHistoryService;
+import cn.com.yict.framemax.core.service.impl.BaseServiceImpl;
+import cn.com.yict.framemax.data.model.PagingInfo;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class BizMemberEquityTransactionHistoryServiceImpl extends BaseServiceImpl
+        implements BizMemberEquityTransactionHistoryService {
+
+    @Resource
+    private BizMemberEquityTransactionHistoryRepository repository;
+
+    public BizMemberEquityTransactionHistoryEntity get(java.lang.Long id) throws Exception {
+        Assert.notNull(id);
+        BizMemberEquityTransactionHistoryModel model = this.repository.get(id);
+        if (model == null) {
+            return null;
+        }
+        if ("Y".equals(model.getIsDeleted())) {
+            return null;
+        }
+        return BizMemberEquityTransactionHistoryConvert.modelToEntity(model);
+    }
+
+
+    public List<BizMemberEquityTransactionHistoryEntity> findByExample(BizMemberEquityTransactionHistoryEntity example, PagingInfo pagingInfo) throws Exception {
+        List<BizMemberEquityTransactionHistoryEntity> result = new ArrayList<BizMemberEquityTransactionHistoryEntity>();
+        BizMemberEquityTransactionHistoryModel model = new BizMemberEquityTransactionHistoryModel();
+        if (example != null) {
+            model = BizMemberEquityTransactionHistoryConvert.entityToModel(example);
+        }
+        model.setIsDeleted("N");
+        List<BizMemberEquityTransactionHistoryModel> models = this.repository.findByExample(model, pagingInfo);
+        if (CollectionUtils.isNotEmpty(models)) {
+            result = models.stream().map(BizMemberEquityTransactionHistoryConvert::modelToEntity).collect(Collectors.toList());
+        }
+        return result;
+    }
+
+    public BizMemberEquityTransactionHistoryEntity save(BizMemberEquityTransactionHistoryEntity entity) throws Exception {
+        Assert.notNull(entity);
+        entity.setId(null);
+        entity.setIsDeleted("N");
+        BizMemberEquityTransactionHistoryModel model = BizMemberEquityTransactionHistoryConvert.entityToModel(entity);
+        BizMemberEquityTransactionHistoryModel saveModel = this.repository.save(model);
+        return BizMemberEquityTransactionHistoryConvert.modelToEntity(saveModel);
+    }
+
+    public BizMemberEquityTransactionHistoryEntity update(BizMemberEquityTransactionHistoryEntity entity) throws Exception {
+        Assert.notNull(entity);
+        Assert.notNull(entity.getId(), "update pk can not be null");
+        BizMemberEquityTransactionHistoryModel model = this.repository.get(entity.getId());
+
+        if (entity.getTransactionSn() != null) {
+            model.setTransactionSn(entity.getTransactionSn());
+        }
+        if (entity.getMemberId() != null) {
+            model.setMemberId(entity.getMemberId());
+        }
+        if (entity.getOriginalEquityLevel() != null) {
+            model.setOriginalEquityLevel(entity.getOriginalEquityLevel());
+        }
+        if (entity.getModifyEquityLevel() != null) {
+            model.setModifyEquityLevel(entity.getModifyEquityLevel());
+        }
+        if (entity.getModifyEvent() != null) {
+            model.setModifyEvent(entity.getModifyEvent());
+        }
+        if (entity.getModifyEventInfo() != null) {
+            model.setModifyEventInfo(entity.getModifyEventInfo());
+        }
+        if (entity.getTargetEquityId() != null) {
+            model.setTargetEquityId(entity.getTargetEquityId());
+        }
+        if (entity.getIsDeleted() != null) {
+            model.setIsDeleted(entity.getIsDeleted());
+        }
+        if (entity.getCreator() != null) {
+            model.setCreator(entity.getCreator());
+        }
+        if (entity.getCreatedTime() != null) {
+            model.setCreatedTime(entity.getCreatedTime());
+        }
+        if (entity.getModifier() != null) {
+            model.setModifier(entity.getModifier());
+        }
+        if (entity.getModifiedTime() != null) {
+            model.setModifiedTime(entity.getModifiedTime());
+        }
+        if (entity.getSysVersion() != null) {
+            model.setSysVersion(entity.getSysVersion());
+        }
+        BizMemberEquityTransactionHistoryModel saveModel = this.repository.save(model);
+        return BizMemberEquityTransactionHistoryConvert.modelToEntity(saveModel);
+    }
+
+    public void deletedById(java.lang.Long id) throws Exception {
+        Assert.notNull(id);
+        BizMemberEquityTransactionHistoryModel model = this.repository.get(id);
+        if (model != null) {
+            if ("N".equals(model.getIsDeleted())) {
+                model.setIsDeleted("Y");
+                this.repository.save(model);
+            }
+        }
+    }
+
+    @Override
+    public List<QueryEquityTransactionHistoryQueryItem> queryEquityTransactionHistory(QueryEquityTransactionHistoryQueryCondition condition, PagingInfo pagingInfo) throws Exception {
+        return this.sqlDao.query(condition, QueryEquityTransactionHistoryQueryItem.class, pagingInfo);
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/service/impl/BizMemberPointTransactionHistoryServiceImpl.java

+package cn.com.poc.equity.service.impl;
+
+import cn.com.poc.equity.query.QueryPointTransactionHistoryQueryCondition;
+import cn.com.poc.equity.query.QueryPointTransactionHistoryQueryItem;
+import cn.com.yict.framemax.core.service.impl.BaseServiceImpl;
+import cn.com.poc.equity.service.BizMemberPointTransactionHistoryService;
+import cn.com.poc.equity.model.BizMemberPointTransactionHistoryModel;
+import cn.com.poc.equity.entity.BizMemberPointTransactionHistoryEntity;
+import cn.com.poc.equity.convert.BizMemberPointTransactionHistoryConvert;
+import cn.com.poc.equity.repository.BizMemberPointTransactionHistoryRepository;
+import cn.com.yict.framemax.data.model.PagingInfo;
+import org.springframework.stereotype.Service;
+
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.stream.Collectors;
+import java.util.List;
+import javax.annotation.Resource;
+
+import org.springframework.util.Assert;
+
+@Service
+public class BizMemberPointTransactionHistoryServiceImpl extends BaseServiceImpl
+        implements BizMemberPointTransactionHistoryService {
+
+    @Resource
+    private BizMemberPointTransactionHistoryRepository repository;
+
+    public BizMemberPointTransactionHistoryEntity get(java.lang.Long id) throws Exception {
+        Assert.notNull(id);
+        BizMemberPointTransactionHistoryModel model = this.repository.get(id);
+        if (model == null) {
+            return null;
+        }
+        if ("Y".equals(model.getIsDeleted())) {
+            return null;
+        }
+        return BizMemberPointTransactionHistoryConvert.modelToEntity(model);
+    }
+
+
+    public List<BizMemberPointTransactionHistoryEntity> findByExample(BizMemberPointTransactionHistoryEntity example, PagingInfo pagingInfo) throws Exception {
+        List<BizMemberPointTransactionHistoryEntity> result = new ArrayList<BizMemberPointTransactionHistoryEntity>();
+        BizMemberPointTransactionHistoryModel model = new BizMemberPointTransactionHistoryModel();
+        if (example != null) {
+            model = BizMemberPointTransactionHistoryConvert.entityToModel(example);
+        }
+        model.setIsDeleted("N");
+        List<BizMemberPointTransactionHistoryModel> models = this.repository.findByExample(model, pagingInfo);
+        if (CollectionUtils.isNotEmpty(models)) {
+            result = models.stream().map(BizMemberPointTransactionHistoryConvert::modelToEntity).collect(Collectors.toList());
+        }
+        return result;
+    }
+
+    public BizMemberPointTransactionHistoryEntity save(BizMemberPointTransactionHistoryEntity entity) throws Exception {
+        Assert.notNull(entity);
+        entity.setId(null);
+        entity.setIsDeleted("N");
+        BizMemberPointTransactionHistoryModel model = BizMemberPointTransactionHistoryConvert.entityToModel(entity);
+        BizMemberPointTransactionHistoryModel saveModel = this.repository.save(model);
+        return BizMemberPointTransactionHistoryConvert.modelToEntity(saveModel);
+    }
+
+    public BizMemberPointTransactionHistoryEntity update(BizMemberPointTransactionHistoryEntity entity) throws Exception {
+        Assert.notNull(entity);
+        Assert.notNull(entity.getId(), "update pk can not be null");
+        BizMemberPointTransactionHistoryModel model = this.repository.get(entity.getId());
+
+        if (entity.getTransactionSn() != null) {
+            model.setTransactionSn(entity.getTransactionSn());
+        }
+        if (entity.getModifyEvent() != null) {
+            model.setModifyEvent(entity.getModifyEvent());
+        }
+        if (entity.getModifyEventInfo() != null) {
+            model.setModifyEventInfo(entity.getModifyEventInfo());
+        }
+        if (entity.getModifyTargetId() != null) {
+            model.setModifyTargetId(entity.getModifyTargetId());
+        }
+        if (entity.getPointChangeNum() != null) {
+            model.setPointChangeNum(entity.getPointChangeNum());
+        }
+        if (entity.getIsDeleted() != null) {
+            model.setIsDeleted(entity.getIsDeleted());
+        }
+        if (entity.getCreator() != null) {
+            model.setCreator(entity.getCreator());
+        }
+        if (entity.getCreatedTime() != null) {
+            model.setCreatedTime(entity.getCreatedTime());
+        }
+        if (entity.getModifier() != null) {
+            model.setModifier(entity.getModifier());
+        }
+        if (entity.getModifiedTime() != null) {
+            model.setModifiedTime(entity.getModifiedTime());
+        }
+        if (entity.getSysVersion() != null) {
+            model.setSysVersion(entity.getSysVersion());
+        }
+        BizMemberPointTransactionHistoryModel saveModel = this.repository.save(model);
+        return BizMemberPointTransactionHistoryConvert.modelToEntity(saveModel);
+    }
+
+    public void deletedById(java.lang.Long id) throws Exception {
+        Assert.notNull(id);
+        BizMemberPointTransactionHistoryModel model = this.repository.get(id);
+        if (model != null) {
+            if ("N".equals(model.getIsDeleted())) {
+                model.setIsDeleted("Y");
+                this.repository.save(model);
+            }
+        }
+    }
+
+
+    @Override
+    public List<QueryPointTransactionHistoryQueryItem> queryPointTransactionHistory(QueryPointTransactionHistoryQueryCondition condition, PagingInfo pagingInfo) throws Exception {
+        return this.sqlDao.query(condition, QueryPointTransactionHistoryQueryItem.class, pagingInfo);
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/equity/service/impl/BizMemberPointsServiceImpl.java

+package cn.com.poc.equity.service.impl;
+
+import cn.com.yict.framemax.core.service.impl.BaseServiceImpl;
+import cn.com.poc.equity.service.BizMemberPointsService;
+import cn.com.poc.equity.model.BizMemberPointsModel;
+import cn.com.poc.equity.entity.BizMemberPointsEntity;
+import cn.com.poc.equity.convert.BizMemberPointsConvert;
+import cn.com.poc.equity.repository.BizMemberPointsRepository;
+import cn.com.yict.framemax.data.model.PagingInfo;
+import org.springframework.stereotype.Service;
+
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.stream.Collectors;
+import java.util.List;
+import javax.annotation.Resource;
+
+import org.springframework.util.Assert;
+
+@Service
+public class BizMemberPointsServiceImpl extends BaseServiceImpl
+        implements BizMemberPointsService {
+
+    @Resource
+    private BizMemberPointsRepository repository;
+
+    public BizMemberPointsEntity get(java.lang.Long id) throws Exception {
+        Assert.notNull(id);
+        BizMemberPointsModel model = this.repository.get(id);
+        if (model == null) {
+            return null;
+        }
+        if ("Y".equals(model.getIsDeleted())) {
+            return null;
+        }
+        return BizMemberPointsConvert.modelToEntity(model);
+    }
+
+
+    public List<BizMemberPointsEntity> findByExample(BizMemberPointsEntity example, PagingInfo pagingInfo) throws Exception {
+        List<BizMemberPointsEntity> result = new ArrayList<BizMemberPointsEntity>();
+        BizMemberPointsModel model = new BizMemberPointsModel();
+        if (example != null) {
+            model = BizMemberPointsConvert.entityToModel(example);
+        }
+        model.setIsDeleted("N");
+        List<BizMemberPointsModel> models = this.repository.findByExample(model, pagingInfo);
+        if (CollectionUtils.isNotEmpty(models)) {
+            result = models.stream().map(BizMemberPointsConvert::modelToEntity).collect(Collectors.toList());
+        }
+        return result;
+    }
+
+    public BizMemberPointsEntity save(BizMemberPointsEntity entity) throws Exception {
+        Assert.notNull(entity);
+        entity.setId(null);
+        entity.setIsDeleted("N");
+        BizMemberPointsModel model = BizMemberPointsConvert.entityToModel(entity);
+        BizMemberPointsModel saveModel = this.repository.save(model);
+        return BizMemberPointsConvert.modelToEntity(saveModel);
+    }
+
+    public BizMemberPointsEntity update(BizMemberPointsEntity entity) throws Exception {
+        Assert.notNull(entity);
+        Assert.notNull(entity.getId(), "update pk can not be null");
+        BizMemberPointsModel model = this.repository.get(entity.getId());
+
+        if (entity.getMemberId() != null) {
+            model.setMemberId(entity.getMemberId());
+        }
+        if (entity.getTotalPoints() != null) {
+            model.setTotalPoints(entity.getTotalPoints());
+        }
+        if (entity.getUsagePoints() != null) {
+            model.setUsagePoints(entity.getUsagePoints());
+        }
+        if (entity.getExpiredTime() != null) {
+            model.setExpiredTime(entity.getExpiredTime());
+        }
+        BizMemberPointsModel saveModel = this.repository.save(model);
+        return BizMemberPointsConvert.modelToEntity(saveModel);
+    }
+
+    public void deletedById(java.lang.Long id) throws Exception {
+        Assert.notNull(id);
+        BizMemberPointsModel model = this.repository.get(id);
+        if (model != null) {
+            if ("N".equals(model.getIsDeleted())) {
+                model.setIsDeleted("Y");
+                this.repository.save(model);
+            }
+        }
+    }
+
+}
\ No newline at end of file

src/main/java/cn/com/poc/thirdparty/resource/demand/pay/processor/PayPostProcessor.java → src/main/java/cn/com/poc/thirdparty/resource/demand/pay/processor/AbstractPayPostProcessor.java

@@ -6,7 +6,9 @@ package cn.com.poc.thirdparty.resource.demand.pay.processor;
  * @author alex.yao
  * @date 2024/12/5
  */
-public interface PayPostProcessor {
+public interface AbstractPayPostProcessor {
+
+   boolean support(String payOrderType);
 
     /**
      * 支付成功后置处理器

src/main/java/cn/com/poc/thirdparty/resource/demand/pay/processor/IPayPostProcessor.java

+package cn.com.poc.thirdparty.resource.demand.pay.processor;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author alex.yao
+ * @date 2024/12/9
+ */
+@Component
+public class IPayPostProcessor {
+
+    @Autowired(required = false)
+    private List<AbstractPayPostProcessor> payPostProcessorList;
+
+    public void postProcess(String payOrderType, String orderSn) {
+        for (AbstractPayPostProcessor payPostProcessor : payPostProcessorList) {
+            if (payPostProcessor.support(payOrderType)) {
+                payPostProcessor.postProcessSuccess(orderSn);
+            }
+        }
+    }
+
+}

src/main/java/cn/com/poc/thirdparty/resource/demand/pay/rest/impl/PayCallBackRestImpl.java

 package cn.com.poc.thirdparty.resource.demand.pay.rest.impl;
 
 
-import cn.com.poc.thirdparty.resource.demand.pay.service.DgtoolsPayLogService;
-import cn.com.poc.thirdparty.resource.demand.pay.service.DgtoolsPayOrderService;
-import cn.com.poc.thirdparty.resource.demand.pay.dto.WxPayCallBackDto;
 import cn.com.poc.thirdparty.resource.demand.pay.dto.payConfig.PayCallBackRequest;
-import cn.com.poc.thirdparty.resource.demand.pay.dto.payConfig.WxPayConfigRequest;
 import cn.com.poc.thirdparty.resource.demand.pay.entity.DgtoolsPayOrderEntity;
+import cn.com.poc.thirdparty.resource.demand.pay.processor.IPayPostProcessor;
 import cn.com.poc.thirdparty.resource.demand.pay.rest.PayCallBackRest;
+import cn.com.poc.thirdparty.resource.demand.pay.service.DgtoolsPayLogService;
+import cn.com.poc.thirdparty.resource.demand.pay.service.DgtoolsPayOrderService;
 import cn.com.yict.framemax.core.exception.BusinessException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 
 /**
  * @author Roger Wu
@@ -24,11 +22,12 @@ public class PayCallBackRestImpl implements PayCallBackRest {
 
     private Logger log = LoggerFactory.getLogger(this.getClass());
 
-
     @Resource
     private DgtoolsPayOrderService dgtoolsPayOrderService;
     @Resource
     private DgtoolsPayLogService dgtoolsPayLogService;
+    @Resource
+    private IPayPostProcessor iPayPostProcessor;
 
 
     @Override
@@ -37,7 +36,6 @@ public class PayCallBackRestImpl implements PayCallBackRest {
         String payLogSn = payRequest.getPayLogSn();
 
         log.info("支付-接受回调消息-回调交易流水号:{}-回调交易记录流水号:{}-", bizUniqueNo, payLogSn);
-        //todo 事务
         DgtoolsPayOrderEntity payOrderEntity = dgtoolsPayOrderService.findPayOrderByPaySn(bizUniqueNo);
         if (payOrderEntity == null) {
             throw new BusinessException("支付回调,找不到账单信息");
@@ -45,9 +43,8 @@ public class PayCallBackRestImpl implements PayCallBackRest {
         dgtoolsPayOrderService.changePayOrder2PaidStatus(bizUniqueNo, payRequest.getAmount());
         //更新支付流水
         dgtoolsPayLogService.changePayLog2PaidStatus(bizUniqueNo, payLogSn);
-        //todo 更新权益
-
+        // 支付後置處理
+        iPayPostProcessor.postProcess(payOrderEntity.getPayOrderType(), payOrderEntity.getPayOrderSn());
         return "success";
     }
-
 }

src/main/java/cn/com/poc/thirdparty/resource/demand/pay/rest/impl/PayRestImpl.java

@@ -34,8 +34,8 @@ public class PayRestImpl implements PayRest {
 
     @Override
     public Object pay(String payChannel, String payOrderSn) throws Exception {
-        Assert.notNull(payChannel, "支付渠道不能为空");
-        Assert.notNull(payOrderSn, "支付订单号不能为空");
+        Assert.notNull(payChannel);
+        Assert.notNull(payOrderSn);
         // 获取当前登录用户
         UserBaseEntity currentUser = BlContext.getCurrentUserNotException();
         if (ObjectUtil.isEmpty(currentUser)) {
@@ -50,7 +50,7 @@ public class PayRestImpl implements PayRest {
         } else if (PayChannel.ALI_NATIVE.name().equals(payChannel)) {
             payResult = payService.aliPayNative(payOrderSn);
         } else {
-            throw new Exception("暂不支持该支付渠道");
+            throw new I18nMessageException("pay/payment.channel.not.currently.supported");
         }
         payResult.setPayOrderSn(payOrderSn);
         return payResult;
@@ -58,14 +58,14 @@ public class PayRestImpl implements PayRest {
 
     @Override
     public PayOrderStatusDto orderStatus(String payOrderSn) throws Exception {
-        Assert.notNull(payOrderSn, "支付订单号不能为空");
+        Assert.notNull(payOrderSn);
         DgtoolsPayOrderEntity payOrderEntity = dgtoolsPayOrderService.findPayOrderByPaySn(payOrderSn);
         if (payOrderEntity == null) {
-            throw new Exception("支付订单不存在");
+            throw new I18nMessageException("pay/payment.order.not.exist");
         }
         UserBaseEntity userBaseEntity = BlContext.getCurrentUserNotException();
         if (userBaseEntity != null && userBaseEntity.getUserId().intValue() != payOrderEntity.getMemberId()) {
-            throw new Exception("您无权查看此订单");
+            throw new I18nMessageException("pay/no.right.view.this.order");
         }
         PayOrderStatusDto payOrderStatusDto = new PayOrderStatusDto();
         payOrderStatusDto.setPayOrderSn(payOrderSn);

src/main/java/cn/com/poc/user/builder/EmailLoginChannel.java

@@ -3,6 +3,7 @@ package cn.com.poc.user.builder;
 import cn.com.poc.common.service.JudgeCodeService;
 import cn.com.poc.common.utils.Assert;
 import cn.com.poc.common.utils.StringUtils;
+import cn.com.poc.equity.aggregate.MemberEquityService;
 import cn.com.poc.user.dto.MemberLoginRequestDto;
 import cn.com.poc.user.entity.MemberInfoEntity;
 import cn.com.poc.user.query.CheckMemberInfoQueryCondition;
@@ -26,6 +27,9 @@ public class EmailLoginChannel implements LoginChannelService {
     @Resource
     private FmxParamConfigService fmxParamConfigService;
 
+    @Resource
+    private MemberEquityService memberEquityService;
+
     @Override
     public BaseModel doLogin(MemberLoginRequestDto memberLoginRequest) throws Exception {
         Assert.notBlank(memberLoginRequest.getAccount());
@@ -63,6 +67,12 @@ public class EmailLoginChannel implements LoginChannelService {
             memberInfoEntity.setAvatarUrl(param);
         }
         result = bizMemberInfoService.createMemberInfo(memberInfoEntity);
+        try {
+            memberEquityService.initMemberEquity(result.getMemberId().longValue());
+        } catch (Exception e) {
+            //todo 发放权益失败
+            throw new I18nMessageException("exception/system.error");
+        }
         return result;
     }
 }

src/main/java/cn/com/poc/user/builder/SmsLoginChannel.java

@@ -3,6 +3,7 @@ package cn.com.poc.user.builder;
 import cn.com.poc.common.service.JudgeCodeService;
 import cn.com.poc.common.utils.Assert;
 import cn.com.poc.common.utils.StringUtils;
+import cn.com.poc.equity.aggregate.MemberEquityService;
 import cn.com.poc.user.dto.MemberLoginRequestDto;
 import cn.com.poc.user.entity.MemberInfoEntity;
 import cn.com.poc.user.query.CheckMemberInfoQueryCondition;
@@ -31,7 +32,8 @@ public class SmsLoginChannel implements LoginChannelService {
     private JudgeCodeService judgeCodeService;
     @Resource
     private FmxParamConfigService fmxParamConfigService;
-
+    @Resource
+    private MemberEquityService memberEquityService;
 
     @Override
     public MemberInfoEntity doLogin(MemberLoginRequestDto memberLoginRequest) throws Exception {
@@ -71,6 +73,12 @@ public class SmsLoginChannel implements LoginChannelService {
         }
         memberInfoEntity.setMobilePhone(memberLoginRequest.getAccount());
         result = bizMemberInfoService.createMemberInfo(memberInfoEntity);
+        try {
+            memberEquityService.initMemberEquity(result.getMemberId().longValue());
+        } catch (Exception e) {
+            //todo 发放权益失败
+            throw new I18nMessageException("exception/system.error");
+        }
         return result;
     }
 

src/main/resources/framemax-config/i18n/en/equity.properties

+equity.is.not.exist=The equity package configuration does not exist
+payment.order.is.issued=The order has been issued
+not.enough.points=Not enough points
+transaction.history.not.exist=The slip does not exist
+event.not.support=Current event is not supported
+equity.level.not.exist=Equity level does not exist
\ No newline at end of file

src/main/resources/framemax-config/i18n/en/pay.properties

+payment.order.not.exist=The payment order does not exist
+no.right.view.this.order=No right to view this order
+payment.channel.not.currently.supported=This payment channel is not currently supported
\ No newline at end of file

src/main/resources/framemax-config/i18n/zh_cn/equity.properties

+equity.is.not.exist=\u6743\u76CA\u5305\u914D\u7F6E\u4E0D\u5B58\u5728
+payment.order.is.issued=\u8BE5\u8BA2\u5355\u5DF2\u53D1\u653E
+not.enough.points=\u79EF\u5206\u4E0D\u8DB3
+transaction.history.not.exist=\u6D41\u6C34\u4E0D\u5B58\u5728
+event.not.support=\u4E0D\u652F\u6301\u5F53\u524D\u4E8B\u4EF6
+equity.level.not.exist=\u6743\u76CA\u7B49\u7EA7\u4E0D\u5B58\u5728
\ No newline at end of file

src/main/resources/framemax-config/i18n/zh_cn/pay.properties

+payment.order.not.exist=\u652F\u4ED8\u8BA2\u5355\u4E0D\u5B58\u5728
+no.right.view.this.order=\u65E0\u6743\u67E5\u770B\u6B64\u8BA2\u5355
+payment.channel.not.currently.supported=\u6682\u4E0D\u652F\u6301\u8BE5\u652F\u4ED8\u6E20\u9053
\ No newline at end of file

src/main/resources/framemax-config/i18n/zh_tw/equity.properties

+equity.is.not.exist=\u6B0A\u76CA\u5305\u914D\u7F6E\u4E0D\u5B58\u5728
+payment.order.is.issued=\u8A02\u55AE\u6B0A\u76CA\u5DF2\u767C\u653E
+not.enough.points=\u7A4D\u5206\u4E0D\u8DB3
+transaction.history.not.exist=\u6D41\u6C34\u55AE\u4E0D\u5B58\u5728
+event.not.support=\u4E0D\u652F\u6301\u7576\u524D\u4E8B\u4EF6
+equity.level.not.exist=\u6B0A\u76CA\u7B49\u7D1A\u4E0D\u5B58\u5728
\ No newline at end of file

src/main/resources/framemax-config/i18n/zh_tw/pay.properties

+payment.order.not.exist=\u652F\u4ED8\u8A02\u55AE\u4E0D\u5B58\u5728
+no.right.view.this.order=\u7121\u6B0A\u67E5\u770B\u8A72\u8A02\u55AE
+payment.channel.not.currently.supported=\u66AB\u4E0D\u652F\u6301\u8A72\u652F\u4ED8\u6E20\u9053
\ No newline at end of file

src/test/java/cn/com/poc/equity/aggregate/MemberEquityServiceTest.java

+package cn.com.poc.equity.aggregate;
+
+import cn.com.poc.equity.constants.EquityEnum;
+import cn.com.poc.equity.constants.ModifyEventEnum;
+import cn.com.poc.equity.domain.modifyEquityInfo.AgentUseModifyEventInfo;
+import cn.com.poc.equity.domain.modifyEquityInfo.PayModifyEventInfo;
+import cn.com.poc.equity.service.BizPaymentPackageConfigurationService;
+import cn.com.yict.framemax.core.spring.SingleContextInitializer;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.MockitoAnnotations;
+import org.springframework.test.annotation.Rollback;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * @author alex.yao
+ * @date 2024/12/6
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(initializers = SingleContextInitializer.class)
+@WebAppConfiguration
+public class MemberEquityServiceTest {
+
+    @Resource
+    @InjectMocks
+    private MemberEquityService memberEquityService;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    @Rollback
+    @Transactional
+    public void testInitMemberEquity() throws Exception {
+        memberEquityService.initMemberEquity(197L);
+    }
+
+    @Test
+    public void testAddPoint() throws Exception {
+        PayModifyEventInfo modifyEventInfo = new PayModifyEventInfo();
+        modifyEventInfo.setPayOrderSn("PS1733390269000933");
+        memberEquityService.addPoint(197L, 1000L, EquityEnum.VALIDITY_UNIT.year, ModifyEventEnum.top_up, modifyEventInfo);
+    }
+
+    @Test
+    public void testReducePoint() throws Exception {
+        AgentUseModifyEventInfo modifyEventInfo = new AgentUseModifyEventInfo();
+        modifyEventInfo.setAgentId("fd193bb67d5c42abbbef165a913d47f6");
+        memberEquityService.reducePoint(197L, 1L, ModifyEventEnum.use, modifyEventInfo);
+    }
+
+    @Test
+    public void rollbackPoint() throws Exception {
+        memberEquityService.rollbackPoint("PO1733480173765652");
+    }
+
+    @Test
+    public void changeEquityLevel() throws Exception {
+        PayModifyEventInfo modifyEventInfo = new PayModifyEventInfo();
+        modifyEventInfo.setPayOrderSn("PS1733382251673130");
+        memberEquityService.changeEquityLevel(197L, ModifyEventEnum.top_up, EquityEnum.TYPE.professional,
+                EquityEnum.VALIDITY_UNIT.year, modifyEventInfo);
+        memberEquityService.addPoint(197L, 1500L, EquityEnum.VALIDITY_UNIT.year, ModifyEventEnum.top_up, modifyEventInfo);
+    }
+}