quyixiao/eb-service-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2025-10-25 17:20:53 +08:00
parent 5a23850204
commit ee04ea470f
21 changed files with 766 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvActivityDao.java
View File

@ -7,10 +7,19 @@ package com.heyu.api.data.dao.vv;
* @author quyixiao
* @since 2025-10-25
*/
import com.heyu.api.data.entity.vv.VvActivityEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.heyu.api.data.entity.vv.VvActivityEntity;
import com.lz.mybatis.plugin.annotations.Column;
import com.lz.mybatis.plugin.annotations.IF;
import com.lz.mybatis.plugin.annotations.LIKE;
import com.lz.mybatis.plugin.annotations.OrderBy;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface VvActivityDao extends BaseMapper<VvActivityEntity> {
@ -30,7 +39,17 @@ public interface VvActivityDao extends BaseMapper<VvActivityEntity> {
int updateCoverVvActivityById(VvActivityEntity vvActivity);
int deleteVvActivityById(@Param("id")Long id);
int deleteVvActivityById(@Param("id") Long id);
@OrderBy(VvActivityEntity.id_)
List<VvActivityEntity> selectByCondition(IPage page,
@IF @LIKE String activityName,
@IF @Column(VvActivityEntity.create_timestamp) Long minCreateTimestamp,
@IF @Column(VvActivityEntity.create_timestamp) Long maxCreateTimestamp,
@OrderBy @IF @Column(VvActivityEntity.create_timestamp) String createTimestampSort);
}

10
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvBuyerDao.java
View File

@ -61,5 +61,13 @@ public interface VvBuyerDao extends BaseMapper<VvBuyerEntity> {
@LIMIT
VvBuyerEntity selectVvBuyerInfo(String buyerName,@OR String buyerWeixin,@OR String buyerPhone);
VvBuyerEntity selectVvBuyerInfo(String buyerName, @OR String buyerWeixin, @OR String buyerPhone);
int updateVvBuyerApplyAmountDrawCashAmountById(@Plus BigDecimal promoterDrawCashSuccessAmount,
@Sub BigDecimal promoterApplyDrawCashAmount,
Long id);
int updateVvBuyerDrawFailedById(@Plus BigDecimal promoterDrawCashFailedCount,
@Sub BigDecimal promoterApplyDrawCashAmount, Long id);
}

21
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvDrawCashRecordDao.java
View File

@ -7,10 +7,19 @@ package com.heyu.api.data.dao.vv;
* @author quyixiao
* @since 2025-10-25
*/
import com.heyu.api.data.entity.vv.VvDrawCashRecordEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.heyu.api.data.entity.vv.VvActivityEntity;
import com.heyu.api.data.entity.vv.VvDrawCashRecordEntity;
import com.lz.mybatis.plugin.annotations.Column;
import com.lz.mybatis.plugin.annotations.IF;
import com.lz.mybatis.plugin.annotations.OrderBy;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface VvDrawCashRecordDao extends BaseMapper<VvDrawCashRecordEntity> {
@ -33,4 +42,14 @@ public interface VvDrawCashRecordDao extends BaseMapper<VvDrawCashRecordEntity>
int deleteVvDrawCashRecordById(@Param("id")Long id);
@OrderBy(VvDrawCashRecordEntity.id_)
List<VvDrawCashRecordEntity> selectByCondition(IPage page,
@IF Long buyerId,
@IF String buyerName,
@IF String buyerPhone,
@IF String buyerWeixin,
@IF String status,
@IF @Column(VvActivityEntity.create_timestamp) Long minCreateTimestamp,
@IF @Column(VvActivityEntity.create_timestamp) Long maxCreateTimestamp,
@OrderBy @IF @Column(VvActivityEntity.create_timestamp) String createTimestampSort);
}

22
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterAwardLineDao.java
View File

@ -7,10 +7,19 @@ package com.heyu.api.data.dao.vv;
* @author quyixiao
* @since 2025-10-25
*/
import com.heyu.api.data.entity.vv.VvPromoterAwardLineEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.heyu.api.data.entity.vv.VvPromoterAwardLineEntity;
import com.lz.mybatis.plugin.annotations.Column;
import com.lz.mybatis.plugin.annotations.IF;
import com.lz.mybatis.plugin.annotations.LIKE;
import com.lz.mybatis.plugin.annotations.OrderBy;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface VvPromoterAwardLineDao extends BaseMapper<VvPromoterAwardLineEntity> {
@ -33,4 +42,15 @@ public interface VvPromoterAwardLineDao extends BaseMapper<VvPromoterAwardLineEn
int deleteVvPromoterAwardLineById(@Param("id")Long id);
@OrderBy(VvPromoterAwardLineEntity.id_)
List<VvPromoterAwardLineEntity> selectByCondition(IPage page,
@IF String promoterId,
@IF Long promoterBuyerId,
@IF @LIKE String promoterBuyerName,
@IF @LIKE String promoterBuyerWeixin,
@IF @LIKE String promoterBuyerPhone,
@IF @Column(VvPromoterAwardLineEntity.create_timestamp) Long minCreateTimestamp,
@IF @Column(VvPromoterAwardLineEntity.create_timestamp) Long maxCreateTimestamp,
@OrderBy @IF @Column(VvPromoterAwardLineEntity.create_timestamp) String createTimestampSort);
}

3
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterDao.java
View File

@ -52,4 +52,7 @@ public interface VvPromoterDao extends BaseMapper<VvPromoterEntity> {
@IF @Column(VvPromoterEntity.create_timestamp) Long minCreateTimestamp,
@IF @Column(VvPromoterEntity.create_timestamp) Long maxCreateTimestamp,
@OrderBy @IF @Column(VvPromoterEntity.create_timestamp) String createTimestampSort);
}

