diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvActivityDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvActivityDao.java index 2f13193..371bcdc 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvActivityDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvActivityDao.java @@ -46,7 +46,8 @@ public interface VvActivityDao extends BaseMapper { @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); + @OrderBy @IF @Column(VvActivityEntity.create_timestamp) String createTimestampSort + ); diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterAwardDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterAwardDao.java deleted file mode 100644 index 7d25e2c..0000000 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterAwardDao.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.heyu.api.data.dao.vv; -/** -*

-* 推广者获得奖品名细 服务类 -*

-* -* @author quyixiao -* @since 2025-10-25 -*/ -import com.heyu.api.data.entity.vv.VvPromoterAwardEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -@Mapper -public interface VvPromoterAwardDao extends BaseMapper { - - - VvPromoterAwardEntity selectVvPromoterAwardById(@Param("id")Long id); - - - Long insertVvPromoterAward(VvPromoterAwardEntity vvPromoterAward); - - - Long insertOrUpdateVvPromoterAward(VvPromoterAwardEntity vvPromoterAward); - - - int updateVvPromoterAwardById(VvPromoterAwardEntity vvPromoterAward); - - - int updateCoverVvPromoterAwardById(VvPromoterAwardEntity vvPromoterAward); - - - int deleteVvPromoterAwardById(@Param("id")Long id); - - -} \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterAwardLineDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterAwardLineDao.java deleted file mode 100644 index 2fe2028..0000000 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterAwardLineDao.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.heyu.api.data.dao.vv; -/** -*

-* 推广者获得奖品名细子单 服务类 -*

-* -* @author quyixiao -* @since 2025-10-25 -*/ - -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 selectVvPromoterAwardLineById(@Param("id")Long id); - - - Long insertVvPromoterAwardLine(VvPromoterAwardLineEntity vvPromoterAwardLine); - - - Long insertOrUpdateVvPromoterAwardLine(VvPromoterAwardLineEntity vvPromoterAwardLine); - - - int updateVvPromoterAwardLineById(VvPromoterAwardLineEntity vvPromoterAwardLine); - - - int updateCoverVvPromoterAwardLineById(VvPromoterAwardLineEntity vvPromoterAwardLine); - - - int deleteVvPromoterAwardLineById(@Param("id")Long id); - - - - @OrderBy(VvPromoterAwardLineEntity.id_) - List 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); - - - - - - @OrderBy(VvPromoterAwardLineEntity.id_) - List selectByAppCondition(IPage page, - @IF Long promoterBuyerId, - @IF @Column(VvPromoterAwardLineEntity.create_timestamp) Long minCreateTimestamp, - @IF @Column(VvPromoterAwardLineEntity.create_timestamp) Long maxCreateTimestamp, - @OrderBy @IF @Column(VvPromoterAwardLineEntity.create_timestamp) String createTimestampSort); -} \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterBuyerDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterBuyerDao.java new file mode 100644 index 0000000..d439c5c --- /dev/null +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterBuyerDao.java @@ -0,0 +1,55 @@ +package com.heyu.api.data.dao.vv; +/** + *

+ * 推广者 服务类 + *

+ * + * @author quyixiao + * @since 2025-11-21 + */ + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.heyu.api.data.entity.vv.VvPromoterBuyerEntity; +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 VvPromoterBuyerDao extends BaseMapper { + + + VvPromoterBuyerEntity selectVvPromoterBuyerById(@Param("id") Long id); + + + Long insertVvPromoterBuyer(VvPromoterBuyerEntity vvPromoterBuyer); + + + Long insertOrUpdateVvPromoterBuyer(VvPromoterBuyerEntity vvPromoterBuyer); + + + int updateVvPromoterBuyerById(VvPromoterBuyerEntity vvPromoterBuyer); + + + int updateCoverVvPromoterBuyerById(VvPromoterBuyerEntity vvPromoterBuyer); + + + int deleteVvPromoterBuyerById(@Param("id") Long id); + + + + List selectBuyerByCondition(IPage page, + @IF String promoterId, + @IF Long promoterBuyerId, + @IF String promoterBuyerName, + @IF String promoterBuyerWeixin, + @IF String promoterBuyerPhone, + @IF @Column(VvPromoterBuyerEntity.create_timestamp) Long minCreateTimestamp, + @IF @Column(VvPromoterBuyerEntity.create_timestamp) Long maxCreateTimestamp, + @OrderBy @IF @Column(VvPromoterBuyerEntity.create_timestamp) String createTimestampSort + ); +} \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterDao.java deleted file mode 100644 index ae493af..0000000 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterDao.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.heyu.api.data.dao.vv; -/** -*

-* 推广者 服务类 -*

-* -* @author quyixiao -* @since 2025-10-25 -*/ - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.heyu.api.data.entity.vv.VvBuyerEntity; -import com.heyu.api.data.entity.vv.VvPromoterEntity; -import com.lz.mybatis.plugin.annotations.*; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface VvPromoterDao extends BaseMapper { - - - VvPromoterEntity selectVvPromoterById(@Param("id")Long id); - - - Long insertVvPromoter(VvPromoterEntity vvPromoter); - - - Long insertOrUpdateVvPromoter(VvPromoterEntity vvPromoter); - - - int updateVvPromoterById(VvPromoterEntity vvPromoter); - - - int updateCoverVvPromoterById(VvPromoterEntity vvPromoter); - - - int deleteVvPromoterById(@Param("id")Long id); - - - List selectVvPromoterByPromoteIds(@IFNullReturnEmpty @IN List promoterId); - - @OrderBy(VvBuyerEntity.id_) - List selectBuyerByCondition(IPage page, - @IF String promoterId, - @IF Long promoterBuyerId, - @IF @LIKE String promoterBuyerName, - @IF @LIKE String promoterBuyerWeixin, - @IF @LIKE String promoterBuyerPhone, - @IF @Column(VvPromoterEntity.create_timestamp) Long minCreateTimestamp, - @IF @Column(VvPromoterEntity.create_timestamp) Long maxCreateTimestamp, - @OrderBy @IF @Column(VvPromoterEntity.create_timestamp) String createTimestampSort); - - - - - @OrderBy(VvBuyerEntity.id_) - List selectAppByCondition(IPage page, - @IF Long promoterBuyerId, - @IF @Column(VvPromoterEntity.create_timestamp) Long minCreateTimestamp, - @IF @Column(VvPromoterEntity.create_timestamp) Long maxCreateTimestamp, - @OrderBy @IF @Column(VvPromoterEntity.create_timestamp) String createTimestampSort); - - - -} \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterTradeOrderAwardDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterTradeOrderAwardDao.java new file mode 100644 index 0000000..2b848dc --- /dev/null +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterTradeOrderAwardDao.java @@ -0,0 +1,36 @@ +package com.heyu.api.data.dao.vv; +/** +*

+* 推广者获得奖品名细 服务类 +*

+* +* @author quyixiao +* @since 2025-11-21 +*/ +import com.heyu.api.data.entity.vv.VvPromoterTradeOrderAwardEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper +public interface VvPromoterTradeOrderAwardDao extends BaseMapper { + + + VvPromoterTradeOrderAwardEntity selectVvPromoterTradeOrderAwardById(@Param("id")Long id); + + + Long insertVvPromoterTradeOrderAward(VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAward); + + + Long insertOrUpdateVvPromoterTradeOrderAward(VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAward); + + + int updateVvPromoterTradeOrderAwardById(VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAward); + + + int updateCoverVvPromoterTradeOrderAwardById(VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAward); + + + int deleteVvPromoterTradeOrderAwardById(@Param("id")Long id); + + +} \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterTradeOrderLineAwardDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterTradeOrderLineAwardDao.java new file mode 100644 index 0000000..7c93c0a --- /dev/null +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterTradeOrderLineAwardDao.java @@ -0,0 +1,36 @@ +package com.heyu.api.data.dao.vv; +/** +*

+* 推广者获得奖品名细子单 服务类 +*

+* +* @author quyixiao +* @since 2025-11-21 +*/ +import com.heyu.api.data.entity.vv.VvPromoterTradeOrderLineAwardEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper +public interface VvPromoterTradeOrderLineAwardDao extends BaseMapper { + + + VvPromoterTradeOrderLineAwardEntity selectVvPromoterTradeOrderLineAwardById(@Param("id")Long id); + + + Long insertVvPromoterTradeOrderLineAward(VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAward); + + + Long insertOrUpdateVvPromoterTradeOrderLineAward(VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAward); + + + int updateVvPromoterTradeOrderLineAwardById(VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAward); + + + int updateCoverVvPromoterTradeOrderLineAwardById(VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAward); + + + int deleteVvPromoterTradeOrderLineAwardById(@Param("id")Long id); + + +} \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterBuyerEntity.java similarity index 92% rename from api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterEntity.java rename to api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterBuyerEntity.java index 3a43e48..426ccf0 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterEntity.java +++ b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterBuyerEntity.java @@ -10,21 +10,22 @@ import java.util.Date;import java.util.Date; /** *推广者 * @author quyixiao -* @since 2025-10-25 +* @since 2025-11-21 */ @Data -@TableName("vv_promoter") -public class VvPromoterEntity implements java.io.Serializable { +@TableName("vv_promoter_buyer") +public class VvPromoterBuyerEntity implements java.io.Serializable { private static final long serialVersionUID = 1L; - public final static String CLASS_NAME ="com.heyu.api.data.entity.vv.VvPromoterEntity:"; + public final static String CLASS_NAME ="com.heyu.api.data.entity.vv.VvPromoterBuyerEntity:"; 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 create_timestamp = CLASS_NAME + "create_timestamp"; // 时间毫秒值 public final static String promoter_id = CLASS_NAME + "promoter_id"; // 推广者id,唯一值 public final static String promoter_buyer_name = CLASS_NAME + "promoter_buyer_name"; // 推广者买家名称 public final static String promoter_buyer_weixin = CLASS_NAME + "promoter_buyer_weixin"; // 推广者买家微信 @@ -33,8 +34,7 @@ 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 was_promoter_buyer_id = CLASS_NAME + "was_promoter_buyer_id"; // 被推荐者买家id - public final static String create_timestamp = CLASS_NAME + "create_timestamp"; // 时间毫秒值 + public final static String was_buyer_id = CLASS_NAME + "was_buyer_id"; // 被推荐者买家id // @TableId(value = "id", type = IdType.AUTO) private Long id; @@ -44,6 +44,8 @@ private static final long serialVersionUID = 1L; private Date createTime; //修改时间 private Date modifyTime; + //时间毫秒值 + private Long createTimestamp; //推广者id,唯一值 private String promoterId; //推广者买家名称 @@ -61,9 +63,7 @@ private static final long serialVersionUID = 1L; //被推荐者手机号 private String wasBuyerPhone; //被推荐者买家id - private Long wasPromoterBuyerId; - //时间毫秒值 - private Long createTimestamp; + private Long wasBuyerId; /** * * @return @@ -124,6 +124,21 @@ private static final long serialVersionUID = 1L; this.modifyTime = modifyTime; } + /** + * 时间毫秒值 + * @return + */ + public Long getCreateTimestamp() { + return createTimestamp; + } + /** + * 时间毫秒值 + * @param createTimestamp + */ + public void setCreateTimestamp(Long createTimestamp) { + this.createTimestamp = createTimestamp; + } + /** * 推广者id,唯一值 * @return @@ -248,39 +263,25 @@ private static final long serialVersionUID = 1L; * 被推荐者买家id * @return */ - public Long getWasPromoterBuyerId() { - return wasPromoterBuyerId; + public Long getWasBuyerId() { + return wasBuyerId; } /** * 被推荐者买家id - * @param wasPromoterBuyerId + * @param wasBuyerId */ - public void setWasPromoterBuyerId(Long wasPromoterBuyerId) { - this.wasPromoterBuyerId = wasPromoterBuyerId; - } - - /** - * 时间毫秒值 - * @return - */ - public Long getCreateTimestamp() { - return createTimestamp; - } - /** - * 时间毫秒值 - * @param createTimestamp - */ - public void setCreateTimestamp(Long createTimestamp) { - this.createTimestamp = createTimestamp; + public void setWasBuyerId(Long wasBuyerId) { + this.wasBuyerId = wasBuyerId; } @Override public String toString() { - return "VvPromoterEntity{" + + return "VvPromoterBuyerEntity{" + ",id=" + id + ",isDelete=" + isDelete + ",createTime=" + createTime + ",modifyTime=" + modifyTime + + ",createTimestamp=" + createTimestamp + ",promoterId=" + promoterId + ",promoterBuyerName=" + promoterBuyerName + ",promoterBuyerWeixin=" + promoterBuyerWeixin + @@ -289,8 +290,7 @@ private static final long serialVersionUID = 1L; ",wasBuyerName=" + wasBuyerName + ",wasBuyerWeixin=" + wasBuyerWeixin + ",wasBuyerPhone=" + wasBuyerPhone + - ",wasPromoterBuyerId=" + wasPromoterBuyerId + - ",createTimestamp=" + createTimestamp + + ",wasBuyerId=" + wasBuyerId + "}"; } } \ 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/VvPromoterTradeOrderAwardEntity.java similarity index 79% rename from api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterAwardEntity.java rename to api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterTradeOrderAwardEntity.java index 3afc117..0af99a6 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/VvPromoterTradeOrderAwardEntity.java @@ -10,27 +10,26 @@ import java.util.Date;import java.util.Date; /** *推广者获得奖品名细 * @author quyixiao -* @since 2025-10-25 +* @since 2025-11-21 */ @Data -@TableName("vv_promoter_award") -public class VvPromoterAwardEntity implements java.io.Serializable { +@TableName("vv_promoter_trade_order_award") +public class VvPromoterTradeOrderAwardEntity implements java.io.Serializable { private static final long serialVersionUID = 1L; - public final static String CLASS_NAME ="com.heyu.api.data.entity.vv.VvPromoterAwardEntity:"; + public final static String CLASS_NAME ="com.heyu.api.data.entity.vv.VvPromoterTradeOrderAwardEntity:"; 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 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 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 status_ = CLASS_NAME + "status"; // create 创建, canceled 取消 , arrive,到账 // @TableId(value = "id", type = IdType.AUTO) private Long id; @@ -48,8 +47,6 @@ private static final long serialVersionUID = 1L; private Long activityId; //订单id private Long tradeOrderId; - //子订单id - private Long tradeOrderLineId; //create 创建, canceled 取消 , arrive,到账 private String status; /** @@ -172,21 +169,6 @@ private static final long serialVersionUID = 1L; 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 @@ -204,7 +186,7 @@ private static final long serialVersionUID = 1L; @Override public String toString() { - return "VvPromoterAwardEntity{" + + return "VvPromoterTradeOrderAwardEntity{" + ",id=" + id + ",isDelete=" + isDelete + ",createTime=" + createTime + @@ -213,7 +195,6 @@ private static final long serialVersionUID = 1L; ",awardAmount=" + awardAmount + ",activityId=" + activityId + ",tradeOrderId=" + tradeOrderId + - ",tradeOrderLineId=" + tradeOrderLineId + ",status=" + status + "}"; } 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/VvPromoterTradeOrderLineAwardEntity.java similarity index 97% rename from api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterAwardLineEntity.java rename to api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterTradeOrderLineAwardEntity.java index 72b64c0..068e90a 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/VvPromoterTradeOrderLineAwardEntity.java @@ -10,15 +10,15 @@ import java.util.Date;import java.util.Date; /** *推广者获得奖品名细子单 * @author quyixiao -* @since 2025-10-28 +* @since 2025-11-21 */ @Data -@TableName("vv_promoter_award_line") -public class VvPromoterAwardLineEntity implements java.io.Serializable { +@TableName("vv_promoter_trade_order_line_award") +public class VvPromoterTradeOrderLineAwardEntity implements java.io.Serializable { private static final long serialVersionUID = 1L; - public final static String CLASS_NAME ="com.heyu.api.data.entity.vv.VvPromoterAwardLineEntity:"; + public final static String CLASS_NAME ="com.heyu.api.data.entity.vv.VvPromoterTradeOrderLineAwardEntity:"; public final static String all = CLASS_NAME + "*"; public final static String id_ = CLASS_NAME + "id"; // @@ -402,7 +402,7 @@ private static final long serialVersionUID = 1L; @Override public String toString() { - return "VvPromoterAwardLineEntity{" + + return "VvPromoterTradeOrderLineAwardEntity{" + ",id=" + id + ",isDelete=" + isDelete + ",createTime=" + createTime + diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPromoterAwardLineServiceImpl.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPromoterAwardLineServiceImpl.java deleted file mode 100644 index 22e8063..0000000 --- a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPromoterAwardLineServiceImpl.java +++ /dev/null @@ -1,68 +0,0 @@ -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.VvPromoterAwardLineDao; -import com.heyu.api.data.entity.vv.VvPromoterAwardLineEntity; -import com.heyu.api.data.service.vv.VvPromoterAwardLineService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service -public class VvPromoterAwardLineServiceImpl extends ServiceImpl implements VvPromoterAwardLineService { - - - @Autowired - private VvPromoterAwardLineDao vvPromoterAwardLineDao; - - - - @Override - public VvPromoterAwardLineEntity selectVvPromoterAwardLineById(Long id){ - return vvPromoterAwardLineDao.selectVvPromoterAwardLineById(id); - } - - - - @Override - public Long insertVvPromoterAwardLine(VvPromoterAwardLineEntity vvPromoterAwardLine){ - return vvPromoterAwardLineDao.insertVvPromoterAwardLine(vvPromoterAwardLine); - } - - - - @Override - public Long insertOrUpdateVvPromoterAwardLine(VvPromoterAwardLineEntity vvPromoterAwardLine){ - return vvPromoterAwardLineDao.insertOrUpdateVvPromoterAwardLine(vvPromoterAwardLine); - } - - - - @Override - public int updateVvPromoterAwardLineById(VvPromoterAwardLineEntity vvPromoterAwardLine){ - return vvPromoterAwardLineDao.updateVvPromoterAwardLineById(vvPromoterAwardLine); - } - - - - @Override - public int updateCoverVvPromoterAwardLineById(VvPromoterAwardLineEntity vvPromoterAwardLine){ - return vvPromoterAwardLineDao.updateCoverVvPromoterAwardLineById(vvPromoterAwardLine); - } - - - - @Override - public int deleteVvPromoterAwardLineById(Long id){ - return vvPromoterAwardLineDao.deleteVvPromoterAwardLineById(id); - } - - - -} diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPromoterAwardServiceImpl.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPromoterAwardServiceImpl.java deleted file mode 100644 index a263f83..0000000 --- a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPromoterAwardServiceImpl.java +++ /dev/null @@ -1,68 +0,0 @@ -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.VvPromoterAwardDao; -import com.heyu.api.data.entity.vv.VvPromoterAwardEntity; -import com.heyu.api.data.service.vv.VvPromoterAwardService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service -public class VvPromoterAwardServiceImpl extends ServiceImpl implements VvPromoterAwardService { - - - @Autowired - private VvPromoterAwardDao vvPromoterAwardDao; - - - - @Override - public VvPromoterAwardEntity selectVvPromoterAwardById(Long id){ - return vvPromoterAwardDao.selectVvPromoterAwardById(id); - } - - - - @Override - public Long insertVvPromoterAward(VvPromoterAwardEntity vvPromoterAward){ - return vvPromoterAwardDao.insertVvPromoterAward(vvPromoterAward); - } - - - - @Override - public Long insertOrUpdateVvPromoterAward(VvPromoterAwardEntity vvPromoterAward){ - return vvPromoterAwardDao.insertOrUpdateVvPromoterAward(vvPromoterAward); - } - - - - @Override - public int updateVvPromoterAwardById(VvPromoterAwardEntity vvPromoterAward){ - return vvPromoterAwardDao.updateVvPromoterAwardById(vvPromoterAward); - } - - - - @Override - public int updateCoverVvPromoterAwardById(VvPromoterAwardEntity vvPromoterAward){ - return vvPromoterAwardDao.updateCoverVvPromoterAwardById(vvPromoterAward); - } - - - - @Override - public int deleteVvPromoterAwardById(Long id){ - return vvPromoterAwardDao.deleteVvPromoterAwardById(id); - } - - - -} diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPromoterBuyerServiceImpl.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPromoterBuyerServiceImpl.java new file mode 100644 index 0000000..152c3cd --- /dev/null +++ b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPromoterBuyerServiceImpl.java @@ -0,0 +1,68 @@ +package com.heyu.api.data.service.impl.vv; +/** +*

+* 推广者 服务类 +*

+* +* @author quyixiao +* @since 2025-11-21 +*/ + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.heyu.api.data.dao.vv.VvPromoterBuyerDao; +import com.heyu.api.data.entity.vv.VvPromoterBuyerEntity; +import com.heyu.api.data.service.vv.VvPromoterBuyerService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +@Service +public class VvPromoterBuyerServiceImpl extends ServiceImpl implements VvPromoterBuyerService { + + + @Autowired + private VvPromoterBuyerDao vvPromoterBuyerDao; + + + + @Override + public VvPromoterBuyerEntity selectVvPromoterBuyerById(Long id){ + return vvPromoterBuyerDao.selectVvPromoterBuyerById(id); + } + + + + @Override + public Long insertVvPromoterBuyer(VvPromoterBuyerEntity vvPromoterBuyer){ + return vvPromoterBuyerDao.insertVvPromoterBuyer(vvPromoterBuyer); + } + + + + @Override + public Long insertOrUpdateVvPromoterBuyer(VvPromoterBuyerEntity vvPromoterBuyer){ + return vvPromoterBuyerDao.insertOrUpdateVvPromoterBuyer(vvPromoterBuyer); + } + + + + @Override + public int updateVvPromoterBuyerById(VvPromoterBuyerEntity vvPromoterBuyer){ + return vvPromoterBuyerDao.updateVvPromoterBuyerById(vvPromoterBuyer); + } + + + + @Override + public int updateCoverVvPromoterBuyerById(VvPromoterBuyerEntity vvPromoterBuyer){ + return vvPromoterBuyerDao.updateCoverVvPromoterBuyerById(vvPromoterBuyer); + } + + + + @Override + public int deleteVvPromoterBuyerById(Long id){ + return vvPromoterBuyerDao.deleteVvPromoterBuyerById(id); + } + + + +} diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPromoterServiceImpl.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPromoterServiceImpl.java deleted file mode 100644 index b80c354..0000000 --- a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPromoterServiceImpl.java +++ /dev/null @@ -1,68 +0,0 @@ -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.VvPromoterDao; -import com.heyu.api.data.entity.vv.VvPromoterEntity; -import com.heyu.api.data.service.vv.VvPromoterService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -@Service -public class VvPromoterServiceImpl extends ServiceImpl implements VvPromoterService { - - - @Autowired - private VvPromoterDao vvPromoterDao; - - - - @Override - public VvPromoterEntity selectVvPromoterById(Long id){ - return vvPromoterDao.selectVvPromoterById(id); - } - - - - @Override - public Long insertVvPromoter(VvPromoterEntity vvPromoter){ - return vvPromoterDao.insertVvPromoter(vvPromoter); - } - - - - @Override - public Long insertOrUpdateVvPromoter(VvPromoterEntity vvPromoter){ - return vvPromoterDao.insertOrUpdateVvPromoter(vvPromoter); - } - - - - @Override - public int updateVvPromoterById(VvPromoterEntity vvPromoter){ - return vvPromoterDao.updateVvPromoterById(vvPromoter); - } - - - - @Override - public int updateCoverVvPromoterById(VvPromoterEntity vvPromoter){ - return vvPromoterDao.updateCoverVvPromoterById(vvPromoter); - } - - - - @Override - public int deleteVvPromoterById(Long id){ - return vvPromoterDao.deleteVvPromoterById(id); - } - - - -} diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPromoterTradeOrderAwardServiceImpl.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPromoterTradeOrderAwardServiceImpl.java new file mode 100644 index 0000000..4c46d95 --- /dev/null +++ b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPromoterTradeOrderAwardServiceImpl.java @@ -0,0 +1,68 @@ +package com.heyu.api.data.service.impl.vv; +/** +*

+* 推广者获得奖品名细 服务类 +*

+* +* @author quyixiao +* @since 2025-11-21 +*/ + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.heyu.api.data.dao.vv.VvPromoterTradeOrderAwardDao; +import com.heyu.api.data.entity.vv.VvPromoterTradeOrderAwardEntity; +import com.heyu.api.data.service.vv.VvPromoterTradeOrderAwardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +@Service +public class VvPromoterTradeOrderAwardServiceImpl extends ServiceImpl implements VvPromoterTradeOrderAwardService { + + + @Autowired + private VvPromoterTradeOrderAwardDao vvPromoterTradeOrderAwardDao; + + + + @Override + public VvPromoterTradeOrderAwardEntity selectVvPromoterTradeOrderAwardById(Long id){ + return vvPromoterTradeOrderAwardDao.selectVvPromoterTradeOrderAwardById(id); + } + + + + @Override + public Long insertVvPromoterTradeOrderAward(VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAward){ + return vvPromoterTradeOrderAwardDao.insertVvPromoterTradeOrderAward(vvPromoterTradeOrderAward); + } + + + + @Override + public Long insertOrUpdateVvPromoterTradeOrderAward(VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAward){ + return vvPromoterTradeOrderAwardDao.insertOrUpdateVvPromoterTradeOrderAward(vvPromoterTradeOrderAward); + } + + + + @Override + public int updateVvPromoterTradeOrderAwardById(VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAward){ + return vvPromoterTradeOrderAwardDao.updateVvPromoterTradeOrderAwardById(vvPromoterTradeOrderAward); + } + + + + @Override + public int updateCoverVvPromoterTradeOrderAwardById(VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAward){ + return vvPromoterTradeOrderAwardDao.updateCoverVvPromoterTradeOrderAwardById(vvPromoterTradeOrderAward); + } + + + + @Override + public int deleteVvPromoterTradeOrderAwardById(Long id){ + return vvPromoterTradeOrderAwardDao.deleteVvPromoterTradeOrderAwardById(id); + } + + + +} diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPromoterTradeOrderLineAwardServiceImpl.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPromoterTradeOrderLineAwardServiceImpl.java new file mode 100644 index 0000000..43ad798 --- /dev/null +++ b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPromoterTradeOrderLineAwardServiceImpl.java @@ -0,0 +1,68 @@ +package com.heyu.api.data.service.impl.vv; +/** +*

+* 推广者获得奖品名细子单 服务类 +*

+* +* @author quyixiao +* @since 2025-11-21 +*/ + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.heyu.api.data.dao.vv.VvPromoterTradeOrderLineAwardDao; +import com.heyu.api.data.entity.vv.VvPromoterTradeOrderLineAwardEntity; +import com.heyu.api.data.service.vv.VvPromoterTradeOrderLineAwardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +@Service +public class VvPromoterTradeOrderLineAwardServiceImpl extends ServiceImpl implements VvPromoterTradeOrderLineAwardService { + + + @Autowired + private VvPromoterTradeOrderLineAwardDao vvPromoterTradeOrderLineAwardDao; + + + + @Override + public VvPromoterTradeOrderLineAwardEntity selectVvPromoterTradeOrderLineAwardById(Long id){ + return vvPromoterTradeOrderLineAwardDao.selectVvPromoterTradeOrderLineAwardById(id); + } + + + + @Override + public Long insertVvPromoterTradeOrderLineAward(VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAward){ + return vvPromoterTradeOrderLineAwardDao.insertVvPromoterTradeOrderLineAward(vvPromoterTradeOrderLineAward); + } + + + + @Override + public Long insertOrUpdateVvPromoterTradeOrderLineAward(VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAward){ + return vvPromoterTradeOrderLineAwardDao.insertOrUpdateVvPromoterTradeOrderLineAward(vvPromoterTradeOrderLineAward); + } + + + + @Override + public int updateVvPromoterTradeOrderLineAwardById(VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAward){ + return vvPromoterTradeOrderLineAwardDao.updateVvPromoterTradeOrderLineAwardById(vvPromoterTradeOrderLineAward); + } + + + + @Override + public int updateCoverVvPromoterTradeOrderLineAwardById(VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAward){ + return vvPromoterTradeOrderLineAwardDao.updateCoverVvPromoterTradeOrderLineAwardById(vvPromoterTradeOrderLineAward); + } + + + + @Override + public int deleteVvPromoterTradeOrderLineAwardById(Long id){ + return vvPromoterTradeOrderLineAwardDao.deleteVvPromoterTradeOrderLineAwardById(id); + } + + + +} diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvPromoterAwardLineService.java b/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvPromoterAwardLineService.java deleted file mode 100644 index 6ef1d59..0000000 --- a/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvPromoterAwardLineService.java +++ /dev/null @@ -1,34 +0,0 @@ -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.VvPromoterAwardLineEntity; -public interface VvPromoterAwardLineService extends IService { - - - - VvPromoterAwardLineEntity selectVvPromoterAwardLineById(Long id); - - - Long insertVvPromoterAwardLine(VvPromoterAwardLineEntity vvPromoterAwardLine); - - - Long insertOrUpdateVvPromoterAwardLine(VvPromoterAwardLineEntity vvPromoterAwardLine); - - - int updateVvPromoterAwardLineById(VvPromoterAwardLineEntity vvPromoterAwardLine); - - - int updateCoverVvPromoterAwardLineById(VvPromoterAwardLineEntity vvPromoterAwardLine); - - - int deleteVvPromoterAwardLineById(Long id); - - -} \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvPromoterAwardService.java b/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvPromoterAwardService.java deleted file mode 100644 index eb70e30..0000000 --- a/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvPromoterAwardService.java +++ /dev/null @@ -1,34 +0,0 @@ -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.VvPromoterAwardEntity; -public interface VvPromoterAwardService extends IService { - - - - VvPromoterAwardEntity selectVvPromoterAwardById(Long id); - - - Long insertVvPromoterAward(VvPromoterAwardEntity vvPromoterAward); - - - Long insertOrUpdateVvPromoterAward(VvPromoterAwardEntity vvPromoterAward); - - - int updateVvPromoterAwardById(VvPromoterAwardEntity vvPromoterAward); - - - int updateCoverVvPromoterAwardById(VvPromoterAwardEntity vvPromoterAward); - - - int deleteVvPromoterAwardById(Long id); - - -} \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvPromoterBuyerService.java b/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvPromoterBuyerService.java new file mode 100644 index 0000000..98a824e --- /dev/null +++ b/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvPromoterBuyerService.java @@ -0,0 +1,34 @@ +package com.heyu.api.data.service.vv; +/** +*

+* 推广者 服务类 +*

+* +* @author quyixiao +* @since 2025-11-21 +*/ +import com.baomidou.mybatisplus.extension.service.IService; +import com.heyu.api.data.entity.vv.VvPromoterBuyerEntity; +public interface VvPromoterBuyerService extends IService { + + + + VvPromoterBuyerEntity selectVvPromoterBuyerById(Long id); + + + Long insertVvPromoterBuyer(VvPromoterBuyerEntity vvPromoterBuyer); + + + Long insertOrUpdateVvPromoterBuyer(VvPromoterBuyerEntity vvPromoterBuyer); + + + int updateVvPromoterBuyerById(VvPromoterBuyerEntity vvPromoterBuyer); + + + int updateCoverVvPromoterBuyerById(VvPromoterBuyerEntity vvPromoterBuyer); + + + int deleteVvPromoterBuyerById(Long id); + + +} \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvPromoterService.java b/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvPromoterService.java deleted file mode 100644 index b268fa4..0000000 --- a/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvPromoterService.java +++ /dev/null @@ -1,34 +0,0 @@ -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.VvPromoterEntity; -public interface VvPromoterService extends IService { - - - - VvPromoterEntity selectVvPromoterById(Long id); - - - Long insertVvPromoter(VvPromoterEntity vvPromoter); - - - Long insertOrUpdateVvPromoter(VvPromoterEntity vvPromoter); - - - int updateVvPromoterById(VvPromoterEntity vvPromoter); - - - int updateCoverVvPromoterById(VvPromoterEntity vvPromoter); - - - int deleteVvPromoterById(Long id); - - -} \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvPromoterTradeOrderAwardService.java b/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvPromoterTradeOrderAwardService.java new file mode 100644 index 0000000..8401e84 --- /dev/null +++ b/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvPromoterTradeOrderAwardService.java @@ -0,0 +1,34 @@ +package com.heyu.api.data.service.vv; +/** +*

+* 推广者获得奖品名细 服务类 +*

+* +* @author quyixiao +* @since 2025-11-21 +*/ +import com.baomidou.mybatisplus.extension.service.IService; +import com.heyu.api.data.entity.vv.VvPromoterTradeOrderAwardEntity; +public interface VvPromoterTradeOrderAwardService extends IService { + + + + VvPromoterTradeOrderAwardEntity selectVvPromoterTradeOrderAwardById(Long id); + + + Long insertVvPromoterTradeOrderAward(VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAward); + + + Long insertOrUpdateVvPromoterTradeOrderAward(VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAward); + + + int updateVvPromoterTradeOrderAwardById(VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAward); + + + int updateCoverVvPromoterTradeOrderAwardById(VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAward); + + + int deleteVvPromoterTradeOrderAwardById(Long id); + + +} \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvPromoterTradeOrderLineAwardService.java b/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvPromoterTradeOrderLineAwardService.java new file mode 100644 index 0000000..68db5e4 --- /dev/null +++ b/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvPromoterTradeOrderLineAwardService.java @@ -0,0 +1,34 @@ +package com.heyu.api.data.service.vv; +/** +*

+* 推广者获得奖品名细子单 服务类 +*

+* +* @author quyixiao +* @since 2025-11-21 +*/ +import com.baomidou.mybatisplus.extension.service.IService; +import com.heyu.api.data.entity.vv.VvPromoterTradeOrderLineAwardEntity; +public interface VvPromoterTradeOrderLineAwardService extends IService { + + + + VvPromoterTradeOrderLineAwardEntity selectVvPromoterTradeOrderLineAwardById(Long id); + + + Long insertVvPromoterTradeOrderLineAward(VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAward); + + + Long insertOrUpdateVvPromoterTradeOrderLineAward(VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAward); + + + int updateVvPromoterTradeOrderLineAwardById(VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAward); + + + int updateCoverVvPromoterTradeOrderLineAwardById(VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAward); + + + int deleteVvPromoterTradeOrderLineAwardById(Long id); + + +} \ No newline at end of file diff --git a/api-mapper/src/main/resources/mapper/vv/VvPromoterBuyerDao.xml b/api-mapper/src/main/resources/mapper/vv/VvPromoterBuyerDao.xml new file mode 100644 index 0000000..e572963 --- /dev/null +++ b/api-mapper/src/main/resources/mapper/vv/VvPromoterBuyerDao.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/api-mapper/src/main/resources/mapper/vv/VvPromoterTradeOrderAwardDao.xml b/api-mapper/src/main/resources/mapper/vv/VvPromoterTradeOrderAwardDao.xml new file mode 100644 index 0000000..7ea1734 --- /dev/null +++ b/api-mapper/src/main/resources/mapper/vv/VvPromoterTradeOrderAwardDao.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/api-mapper/src/main/resources/mapper/vv/VvPromoterTradeOrderLineAwardDao.xml b/api-mapper/src/main/resources/mapper/vv/VvPromoterTradeOrderLineAwardDao.xml new file mode 100644 index 0000000..56ccd4d --- /dev/null +++ b/api-mapper/src/main/resources/mapper/vv/VvPromoterTradeOrderLineAwardDao.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 f916f31..3ea49b5 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,9 @@ public class MysqlMain_insert { List list = new ArrayList(); - list.add(new TablesBean("vv_trade_order_line_status_log")); + list.add(new TablesBean("vv_promoter_buyer")); + list.add(new TablesBean("vv_promoter_trade_order_award")); + list.add(new TablesBean("vv_promoter_trade_order_line_award")); List list2 = new ArrayList(); diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvPromoterRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvPromoterBuyerRequest.java similarity index 90% rename from api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvPromoterRequest.java rename to api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvPromoterBuyerRequest.java index 3ef7677..55ad66c 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvPromoterRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvPromoterBuyerRequest.java @@ -4,7 +4,7 @@ package com.heyu.api.alibaba.request.mm; import lombok.Data; @Data -public class VvPromoterRequest extends VVAdminBaseRequest { +public class VvPromoterBuyerRequest extends VVAdminBaseRequest { //推广者id,唯一值 private String promoterId; diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvBuyerDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvBuyerDTO.java index d346744..6fad1fd 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvBuyerDTO.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvBuyerDTO.java @@ -2,7 +2,6 @@ package com.heyu.api.alibaba.request.mm.order; import com.heyu.api.data.entity.vv.VvBuyerAddressEntity; import com.heyu.api.data.entity.vv.VvBuyerEntity; -import com.heyu.api.data.entity.vv.VvPromoterEntity; import lombok.Data; import java.util.List; @@ -16,9 +15,6 @@ public class VvBuyerDTO extends VvBuyerEntity { */ private List vvBuyerAddressEntityList; - /*** - * 推荐者信息 - */ - private List vvPromoterList; + } diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminBuyerController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminBuyerController.java index 2bee0fa..a58daf8 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminBuyerController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminBuyerController.java @@ -3,21 +3,17 @@ package com.heyu.api.controller.mm; import com.baomidou.mybatisplus.core.metadata.IPage; import com.heyu.api.alibaba.request.mm.VvBuyerRequest; -import com.heyu.api.alibaba.request.mm.order.VvBuyerDTO; import com.heyu.api.common.annotation.Describe; import com.heyu.api.data.dao.vv.VvBuyerAddressDao; import com.heyu.api.data.dao.vv.VvBuyerDao; -import com.heyu.api.data.dao.vv.VvPromoterDao; import com.heyu.api.data.entity.vv.VvBuyerAddressEntity; import com.heyu.api.data.entity.vv.VvBuyerEntity; -import com.heyu.api.data.entity.vv.VvPromoterEntity; import com.heyu.api.data.utils.R; import com.heyu.api.data.utils.SanUtils; 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.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -40,8 +36,8 @@ public class AdminBuyerController { private VvBuyerAddressDao vvBuyerAddressDao; - @Autowired - private VvPromoterDao vvPromoterDao; + //@Autowired + //private VvPromoterDao vvPromoterDao; /*** * 列表 @@ -87,23 +83,23 @@ public class AdminBuyerController { List vvBuyerAddressEntities = vvBuyerAddressDao.selectMapByBuyerIds(buyerIds); Map> listMap = SanUtils.groupByFiled2MapList(vvBuyerAddressEntities, VvBuyerAddressEntity::getBuyerId); - List vvPromoterEntities = vvPromoterDao.selectVvPromoterByPromoteIds(promoterIds); - Map> vvPromoterGroupBy = SanUtils.groupByFiled2MapList(vvPromoterEntities, VvPromoterEntity::getPromoterId); - List buyerDTOs = new ArrayList<>(); - for (VvBuyerEntity vvBuyerAddressEntity : vvBuyerEntities) { - VvBuyerDTO vvBuyerDTO = new VvBuyerDTO(); - BeanUtils.copyProperties(vvBuyerAddressEntity, vvBuyerDTO); - vvBuyerDTO.setVvBuyerAddressEntityList(listMap.get(vvBuyerDTO.getId())); + //List vvPromoterEntities = vvPromoterDao.selectVvPromoterByPromoteIds(promoterIds); + //Map> vvPromoterGroupBy = SanUtils.groupByFiled2MapList(vvPromoterEntities, VvPromoterEntity::getPromoterId); + //List buyerDTOs = new ArrayList<>(); + //for (VvBuyerEntity vvBuyerAddressEntity : vvBuyerEntities) { + // VvBuyerDTO vvBuyerDTO = new VvBuyerDTO(); + // BeanUtils.copyProperties(vvBuyerAddressEntity, vvBuyerDTO); + // vvBuyerDTO.setVvBuyerAddressEntityList(listMap.get(vvBuyerDTO.getId())); - // 获取买家推荐者信息 - if (StringUtils.isNotEmpty(vvBuyerDTO.getPromoterId())) { - vvBuyerDTO.setVvPromoterList(vvPromoterGroupBy.get(vvBuyerDTO.getPromoterId())); - } + // // 获取买家推荐者信息 + // if (StringUtils.isNotEmpty(vvBuyerDTO.getPromoterId())) { + // vvBuyerDTO.setVvPromoterList(vvPromoterGroupBy.get(vvBuyerDTO.getPromoterId())); + // } - buyerDTOs.add(vvBuyerDTO); - } + // buyerDTOs.add(vvBuyerDTO); + //} - pageUtils.setRows(buyerDTOs); + //pageUtils.setRows(buyerDTOs); return R.ok().setData(pageUtils); } diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminDrawCashRecordController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminDrawCashRecordController.java index 685d2ac..df37d9f 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminDrawCashRecordController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminDrawCashRecordController.java @@ -9,7 +9,6 @@ import com.heyu.api.common.annotation.Describe; import com.heyu.api.data.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; @@ -36,8 +35,8 @@ public class AdminDrawCashRecordController { @Autowired private VvBuyerDao vvBuyerDao; - @Autowired - private VvPromoterAwardLineDao vvPromoterAwardLineDao; + //@Autowired + //private VvPromoterAwardLineDao vvPromoterAwardLineDao; /*** * 奖励 列表 diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterAwardLineController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterAwardLineController.java index 373cee4..455876e 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterAwardLineController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterAwardLineController.java @@ -4,12 +4,10 @@ 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.common.annotation.Describe; -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; @@ -22,8 +20,6 @@ import java.util.List; public class AdminPromoterAwardLineController { - @Autowired - private VvPromoterAwardLineDao vvPromoterAwardLineDao; /*** * 奖励 列表 @@ -36,16 +32,17 @@ public class AdminPromoterAwardLineController { .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 vvPromoterAwardLineDao.selectByCondition(page, + // vvPromoterRequest.getPromoterId(), + // vvPromoterRequest.getPromoterBuyerId(), + // vvPromoterRequest.getPromoterBuyerName(), + // vvPromoterRequest.getPromoterBuyerWeixin(), + // vvPromoterRequest.getPromoterBuyerPhone(), + // vvPromoterRequest.getMinCreateTimestamp(), + // vvPromoterRequest.getMaxCreateTimestamp(), + // vvPromoterRequest.getCreateTimestampSort() + //); + return null; } }); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterController.java index a09d760..5ba247f 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterController.java @@ -3,9 +3,9 @@ package com.heyu.api.controller.mm; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.heyu.api.alibaba.request.mm.VvPromoterRequest; +import com.heyu.api.alibaba.request.mm.VvPromoterBuyerRequest; import com.heyu.api.common.annotation.Describe; -import com.heyu.api.data.dao.vv.VvPromoterDao; +import com.heyu.api.data.dao.vv.VvPromoterBuyerDao; import com.heyu.api.data.utils.R; import com.heyu.api.utils.ISelect; import com.heyu.api.utils.PPageUtils; @@ -19,25 +19,25 @@ import java.util.List; @Slf4j @RestController -@RequestMapping("/mm/promoter") +@RequestMapping("/mm/promoter/buyer") public class AdminPromoterController { @Autowired - private VvPromoterDao vvPromoterDao; + private VvPromoterBuyerDao vvPromoterBuyerDao; /*** * 列表 - * http://localhost:8888/mm/promoter/list + * http://localhost:8888/mm/promoter/buyer/list */ @Describe("推广者列表") @RequestMapping("/list") - public R list(@RequestBody VvPromoterRequest vvPromoterRequest) { + public R list(@RequestBody VvPromoterBuyerRequest vvPromoterRequest) { PPageUtils pageUtils = PPageUtils.startPage(vvPromoterRequest.getPageNum(), vvPromoterRequest.getPageSize()) .doSelect(new ISelect() { @Override public List doSelect(IPage page) { - return vvPromoterDao.selectBuyerByCondition(page, + return vvPromoterBuyerDao.selectBuyerByCondition(page, vvPromoterRequest.getPromoterId(), vvPromoterRequest.getPromoterBuyerId(), vvPromoterRequest.getPromoterBuyerName(), @@ -49,7 +49,6 @@ public class AdminPromoterController { ); } }); - return R.ok().setData(pageUtils); } } \ No newline at end of file diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterAwardLineController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterAwardLineController.java index 132544e..b09bce5 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterAwardLineController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterAwardLineController.java @@ -5,12 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.heyu.api.alibaba.request.mm.VvPromoterLineRequest; import com.heyu.api.common.annotation.AppLogin; import com.heyu.api.common.annotation.Describe; -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; @@ -24,8 +22,7 @@ import java.util.List; public class AppPromoterAwardLineController { - @Autowired - private VvPromoterAwardLineDao vvPromoterAwardLineDao; + /*** * 奖励 列表 @@ -38,12 +35,13 @@ public class AppPromoterAwardLineController { .doSelect(new ISelect() { @Override public List doSelect(IPage page) { - return vvPromoterAwardLineDao.selectByAppCondition(page, - vvPromoterRequest.getPromoterBuyerId(), - vvPromoterRequest.getMinCreateTimestamp(), - vvPromoterRequest.getMaxCreateTimestamp(), - vvPromoterRequest.getCreateTimestampSort() - ); + // return vvPromoterAwardLineDao.selectByAppCondition(page, + // vvPromoterRequest.getPromoterBuyerId(), + // vvPromoterRequest.getMinCreateTimestamp(), + // vvPromoterRequest.getMaxCreateTimestamp(), + // vvPromoterRequest.getCreateTimestampSort() + // ); + return null; } }); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterController.java index c38da21..0c66398 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterController.java @@ -6,12 +6,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.heyu.api.alibaba.request.vv.AppPromoterRequest; import com.heyu.api.common.annotation.AppLogin; import com.heyu.api.common.annotation.Describe; -import com.heyu.api.data.dao.vv.VvPromoterDao; 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; @@ -25,8 +23,8 @@ import java.util.List; public class AppPromoterController { - @Autowired - private VvPromoterDao vvPromoterDao; + //@Autowired + //private VvPromoterDao vvPromoterDao; /*** * 列表 @@ -39,12 +37,13 @@ public class AppPromoterController { .doSelect(new ISelect() { @Override public List doSelect(IPage page) { - return vvPromoterDao.selectAppByCondition(page, - request.getBuyerId(), - request.getMinCreateTimestamp(), - request.getMaxCreateTimestamp(), - request.getCreateTimestampSort() - ); + // return vvPromoterDao.selectAppByCondition(page, + // request.getBuyerId(), + // request.getMinCreateTimestamp(), + // request.getMaxCreateTimestamp(), + // request.getCreateTimestampSort() + // ); + return null; } }); return R.ok().setData(pageUtils);