diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvDrawCashRecordDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvDrawCashRecordDao.java new file mode 100644 index 0000000..25d678b --- /dev/null +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvDrawCashRecordDao.java @@ -0,0 +1,36 @@ +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 org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper +public interface VvDrawCashRecordDao extends BaseMapper { + + + VvDrawCashRecordEntity selectVvDrawCashRecordById(@Param("id")Long id); + + + Long insertVvDrawCashRecord(VvDrawCashRecordEntity vvDrawCashRecord); + + + Long insertOrUpdateVvDrawCashRecord(VvDrawCashRecordEntity vvDrawCashRecord); + + + int updateVvDrawCashRecordById(VvDrawCashRecordEntity vvDrawCashRecord); + + + int updateCoverVvDrawCashRecordById(VvDrawCashRecordEntity vvDrawCashRecord); + + + int deleteVvDrawCashRecordById(@Param("id")Long id); + + +} \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvBuyerEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvBuyerEntity.java index 242b098..150675d 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvBuyerEntity.java +++ b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvBuyerEntity.java @@ -38,6 +38,7 @@ private static final long serialVersionUID = 1L; public final static String draw_cash_amount = CLASS_NAME + "draw_cash_amount"; // 提现金额 public final static String account_mount = CLASS_NAME + "account_mount"; // 账户余额 public final static String not_arrive_account = CLASS_NAME + "not_arrive_account"; // 未到账金额 + public final static String canceled_account = CLASS_NAME + "canceled_account"; // 取消金额 // @TableId(value = "id", type = IdType.AUTO) private Long id; @@ -73,6 +74,8 @@ private static final long serialVersionUID = 1L; private BigDecimal accountMount; //未到账金额 private BigDecimal notArriveAccount; + //取消金额 + private BigDecimal canceledAccount; /** * * @return @@ -328,6 +331,21 @@ private static final long serialVersionUID = 1L; this.notArriveAccount = notArriveAccount; } + /** + * 取消金额 + * @return + */ + public BigDecimal getCanceledAccount() { + return canceledAccount; + } + /** + * 取消金额 + * @param canceledAccount + */ + public void setCanceledAccount(BigDecimal canceledAccount) { + this.canceledAccount = canceledAccount; + } + @Override public String toString() { return "VvBuyerEntity{" + @@ -348,6 +366,7 @@ private static final long serialVersionUID = 1L; ",drawCashAmount=" + drawCashAmount + ",accountMount=" + accountMount + ",notArriveAccount=" + notArriveAccount + + ",canceledAccount=" + canceledAccount + "}"; } } \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvDrawCashRecordEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvDrawCashRecordEntity.java new file mode 100644 index 0000000..a4b46e1 --- /dev/null +++ b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvDrawCashRecordEntity.java @@ -0,0 +1,125 @@ +package com.heyu.api.data.entity.vv; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.lz.mybatis.plugin.annotations.AS; + +import java.math.BigDecimal; +import java.util.Date;import java.util.Date; +/** +*提现记录 +* @author quyixiao +* @since 2025-10-25 +*/ + +@Data +@TableName("vv_draw_cash_record") +public class VvDrawCashRecordEntity implements java.io.Serializable { +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，唯一值 + // + @TableId(value = "id", type = IdType.AUTO) + private Long id; + //是否删除：0 否 1 删除 + private Integer isDelete; + //创建时间 + private Date createTime; + //修改时间 + private Date modifyTime; + //推广者id，唯一值 + private String promoterId; + /** + * + * @return + */ + public Long getId() { + return id; + } + /** + * + * @param id + */ + public void setId(Long id) { + this.id = id; + } + + /** + * 是否删除：0 否 1 删除 + * @return + */ + public Integer getIsDelete() { + return isDelete; + } + /** + * 是否删除：0 否 1 删除 + * @param isDelete + */ + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } + + /** + * 创建时间 + * @return + */ + public Date getCreateTime() { + return createTime; + } + /** + * 创建时间 + * @param createTime + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 修改时间 + * @return + */ + public Date getModifyTime() { + return modifyTime; + } + /** + * 修改时间 + * @param modifyTime + */ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** + * 推广者id，唯一值 + * @return + */ + public String getPromoterId() { + return promoterId; + } + /** + * 推广者id，唯一值 + * @param promoterId + */ + public void setPromoterId(String promoterId) { + this.promoterId = promoterId; + } + + @Override + public String toString() { + return "VvDrawCashRecordEntity{" + + ",id=" + id + + ",isDelete=" + isDelete + + ",createTime=" + createTime + + ",modifyTime=" + modifyTime + + ",promoterId=" + promoterId + + "}"; + } +} \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterAwardEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterAwardEntity.java index d68993a..3afc117 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterAwardEntity.java +++ b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterAwardEntity.java @@ -21,13 +21,16 @@ private static final long serialVersionUID = 1L; public final static String CLASS_NAME ="com.heyu.api.data.entity.vv.VvPromoterAwardEntity:"; 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 award_amount = CLASS_NAME + "award_amount"; // 金额 - public final static String activity_id = CLASS_NAME + "activity_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 promoter_id = CLASS_NAME + "promoter_id"; // 推广者id，唯一值 + public final static String award_amount = CLASS_NAME + "award_amount"; // 金额 + public final static String activity_id = CLASS_NAME + "activity_id"; // 活动id + 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，到账 // @TableId(value = "id", type = IdType.AUTO) private Long id; @@ -43,6 +46,12 @@ private static final long serialVersionUID = 1L; private BigDecimal awardAmount; //活动id private Long activityId; + //订单id + private Long tradeOrderId; + //子订单id + private Long tradeOrderLineId; + //create 创建, canceled 取消 , arrive，到账 + private String status; /** * * @return @@ -148,6 +157,51 @@ private static final long serialVersionUID = 1L; this.activityId = activityId; } + /** + * 订单id + * @return + */ + public Long getTradeOrderId() { + return tradeOrderId; + } + /** + * 订单id + * @param tradeOrderId + */ + public void setTradeOrderId(Long tradeOrderId) { + this.tradeOrderId = tradeOrderId; + } + + /** + * 子订单id + * @return + */ + public Long getTradeOrderLineId() { + return tradeOrderLineId; + } + /** + * 子订单id + * @param tradeOrderLineId + */ + public void setTradeOrderLineId(Long tradeOrderLineId) { + this.tradeOrderLineId = tradeOrderLineId; + } + + /** + * create 创建, canceled 取消 , arrive，到账 + * @return + */ + public String getStatus() { + return status; + } + /** + * create 创建, canceled 取消 , arrive，到账 + * @param status + */ + public void setStatus(String status) { + this.status = status; + } + @Override public String toString() { return "VvPromoterAwardEntity{" + @@ -158,6 +212,9 @@ private static final long serialVersionUID = 1L; ",promoterId=" + promoterId + ",awardAmount=" + awardAmount + ",activityId=" + activityId + + ",tradeOrderId=" + tradeOrderId + + ",tradeOrderLineId=" + tradeOrderLineId + + ",status=" + status + "}"; } } \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterAwardLineEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterAwardLineEntity.java index 8b13d6f..b6291ba 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterAwardLineEntity.java +++ b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterAwardLineEntity.java @@ -39,6 +39,9 @@ private static final long serialVersionUID = 1L; 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，到账 // @TableId(value = "id", type = IdType.AUTO) private Long id; @@ -76,6 +79,12 @@ private static final long serialVersionUID = 1L; private Long drawCashId; //是否到账 ，是否已经妥投，妥投之后无法退款 private Integer arriveAccount; + //订单id + private Long tradeOrderId; + //子订单id + private Long tradeOrderLineId; + //create 创建, canceled 取消 , arrive，到账 + private String status; /** * * @return @@ -346,6 +355,51 @@ private static final long serialVersionUID = 1L; this.arriveAccount = arriveAccount; } + /** + * 订单id + * @return + */ + public Long getTradeOrderId() { + return tradeOrderId; + } + /** + * 订单id + * @param tradeOrderId + */ + public void setTradeOrderId(Long tradeOrderId) { + this.tradeOrderId = tradeOrderId; + } + + /** + * 子订单id + * @return + */ + public Long getTradeOrderLineId() { + return tradeOrderLineId; + } + /** + * 子订单id + * @param tradeOrderLineId + */ + public void setTradeOrderLineId(Long tradeOrderLineId) { + this.tradeOrderLineId = tradeOrderLineId; + } + + /** + * create 创建, canceled 取消 , arrive，到账 + * @return + */ + public String getStatus() { + return status; + } + /** + * create 创建, canceled 取消 , arrive，到账 + * @param status + */ + public void setStatus(String status) { + this.status = status; + } + @Override public String toString() { return "VvPromoterAwardLineEntity{" + @@ -367,6 +421,9 @@ private static final long serialVersionUID = 1L; ",wasBuyerPhone=" + wasBuyerPhone + ",drawCashId=" + drawCashId + ",arriveAccount=" + arriveAccount + + ",tradeOrderId=" + tradeOrderId + + ",tradeOrderLineId=" + tradeOrderLineId + + ",status=" + status + "}"; } } \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvDrawCashRecordServiceImpl.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvDrawCashRecordServiceImpl.java new file mode 100644 index 0000000..eb73be2 --- /dev/null +++ b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvDrawCashRecordServiceImpl.java @@ -0,0 +1,68 @@ +package com.heyu.api.data.service.impl.vv; +/** +*