19
api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvActivityEntity.java
View File

@ -28,6 +28,7 @@ private static final long serialVersionUID = 1L;
public final static String activity_name = CLASS_NAME + "activity_name"; // 活动名称
public final static String activity_award_count = CLASS_NAME + "activity_award_count"; // 活动奖励数次
public final static String award_amount = CLASS_NAME + "award_amount"; // 奖励金额
public final static String create_timestamp = CLASS_NAME + "create_timestamp"; // 创建时间戳
//
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@ -43,6 +44,8 @@ private static final long serialVersionUID = 1L;
private Integer activityAwardCount;
//奖励金额
private BigDecimal awardAmount;
//创建时间戳
private Long createTimestamp;
/**
*
* @return
@ -148,6 +151,21 @@ private static final long serialVersionUID = 1L;
this.awardAmount = awardAmount;
}
/**
* 创建时间戳
* @return
*/
public Long getCreateTimestamp() {
return createTimestamp;
}
/**
* 创建时间戳
* @param createTimestamp
*/
public void setCreateTimestamp(Long createTimestamp) {
this.createTimestamp = createTimestamp;
}
@Override
public String toString() {
return "VvActivityEntity{" +
@ -158,6 +176,7 @@ private static final long serialVersionUID = 1L;
",activityName=" + activityName +
",activityAwardCount=" + activityAwardCount +
",awardAmount=" + awardAmount +
",createTimestamp=" + createTimestamp +
"}";
}
}

169
api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvBuyerEntity.java
View File