+* 提现记录 服务类 +*

+* +* @author quyixiao +* @since 2025-10-25 +*/ + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.heyu.api.data.dao.vv.VvDrawCashRecordDao; +import com.heyu.api.data.entity.vv.VvDrawCashRecordEntity; +import com.heyu.api.data.service.vv.VvDrawCashRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +@Service +public class VvDrawCashRecordServiceImpl extends ServiceImpl implements VvDrawCashRecordService { + + + @Autowired + private VvDrawCashRecordDao vvDrawCashRecordDao; + + + + @Override + public VvDrawCashRecordEntity selectVvDrawCashRecordById(Long id){ + return vvDrawCashRecordDao.selectVvDrawCashRecordById(id); + } + + + + @Override + public Long insertVvDrawCashRecord(VvDrawCashRecordEntity vvDrawCashRecord){ + return vvDrawCashRecordDao.insertVvDrawCashRecord(vvDrawCashRecord); + } + + + + @Override + public Long insertOrUpdateVvDrawCashRecord(VvDrawCashRecordEntity vvDrawCashRecord){ + return vvDrawCashRecordDao.insertOrUpdateVvDrawCashRecord(vvDrawCashRecord); + } + + + + @Override + public int updateVvDrawCashRecordById(VvDrawCashRecordEntity vvDrawCashRecord){ + return vvDrawCashRecordDao.updateVvDrawCashRecordById(vvDrawCashRecord); + } + + + + @Override + public int updateCoverVvDrawCashRecordById(VvDrawCashRecordEntity vvDrawCashRecord){ + return vvDrawCashRecordDao.updateCoverVvDrawCashRecordById(vvDrawCashRecord); + } + + + + @Override + public int deleteVvDrawCashRecordById(Long id){ + return vvDrawCashRecordDao.deleteVvDrawCashRecordById(id); + } + + + +} diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvDrawCashRecordService.java b/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvDrawCashRecordService.java new file mode 100644 index 0000000..12aa8a2 --- /dev/null +++ b/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvDrawCashRecordService.java @@ -0,0 +1,34 @@ +package com.heyu.api.data.service.vv; +/** +*

+* 提现记录 服务类 +*

+* +* @author quyixiao +* @since 2025-10-25 +*/ +import com.baomidou.mybatisplus.extension.service.IService; +import com.heyu.api.data.entity.vv.VvDrawCashRecordEntity; +public interface VvDrawCashRecordService extends IService { + + + + VvDrawCashRecordEntity selectVvDrawCashRecordById(Long id); + + + Long insertVvDrawCashRecord(VvDrawCashRecordEntity vvDrawCashRecord); + + + Long insertOrUpdateVvDrawCashRecord(VvDrawCashRecordEntity vvDrawCashRecord); + + + int updateVvDrawCashRecordById(VvDrawCashRecordEntity vvDrawCashRecord); + + + int updateCoverVvDrawCashRecordById(VvDrawCashRecordEntity vvDrawCashRecord); + + + int deleteVvDrawCashRecordById(Long id); + + +} \ No newline at end of file diff --git a/api-mapper/src/main/resources/mapper/vv/VvDrawCashRecordDao.xml b/api-mapper/src/main/resources/mapper/vv/VvDrawCashRecordDao.xml new file mode 100644 index 0000000..2f42b37 --- /dev/null +++ b/api-mapper/src/main/resources/mapper/vv/VvDrawCashRecordDao.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/api-mapper/src/test/java/com/test/xxx/MysqlMain_insert.java b/api-mapper/src/test/java/com/test/xxx/MysqlMain_insert.java index f666533..5f03b03 100644 --- a/api-mapper/src/test/java/com/test/xxx/MysqlMain_insert.java +++ b/api-mapper/src/test/java/com/test/xxx/MysqlMain_insert.java @@ -94,7 +94,7 @@ public class MysqlMain_insert { List list = new ArrayList(); - list.add(new TablesBean("vv_promoter")); + list.add(new TablesBean("vv_draw_cash_record")); diff --git a/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java b/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java index e06b14e..9676357 100644 --- a/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java +++ b/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java @@ -48,11 +48,7 @@ public class MysqlMain_update { } List list = new ArrayList(); - - String a = "vv_promoter_award_line"; - for (String s : a.split(",")) { - list.add(new TablesBean(s)); - } + list.add(new TablesBean("vv_buyer")); Map map = MysqlUtil2ShowCreateTable.getComments();