@ -21,26 +21,31 @@ private static final long serialVersionUID = 1L;
public final static String CLASS_NAME ="com.heyu.api.data.entity.vv.VvBuyerEntity:";
public final static String all = CLASS_NAME + "*";
public final static String id_ = CLASS_NAME + "id"; //
public final static String is_delete = CLASS_NAME + "is_delete"; // 是否删除：0 否 1 删除
public final static String create_time = CLASS_NAME + "create_time"; // 创建时间
public final static String modify_time = CLASS_NAME + "modify_time"; // 修改时间
public final static String buyer_name = CLASS_NAME + "buyer_name"; // 买家名称
public final static String buyer_weixin = CLASS_NAME + "buyer_weixin"; // 买家微信
public final static String buyer_phone = CLASS_NAME + "buyer_phone"; // 买家手机号
public final static String create_timestamp = CLASS_NAME + "create_timestamp"; // 买家创建时间
public final static String modify_timestamp = CLASS_NAME + "modify_timestamp"; // 买家修改时间
public final static String is_test = CLASS_NAME + "is_test"; // 是否是测试账号
public final static String promoter_id = CLASS_NAME + "promoter_id"; // 推荐者id
public final static String scan_code = CLASS_NAME + "scan_code"; // 是否是扫码关注的用户
public final static String scan_code_award_count = CLASS_NAME + "scan_code_award_count"; // 是否已经领取，是否已经领取新人福利，1 已领取，0 未领取
public final static String promoter_sum_amount = CLASS_NAME + "promoter_sum_amount"; // 总金额
public final static String promoter_draw_cash_amount = CLASS_NAME + "promoter_draw_cash_amount"; // 提现金额
public final static String promoter_account_mount = CLASS_NAME + "promoter_account_mount"; // 账户余额
public final static String promoter_not_arrive_account = CLASS_NAME + "promoter_not_arrive_account"; // 未到账金额
public final static String promoter_canceled_account = CLASS_NAME + "promoter_canceled_account"; // 取消金额
public final static String promoter_buyer_count = CLASS_NAME + "promoter_buyer_count"; // 推荐的买家数量
public final static String avatar_ = CLASS_NAME + "avatar"; // 微信头像
public final static String id_ = CLASS_NAME + "id"; //
public final static String is_delete = CLASS_NAME + "is_delete"; // 是否删除：0 否 1 删除
public final static String create_time = CLASS_NAME + "create_time"; // 创建时间
public final static String modify_time = CLASS_NAME + "modify_time"; // 修改时间
public final static String buyer_name = CLASS_NAME + "buyer_name"; // 买家名称
public final static String buyer_weixin = CLASS_NAME + "buyer_weixin"; // 买家微信
public final static String buyer_phone = CLASS_NAME + "buyer_phone"; // 买家手机号
public final static String create_timestamp = CLASS_NAME + "create_timestamp"; // 买家创建时间
public final static String modify_timestamp = CLASS_NAME + "modify_timestamp"; // 买家修改时间
public final static String is_test = CLASS_NAME + "is_test"; // 是否是测试账号
public final static String promoter_id = CLASS_NAME + "promoter_id"; // 推荐者id
public final static String scan_code = CLASS_NAME + "scan_code"; // 是否是扫码关注的用户
public final static String scan_code_award_count = CLASS_NAME + "scan_code_award_count"; // 是否已经领取，是否已经领取新人福利，1 已领取，0 未领取
public final static String promoter_sum_amount = CLASS_NAME + "promoter_sum_amount"; // 总金额
public final static String promoter_draw_cash_success_amount = CLASS_NAME + "promoter_draw_cash_success_amount"; // 提现金额
public final static String promoter_arrive_account_mount = CLASS_NAME + "promoter_arrive_account_mount"; // 到账户余额
public final static String promoter_canceled_amount = CLASS_NAME + "promoter_canceled_amount"; // 取消金额
public final static String promoter_not_arrive_account = CLASS_NAME + "promoter_not_arrive_account"; // 未到账金额
public final static String promoter_canceled_account = CLASS_NAME + "promoter_canceled_account"; // 取消金额
public final static String promoter_buyer_count = CLASS_NAME + "promoter_buyer_count"; // 推荐的买家数量
public final static String promoter_draw_cash_success_count = CLASS_NAME + "promoter_draw_cash_success_count"; // 提现成功次数
public final static String promoter_draw_cash_failed_count = CLASS_NAME + "promoter_draw_cash_failed_count"; // 提现失败次数
public final static String promoter_draw_cash_failed_amount = CLASS_NAME + "promoter_draw_cash_failed_amount"; // 提现失败金额
public final static String promoter_apply_draw_cash_amount = CLASS_NAME + "promoter_apply_draw_cash_amount"; // 申请提现金额
public final static String avatar_ = CLASS_NAME + "avatar"; // 微信头像
//
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@ -71,15 +76,25 @@ private static final long serialVersionUID = 1L;
//总金额
private BigDecimal promoterSumAmount;
//提现金额
private BigDecimal promoterDrawCashAmount;
//账户余额
private BigDecimal promoterAccountMount;
private BigDecimal promoterDrawCashSuccessAmount;
//到账户余额
private BigDecimal promoterArriveAccountMount;
//取消金额
private BigDecimal promoterCanceledAmount;
//未到账金额
private BigDecimal promoterNotArriveAccount;
//取消金额
private BigDecimal promoterCanceledAccount;
//推荐的买家数量
private Integer promoterBuyerCount;
//提现成功次数
private Integer promoterDrawCashSuccessCount;
//提现失败次数
private Integer promoterDrawCashFailedCount;
//提现失败金额
private BigDecimal promoterDrawCashFailedAmount;
//申请提现金额
private String promoterApplyDrawCashAmount;
//微信头像
private String avatar;
/**
@ -296,30 +311,45 @@ private static final long serialVersionUID = 1L;
* 提现金额
* @return
*/
public BigDecimal getPromoterDrawCashAmount() {
return promoterDrawCashAmount;
public BigDecimal getPromoterDrawCashSuccessAmount() {
return promoterDrawCashSuccessAmount;
}
/**
* 提现金额
* @param promoterDrawCashAmount
* @param promoterDrawCashSuccessAmount
*/
public void setPromoterDrawCashAmount(BigDecimal promoterDrawCashAmount) {
this.promoterDrawCashAmount = promoterDrawCashAmount;
public void setPromoterDrawCashSuccessAmount(BigDecimal promoterDrawCashSuccessAmount) {
this.promoterDrawCashSuccessAmount = promoterDrawCashSuccessAmount;
}
/**
* 账户余额
* 到账户余额
* @return
*/
public BigDecimal getPromoterAccountMount() {
return promoterAccountMount;
public BigDecimal getPromoterArriveAccountMount() {
return promoterArriveAccountMount;
}
/**
* 账户余额
* @param promoterAccountMount
* 到账户余额
* @param promoterArriveAccountMount
*/
public void setPromoterAccountMount(BigDecimal promoterAccountMount) {
this.promoterAccountMount = promoterAccountMount;
public void setPromoterArriveAccountMount(BigDecimal promoterArriveAccountMount) {
this.promoterArriveAccountMount = promoterArriveAccountMount;
}
/**
* 取消金额
* @return
*/
public BigDecimal getPromoterCanceledAmount() {
return promoterCanceledAmount;
}
/**
* 取消金额
* @param promoterCanceledAmount
*/
public void setPromoterCanceledAmount(BigDecimal promoterCanceledAmount) {
this.promoterCanceledAmount = promoterCanceledAmount;
}
/**
@ -367,6 +397,66 @@ private static final long serialVersionUID = 1L;
this.promoterBuyerCount = promoterBuyerCount;
}
/**
* 提现成功次数
* @return
*/
public Integer getPromoterDrawCashSuccessCount() {
return promoterDrawCashSuccessCount;
}
/**
* 提现成功次数
* @param promoterDrawCashSuccessCount
*/
public void setPromoterDrawCashSuccessCount(Integer promoterDrawCashSuccessCount) {
this.promoterDrawCashSuccessCount = promoterDrawCashSuccessCount;
}
/**
* 提现失败次数
* @return
*/
public Integer getPromoterDrawCashFailedCount() {
return promoterDrawCashFailedCount;
}
/**
* 提现失败次数
* @param promoterDrawCashFailedCount
*/
public void setPromoterDrawCashFailedCount(Integer promoterDrawCashFailedCount) {
this.promoterDrawCashFailedCount = promoterDrawCashFailedCount;
}
/**
* 提现失败金额
* @return
*/
public BigDecimal getPromoterDrawCashFailedAmount() {
return promoterDrawCashFailedAmount;
}
/**
* 提现失败金额
* @param promoterDrawCashFailedAmount
*/
public void setPromoterDrawCashFailedAmount(BigDecimal promoterDrawCashFailedAmount) {
this.promoterDrawCashFailedAmount = promoterDrawCashFailedAmount;
}
/**
* 申请提现金额
* @return
*/
public String getPromoterApplyDrawCashAmount() {
return promoterApplyDrawCashAmount;
}
/**
* 申请提现金额
* @param promoterApplyDrawCashAmount
*/
public void setPromoterApplyDrawCashAmount(String promoterApplyDrawCashAmount) {
this.promoterApplyDrawCashAmount = promoterApplyDrawCashAmount;
}
/**
* 微信头像
* @return
@ -399,11 +489,16 @@ private static final long serialVersionUID = 1L;
",scanCode=" + scanCode +
",scanCodeAwardCount=" + scanCodeAwardCount +
",promoterSumAmount=" + promoterSumAmount +
",promoterDrawCashAmount=" + promoterDrawCashAmount +
",promoterAccountMount=" + promoterAccountMount +
",promoterDrawCashSuccessAmount=" + promoterDrawCashSuccessAmount +
",promoterArriveAccountMount=" + promoterArriveAccountMount +
",promoterCanceledAmount=" + promoterCanceledAmount +
",promoterNotArriveAccount=" + promoterNotArriveAccount +
",promoterCanceledAccount=" + promoterCanceledAccount +
",promoterBuyerCount=" + promoterBuyerCount +
",promoterDrawCashSuccessCount=" + promoterDrawCashSuccessCount +
",promoterDrawCashFailedCount=" + promoterDrawCashFailedCount +
",promoterDrawCashFailedAmount=" + promoterDrawCashFailedAmount +
",promoterApplyDrawCashAmount=" + promoterApplyDrawCashAmount +
",avatar=" + avatar +
"}";
}

163
api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvDrawCashRecordEntity.java
View File

@ -21,11 +21,18 @@ private static final long serialVersionUID = 1L;
public final static String CLASS_NAME ="com.heyu.api.data.entity.vv.VvDrawCashRecordEntity:";
public final static String all = CLASS_NAME + "*";
public final static String id_ = CLASS_NAME + "id"; //
public final static String is_delete = CLASS_NAME + "is_delete"; // 是否删除：0 否 1 删除
public final static String create_time = CLASS_NAME + "create_time"; // 创建时间
public final static String modify_time = CLASS_NAME + "modify_time"; // 修改时间
public final static String promoter_id = CLASS_NAME + "promoter_id"; // 推广者id，唯一值
public final static String id_ = CLASS_NAME + "id"; //
public final static String is_delete = CLASS_NAME + "is_delete"; // 是否删除：0 否 1 删除
public final static String create_time = CLASS_NAME + "create_time"; // 创建时间
public final static String modify_time = CLASS_NAME + "modify_time"; // 修改时间
public final static String create_timestamp = CLASS_NAME + "create_timestamp"; // 创建时间戳
public final static String draw_cash_amount = CLASS_NAME + "draw_cash_amount"; // 提现金额
public final static String status_ = CLASS_NAME + "status"; // apply：申请， reject:拒绝， agree:同意
public final static String reject_reason = CLASS_NAME + "reject_reason"; // 拒绝原因
public final static String buyer_id = CLASS_NAME + "buyer_id"; // 买家id
public final static String buyer_name = CLASS_NAME + "buyer_name"; // 买家名称
public final static String buyer_weixin = CLASS_NAME + "buyer_weixin"; // 买家微信
public final static String buyer_phone = CLASS_NAME + "buyer_phone"; // 买家手机号
//
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@ -35,8 +42,22 @@ private static final long serialVersionUID = 1L;
private Date createTime;
//修改时间
private Date modifyTime;
//推广者id，唯一值
private String promoterId;
//创建时间戳
private Long createTimestamp;
//提现金额
private BigDecimal drawCashAmount;
//apply：申请， reject:拒绝， agree:同意
private String status;
//拒绝原因
private String rejectReason;
//买家id
private Long buyerId;
//买家名称
private String buyerName;
//买家微信
private String buyerWeixin;
//买家手机号
private String buyerPhone;
/**
*
* @return
@ -98,18 +119,123 @@ private static final long serialVersionUID = 1L;
}
/**
* 推广者id，唯一值
* 创建时间戳
* @return
*/
public String getPromoterId() {
return promoterId;
public Long getCreateTimestamp() {
return createTimestamp;
}
/**
* 推广者id，唯一值
* @param promoterId
* 创建时间戳
* @param createTimestamp
*/
public void setPromoterId(String promoterId) {
this.promoterId = promoterId;
public void setCreateTimestamp(Long createTimestamp) {
this.createTimestamp = createTimestamp;
}
/**
* 提现金额
* @return
*/
public BigDecimal getDrawCashAmount() {
return drawCashAmount;
}
/**
* 提现金额
* @param drawCashAmount
*/
public void setDrawCashAmount(BigDecimal drawCashAmount) {
this.drawCashAmount = drawCashAmount;
}
/**
* apply：申请， reject:拒绝， agree:同意
* @return
*/
public String getStatus() {
return status;
}
/**
* apply：申请， reject:拒绝， agree:同意
* @param status
*/
public void setStatus(String status) {
this.status = status;
}
/**
* 拒绝原因
* @return
*/
public String getRejectReason() {
return rejectReason;
}
/**
* 拒绝原因
* @param rejectReason
*/
public void setRejectReason(String rejectReason) {
this.rejectReason = rejectReason;
}
/**
* 买家id
* @return
*/
public Long getBuyerId() {
return buyerId;
}
/**
* 买家id
* @param buyerId
*/
public void setBuyerId(Long buyerId) {
this.buyerId = buyerId;
}
/**
* 买家名称
* @return
*/
public String getBuyerName() {
return buyerName;
}
/**
* 买家名称
* @param buyerName
*/
public void setBuyerName(String buyerName) {
this.buyerName = buyerName;
}
/**
* 买家微信
* @return
*/
public String getBuyerWeixin() {
return buyerWeixin;
}
/**
* 买家微信
* @param buyerWeixin
*/
public void setBuyerWeixin(String buyerWeixin) {
this.buyerWeixin = buyerWeixin;
}
/**
* 买家手机号
* @return
*/
public String getBuyerPhone() {
return buyerPhone;
}
/**
* 买家手机号
* @param buyerPhone
*/
public void setBuyerPhone(String buyerPhone) {
this.buyerPhone = buyerPhone;
}
@Override
@ -119,7 +245,14 @@ private static final long serialVersionUID = 1L;
",isDelete=" + isDelete +
",createTime=" + createTime +
",modifyTime=" + modifyTime +
",promoterId=" + promoterId +
",createTimestamp=" + createTimestamp +
",drawCashAmount=" + drawCashAmount +
",status=" + status +
",rejectReason=" + rejectReason +
",buyerId=" + buyerId +
",buyerName=" + buyerName +
",buyerWeixin=" + buyerWeixin +
",buyerPhone=" + buyerPhone +
"}";
}
}

57
api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterAwardLineEntity.java
View File

@ -37,11 +37,10 @@ private static final long serialVersionUID = 1L;
public final static String was_buyer_name = CLASS_NAME + "was_buyer_name"; // 被推荐者买家名称
public final static String was_buyer_weixin = CLASS_NAME + "was_buyer_weixin"; // 被推荐者买家微信
public final static String was_buyer_phone = CLASS_NAME + "was_buyer_phone"; // 被推荐者买家手机号
public final static String draw_cash_id = CLASS_NAME + "draw_cash_id"; // 是否已经被提现
public final static String arrive_account = CLASS_NAME + "arrive_account"; // 是否到账 ，是否已经妥投，妥投之后无法退款
public final static String trade_order_id = CLASS_NAME + "trade_order_id"; // 订单id
public final static String trade_order_line_id = CLASS_NAME + "trade_order_line_id"; // 子订单id
public final static String status_ = CLASS_NAME + "status"; // create 创建, canceled 取消 , arrive，到账
public final static String create_timestamp = CLASS_NAME + "create_timestamp"; // 创建时间戳
//
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@ -75,16 +74,14 @@ private static final long serialVersionUID = 1L;
private String wasBuyerWeixin;
//被推荐者买家手机号
private String wasBuyerPhone;
//是否已经被提现
private Long drawCashId;
//是否到账 ，是否已经妥投，妥投之后无法退款
private Integer arriveAccount;
//订单id
private Long tradeOrderId;
//子订单id
private Long tradeOrderLineId;
//create 创建, canceled 取消 , arrive，到账
private String status;
//创建时间戳
private Long createTimestamp;
/**
*
* @return
@ -325,36 +322,6 @@ private static final long serialVersionUID = 1L;
this.wasBuyerPhone = wasBuyerPhone;
}
/**
* 是否已经被提现
* @return
*/
public Long getDrawCashId() {
return drawCashId;
}
/**
* 是否已经被提现
* @param drawCashId
*/
public void setDrawCashId(Long drawCashId) {
this.drawCashId = drawCashId;
}
/**
* 是否到账 ，是否已经妥投，妥投之后无法退款
* @return
*/
public Integer getArriveAccount() {
return arriveAccount;
}
/**
* 是否到账 ，是否已经妥投，妥投之后无法退款
* @param arriveAccount
*/
public void setArriveAccount(Integer arriveAccount) {
this.arriveAccount = arriveAccount;
}
/**
* 订单id
* @return
@ -400,6 +367,21 @@ private static final long serialVersionUID = 1L;
this.status = status;
}
/**
* 创建时间戳
* @return
*/
public Long getCreateTimestamp() {
return createTimestamp;
}
/**
* 创建时间戳
* @param createTimestamp
*/
public void setCreateTimestamp(Long createTimestamp) {
this.createTimestamp = createTimestamp;
}
@Override
public String toString() {
return "VvPromoterAwardLineEntity{" +
@ -419,11 +401,10 @@ private static final long serialVersionUID = 1L;
",wasBuyerName=" + wasBuyerName +
",wasBuyerWeixin=" + wasBuyerWeixin +
",wasBuyerPhone=" + wasBuyerPhone +
",drawCashId=" + drawCashId +
",arriveAccount=" + arriveAccount +
",tradeOrderId=" + tradeOrderId +
",tradeOrderLineId=" + tradeOrderLineId +
",status=" + status +
",createTimestamp=" + createTimestamp +
"}";
}
}

5
api-mapper/src/main/java/com/heyu/api/data/utils/StringUtils.java
View File

@ -369,6 +369,11 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
return sb.toString();
}
public static boolean notEquals(String a , String b){
return !equals(a,b);
}
/**
* 获取文件base64编码

2
api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java
View File

@ -48,7 +48,7 @@ public class MysqlMain_update {
}
List<TablesBean> list = new ArrayList<TablesBean>();
list.add(new TablesBean("vv_promoter"));
list.add(new TablesBean("vv_promoter_award_line"));
Map<String, String> map = MysqlUtil2ShowCreateTable.getComments();

6
api-third/src/main/java/com/heyu/api/alibaba/request/mm/VVAdminBaseRequest.java
View File

@ -11,4 +11,10 @@ public class VVAdminBaseRequest {
private Integer pageSize = 10 ;
/***
* 账号id
*/
private Long adminId;
}

23
api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvActivityRequest.java Normal file
View File

@ -0,0 +1,23 @@
package com.heyu.api.alibaba.request.mm;
import lombok.Data;
@Data
public class VvActivityRequest extends VVAdminBaseRequest {
//活动名称
private String activityName;
//创建时间撮
private Long minCreateTimestamp;
// 创建时间最小值
private Long maxCreateTimestamp;
/***
* 按创建时间排序,，传 ASC 或 DESC
*/
private String createTimestampSort;
}

16
api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvDrawCashRecordAgreeRequest.java Normal file
View File

@ -0,0 +1,16 @@
package com.heyu.api.alibaba.request.mm;
import lombok.Data;
@Data
public class VvDrawCashRecordAgreeRequest extends VVAdminBaseRequest {
/***
* 提现记录id
*/
private Long drawCashRecordId;
}

16
api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvDrawCashRecordRejectRequest.java Normal file
View File

@ -0,0 +1,16 @@
package com.heyu.api.alibaba.request.mm;
import lombok.Data;
@Data
public class VvDrawCashRecordRejectRequest extends VVAdminBaseRequest {
/***
* 提现记录id
*/
private Long drawCashRecordId;
}

36
api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvDrawCashRecordRequest.java Normal file
View File

@ -0,0 +1,36 @@
package com.heyu.api.alibaba.request.mm;
import lombok.Data;
@Data
public class VvDrawCashRecordRequest extends VVAdminBaseRequest {
//apply：申请， reject:拒绝， agree:同意
private String status;
//买家名称
private Long buyerId;
//买家名称
private String buyerName;
//买家微信
private String buyerWeixin;
//买家手机号
private String buyerPhone;
//创建时间撮
private Long minCreateTimestamp;
// 创建时间最小值
private Long maxCreateTimestamp;
/***
* 按创建时间排序,，传 ASC 或 DESC
*/
private String createTimestampSort;
}

29
api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvPromoterLineRequest.java Normal file
View File

@ -0,0 +1,29 @@
package com.heyu.api.alibaba.request.mm;
import lombok.Data;
@Data
public class VvPromoterLineRequest extends VVAdminBaseRequest {
//推广者id，唯一值
private String promoterId;
//推广者买家名称
private String promoterBuyerName;
//推广者买家微信
private String promoterBuyerWeixin;
//推广者买家微信
private String promoterBuyerPhone;
//推广者买家id
private Long promoterBuyerId;
//创建时间撮
private Long minCreateTimestamp;
// 创建时间最小值
private Long maxCreateTimestamp;
/***
* 按创建时间排序,，传 ASC 或 DESC
*/
private String createTimestampSort;
}

37
api-third/src/main/java/com/heyu/api/alibaba/request/mm/enums/ApprovalEnums.java Normal file
View File

@ -0,0 +1,37 @@
package com.heyu.api.alibaba.request.mm.enums;
public enum ApprovalEnums {
//apply：申请， reject:拒绝， agree:同意
apply("apply", "申请"),
reject("reject", "拒绝"),
agree("agree", "同意");
private String status;
private String desc;
ApprovalEnums(String status, String desc) {
this.status = status;
this.desc = desc;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
}

50
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminActivityController.java Normal file
View File

@ -0,0 +1,50 @@
package com.heyu.api.controller.mm;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.heyu.api.alibaba.request.mm.VvActivityRequest;
import com.heyu.api.data.dao.vv.VvActivityDao;
import com.heyu.api.data.utils.R;
import com.heyu.api.utils.ISelect;
import com.heyu.api.utils.PPageUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Slf4j
@RestController
@RequestMapping("/mm/activity")
public class AdminActivityController {
@Autowired
private VvActivityDao vvActivityDao;
/***
* 奖励 列表
* http://localhost:8888/mm/activity/list
*/
@RequestMapping("/list")
public R list(@RequestBody VvActivityRequest vvActivityRequest) {
PPageUtils pageUtils = PPageUtils.startPage(vvActivityRequest.getPageNum(), vvActivityRequest.getPageSize())
.doSelect(new ISelect() {
@Override
public List doSelect(IPage page) {
return vvActivityDao.selectByCondition(page,
vvActivityRequest.getActivityName(),
vvActivityRequest.getMinCreateTimestamp(),
vvActivityRequest.getMaxCreateTimestamp(),
vvActivityRequest.getCreateTimestampSort()
);
}
});
return R.ok().setData(pageUtils);
}
}

102
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminDrawCashRecordController.java Normal file
View File

@ -0,0 +1,102 @@
package com.heyu.api.controller.mm;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.heyu.api.alibaba.request.mm.VvDrawCashRecordAgreeRequest;
import com.heyu.api.alibaba.request.mm.VvDrawCashRecordRejectRequest;
import com.heyu.api.alibaba.request.mm.VvDrawCashRecordRequest;
import com.heyu.api.alibaba.request.mm.enums.ApprovalEnums;
import com.heyu.api.data.dao.vv.VvBuyerDao;
import com.heyu.api.data.dao.vv.VvDrawCashRecordDao;
import com.heyu.api.data.dao.vv.VvPromoterAwardLineDao;
import com.heyu.api.data.entity.vv.VvDrawCashRecordEntity;
import com.heyu.api.data.utils.R;
import com.heyu.api.data.utils.StringUtils;
import com.heyu.api.utils.ISelect;
import com.heyu.api.utils.PPageUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Slf4j
@RestController
@RequestMapping("/mm/draw/cash")
public class AdminDrawCashRecordController {
@Autowired
private VvDrawCashRecordDao vvDrawCashRecordDao;
@Autowired
private VvBuyerDao vvBuyerDao;
@Autowired
private VvPromoterAwardLineDao vvPromoterAwardLineDao;
/***
* 奖励 列表
* http://localhost:8888/mm/draw/cash/list
*/
@RequestMapping("/list")
public R list(@RequestBody VvDrawCashRecordRequest request) {
PPageUtils pageUtils = PPageUtils.startPage(request.getPageNum(), request.getPageSize())
.doSelect(new ISelect() {
@Override
public List doSelect(IPage page) {
return vvDrawCashRecordDao.selectByCondition(page,
request.getBuyerId(),
request.getBuyerName(),
request.getBuyerPhone(),
request.getBuyerWeixin(),
request.getStatus(),
request.getMinCreateTimestamp(),
request.getMaxCreateTimestamp(),
request.getCreateTimestampSort()
);
}
});
return R.ok().setData(pageUtils);
}
/***
* 奖励 同意
* http://localhost:8888/mm/activity/agree
*/
@RequestMapping("/agree")
public R agree(@RequestBody VvDrawCashRecordAgreeRequest request) {
VvDrawCashRecordEntity vvDrawCashRecord = vvDrawCashRecordDao.selectVvDrawCashRecordById(request.getDrawCashRecordId());
if (StringUtils.notEquals(vvDrawCashRecord.getStatus(), ApprovalEnums.apply.getStatus())) {
return R.error("状态不对");
}
vvBuyerDao.updateVvBuyerApplyAmountDrawCashAmountById(vvDrawCashRecord.getDrawCashAmount(),
vvDrawCashRecord.getDrawCashAmount(), vvDrawCashRecord.getBuyerId());
return R.ok("提现成功");
}
/***
* 奖励 拒绝
* http://localhost:8888/mm/activity/agree
*/
@RequestMapping("/reject")
public R reject(@RequestBody VvDrawCashRecordRejectRequest request) {
VvDrawCashRecordEntity vvDrawCashRecord = vvDrawCashRecordDao.selectVvDrawCashRecordById(request.getDrawCashRecordId());
if (StringUtils.notEquals(vvDrawCashRecord.getStatus(), ApprovalEnums.apply.getStatus())) {
return R.error("状态不对");
}
vvBuyerDao.updateVvBuyerDrawFailedById(vvDrawCashRecord.getDrawCashAmount(),
vvDrawCashRecord.getDrawCashAmount(), vvDrawCashRecord.getBuyerId());
return R.ok();
}
}

53
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterAwardLineController.java Normal file
View File

@ -0,0 +1,53 @@
package com.heyu.api.controller.mm;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.heyu.api.alibaba.request.mm.VvPromoterLineRequest;
import com.heyu.api.data.dao.vv.VvPromoterAwardLineDao;
import com.heyu.api.data.utils.R;
import com.heyu.api.utils.ISelect;
import com.heyu.api.utils.PPageUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Slf4j
@RestController
@RequestMapping("/mm/promoter/award")
public class AdminPromoterAwardLineController {
@Autowired
private VvPromoterAwardLineDao vvPromoterAwardLineDao;
/***
* 奖励 列表
* http://localhost:8888/mm/promoter/award/list
*/
@RequestMapping("/list")
public R list(@RequestBody VvPromoterLineRequest vvPromoterRequest) {
PPageUtils pageUtils = PPageUtils.startPage(vvPromoterRequest.getPageNum(), vvPromoterRequest.getPageSize())
.doSelect(new ISelect() {
@Override
public List doSelect(IPage page) {
return vvPromoterAwardLineDao.selectByCondition(page,
vvPromoterRequest.getPromoterId(),
vvPromoterRequest.getPromoterBuyerId(),
vvPromoterRequest.getPromoterBuyerName(),
vvPromoterRequest.getPromoterBuyerWeixin(),
vvPromoterRequest.getPromoterBuyerPhone(),
vvPromoterRequest.getMinCreateTimestamp(),
vvPromoterRequest.getMaxCreateTimestamp(),
vvPromoterRequest.getCreateTimestampSort()
);
}
});
return R.ok().setData(pageUtils);
}
}