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-11-21 12:52:12 +08:00
parent 13a8ea3dea
commit be108bce47
9 changed files with 500 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterTradeOrderAwardDao.java
View File

@ -7,10 +7,20 @@ 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 com.baomidou.mybatisplus.core.metadata.IPage;
import com.heyu.api.data.entity.vv.VvBuyerEntity;
import com.heyu.api.data.entity.vv.VvPromoterTradeOrderAwardEntity;
import com.lz.mybatis.plugin.annotations.Column;
import com.lz.mybatis.plugin.annotations.GE;
import com.lz.mybatis.plugin.annotations.IF;
import com.lz.mybatis.plugin.annotations.LE;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface VvPromoterTradeOrderAwardDao extends BaseMapper<VvPromoterTradeOrderAwardEntity> {
@ -27,10 +37,23 @@ public interface VvPromoterTradeOrderAwardDao extends BaseMapper<VvPromoterTrade
int updateVvPromoterTradeOrderAwardById(VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAward);
int updateCoverVvPromoterTradeOrderAwardById(VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAward);
int updateCoverVvPromoterTradeOrderAwardById(VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAward);
int deleteVvPromoterTradeOrderAwardById(@Param("id")Long id);
int deleteVvPromoterTradeOrderAwardById(@Param("id") Long id);
List<VvPromoterTradeOrderAwardEntity> selectAdminByCondition(IPage page,
@IF String promoterId,
@IF Long promoterBuyerId,
@IF String promoterBuyerName,
@IF String promoterBuyerWeixin,
@IF String promoterBuyerPhone,
@IF Long wasBuyerId,
@IF String wasBuyerName,
@IF String wasBuyerWeixin,
@IF String wasBuyerPhone,
@IF @GE @Column(VvBuyerEntity.create_timestamp) Long minCreateTimestamp,
@IF @LE @Column(VvBuyerEntity.create_timestamp) Long maxCreateTimestamp,
@IF @Column(VvBuyerEntity.create_timestamp) String createTimestampSort
);
}

11
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterTradeOrderLineAwardDao.java
View File

@ -9,8 +9,12 @@ package com.heyu.api.data.dao.vv;
*/
import com.heyu.api.data.entity.vv.VvPromoterTradeOrderLineAwardEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.lz.mybatis.plugin.annotations.IN;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface VvPromoterTradeOrderLineAwardDao extends BaseMapper<VvPromoterTradeOrderLineAwardEntity> {
@ -24,13 +28,14 @@ public interface VvPromoterTradeOrderLineAwardDao extends BaseMapper<VvPromoterT
Long insertOrUpdateVvPromoterTradeOrderLineAward(VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAward);
int updateVvPromoterTradeOrderLineAwardById(VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAward);
int updateVvPromoterTradeOrderLineAwardById(VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAward);
int updateCoverVvPromoterTradeOrderLineAwardById(VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAward);
int updateCoverVvPromoterTradeOrderLineAwardById(VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAward);
int deleteVvPromoterTradeOrderLineAwardById(@Param("id")Long id);
int deleteVvPromoterTradeOrderLineAwardById(@Param("id") Long id);
List<VvPromoterTradeOrderLineAwardEntity> selectVvPromoterTradeOrderLineAwardByIdList(@IN List<String> promoterId);
}

269
api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterTradeOrderAwardEntity.java
View File

@ -8,7 +8,7 @@ import com.lz.mybatis.plugin.annotations.AS;
import java.math.BigDecimal;
import java.util.Date;import java.util.Date;
/**
*推广者获得奖品名细
*推广者获得奖品名细子单
* @author quyixiao
* @since 2025-11-21
*/
@ -21,15 +21,26 @@ private static final long serialVersionUID = 1L;
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 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 create_timestamp = CLASS_NAME + "create_timestamp"; // 创建时间戳
public final static String modify_timestamp = CLASS_NAME + "modify_timestamp"; // 修改时间
public final static String activity_id = CLASS_NAME + "activity_id"; // 活动id
public final static String activity_name = CLASS_NAME + "activity_name"; // 活动名称
public final static String award_amount = CLASS_NAME + "award_amount"; // 奖励金额
public final static String promoter_id = CLASS_NAME + "promoter_id"; // 推广者id，唯一值
public final static String promoter_buyer_id = CLASS_NAME + "promoter_buyer_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"; // 买家微信
public final static String promoter_buyer_phone = CLASS_NAME + "promoter_buyer_phone"; // 买家手机号
public final static String was_buyer_id = CLASS_NAME + "was_buyer_id"; // 被推荐者买家id
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 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;
@ -39,12 +50,34 @@ private static final long serialVersionUID = 1L;
private Date createTime;
//修改时间
private Date modifyTime;
//推广者id，唯一值
private String promoterId;
//金额
private BigDecimal awardAmount;
//创建时间戳
private Long createTimestamp;
//修改时间
private Long modifyTimestamp;
//活动id
private Long activityId;
//活动名称
private String activityName;
//奖励金额
private BigDecimal awardAmount;
//推广者id，唯一值
private String promoterId;
//
private Long promoterBuyerId;
//买家名称
private String promoterBuyerName;
//买家微信
private String promoterBuyerWeixin;
//买家手机号
private String promoterBuyerPhone;
//被推荐者买家id
private Long wasBuyerId;
//被推荐者买家名称
private String wasBuyerName;
//被推荐者买家微信
private String wasBuyerWeixin;
//被推荐者买家手机号
private String wasBuyerPhone;
//订单id
private Long tradeOrderId;
//create 创建, canceled 取消 , arrive，到账
@ -110,33 +143,33 @@ 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 getAwardAmount() {
return awardAmount;
public Long getModifyTimestamp() {
return modifyTimestamp;
}
/**
* 金额
* @param awardAmount
* 修改时间
* @param modifyTimestamp
*/
public void setAwardAmount(BigDecimal awardAmount) {
this.awardAmount = awardAmount;
public void setModifyTimestamp(Long modifyTimestamp) {
this.modifyTimestamp = modifyTimestamp;
}
/**
@ -154,6 +187,171 @@ private static final long serialVersionUID = 1L;
this.activityId = activityId;
}
/**
* 活动名称
* @return
*/
public String getActivityName() {
return activityName;
}
/**
* 活动名称
* @param activityName
*/
public void setActivityName(String activityName) {
this.activityName = activityName;
}
/**
* 奖励金额
* @return
*/
public BigDecimal getAwardAmount() {
return awardAmount;
}
/**
* 奖励金额
* @param awardAmount
*/
public void setAwardAmount(BigDecimal awardAmount) {
this.awardAmount = awardAmount;
}
/**
* 推广者id，唯一值
* @return
*/
public String getPromoterId() {
return promoterId;
}
/**
* 推广者id，唯一值
* @param promoterId
*/
public void setPromoterId(String promoterId) {
this.promoterId = promoterId;
}
/**
*
* @return
*/
public Long getPromoterBuyerId() {
return promoterBuyerId;
}
/**
*
* @param promoterBuyerId
*/
public void setPromoterBuyerId(Long promoterBuyerId) {
this.promoterBuyerId = promoterBuyerId;
}
/**
* 买家名称
* @return
*/
public String getPromoterBuyerName() {
return promoterBuyerName;
}
/**
* 买家名称
* @param promoterBuyerName
*/
public void setPromoterBuyerName(String promoterBuyerName) {
this.promoterBuyerName = promoterBuyerName;
}
/**
* 买家微信
* @return
*/
public String getPromoterBuyerWeixin() {
return promoterBuyerWeixin;
}
/**
* 买家微信
* @param promoterBuyerWeixin
*/
public void setPromoterBuyerWeixin(String promoterBuyerWeixin) {
this.promoterBuyerWeixin = promoterBuyerWeixin;
}
/**
* 买家手机号
* @return
*/
public String getPromoterBuyerPhone() {
return promoterBuyerPhone;
}
/**
* 买家手机号
* @param promoterBuyerPhone
*/
public void setPromoterBuyerPhone(String promoterBuyerPhone) {
this.promoterBuyerPhone = promoterBuyerPhone;
}
/**
* 被推荐者买家id
* @return
*/
public Long getWasBuyerId() {
return wasBuyerId;
}
/**
* 被推荐者买家id
* @param wasBuyerId
*/
public void setWasBuyerId(Long wasBuyerId) {
this.wasBuyerId = wasBuyerId;
}
/**
* 被推荐者买家名称
* @return
*/
public String getWasBuyerName() {
return wasBuyerName;
}
/**
* 被推荐者买家名称
* @param wasBuyerName
*/
public void setWasBuyerName(String wasBuyerName) {
this.wasBuyerName = wasBuyerName;
}
/**
* 被推荐者买家微信
* @return
*/
public String getWasBuyerWeixin() {
return wasBuyerWeixin;
}
/**
* 被推荐者买家微信
* @param wasBuyerWeixin
*/
public void setWasBuyerWeixin(String wasBuyerWeixin) {
this.wasBuyerWeixin = wasBuyerWeixin;
}
/**
* 被推荐者买家手机号
* @return
*/
public String getWasBuyerPhone() {
return wasBuyerPhone;
}
/**
* 被推荐者买家手机号
* @param wasBuyerPhone
*/
public void setWasBuyerPhone(String wasBuyerPhone) {
this.wasBuyerPhone = wasBuyerPhone;
}
/**
* 订单id
* @return
@ -191,9 +389,20 @@ private static final long serialVersionUID = 1L;
",isDelete=" + isDelete +
",createTime=" + createTime +
",modifyTime=" + modifyTime +
",promoterId=" + promoterId +
",awardAmount=" + awardAmount +
",createTimestamp=" + createTimestamp +
",modifyTimestamp=" + modifyTimestamp +
",activityId=" + activityId +
",activityName=" + activityName +
",awardAmount=" + awardAmount +
",promoterId=" + promoterId +
",promoterBuyerId=" + promoterBuyerId +
",promoterBuyerName=" + promoterBuyerName +
",promoterBuyerWeixin=" + promoterBuyerWeixin +
",promoterBuyerPhone=" + promoterBuyerPhone +
",wasBuyerId=" + wasBuyerId +
",wasBuyerName=" + wasBuyerName +
",wasBuyerWeixin=" + wasBuyerWeixin +
",wasBuyerPhone=" + wasBuyerPhone +
",tradeOrderId=" + tradeOrderId +
",status=" + status +
"}";

131
api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterTradeOrderLineAwardEntity.java
View File

@ -21,27 +21,28 @@ private static final long serialVersionUID = 1L;
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"; //
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 award_amount = CLASS_NAME + "award_amount"; // 奖励金额
public final static String activity_id = CLASS_NAME + "activity_id"; // 活动id
public final static String activity_name = CLASS_NAME + "activity_name"; // 活动名称
public final static String promoter_id = CLASS_NAME + "promoter_id"; // 推广者id，唯一值
public final static String promoter_buyer_id = CLASS_NAME + "promoter_buyer_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"; // 买家微信
public final static String promoter_buyer_phone = CLASS_NAME + "promoter_buyer_phone"; // 买家手机号
public final static String was_buyer_id = CLASS_NAME + "was_buyer_id"; // 被推荐者买家id
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 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"; // 创建时间戳
public final static String promoter_award_id = CLASS_NAME + "promoter_award_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 modify_timestamp = CLASS_NAME + "modify_timestamp"; // 修改时间
public final static String activity_id = CLASS_NAME + "activity_id"; // 活动id
public final static String activity_name = CLASS_NAME + "activity_name"; // 活动名称
public final static String promoter_id = CLASS_NAME + "promoter_id"; // 推广者id，唯一值
public final static String promoter_buyer_id = CLASS_NAME + "promoter_buyer_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"; // 买家微信
public final static String promoter_buyer_phone = CLASS_NAME + "promoter_buyer_phone"; // 买家手机号
public final static String was_buyer_id = CLASS_NAME + "was_buyer_id"; // 被推荐者买家id
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 award_amount = CLASS_NAME + "award_amount"; // 奖励金额
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 promoter_trade_order_award_id = CLASS_NAME + "promoter_trade_order_award_id"; // 推荐id
//
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@ -51,8 +52,10 @@ private static final long serialVersionUID = 1L;
private Date createTime;
//修改时间
private Date modifyTime;
//奖励金额
private BigDecimal awardAmount;
//创建时间戳
private Long createTimestamp;
//修改时间
private Long modifyTimestamp;
//活动id
private Long activityId;
//活动名称
@ -75,16 +78,16 @@ private static final long serialVersionUID = 1L;
private String wasBuyerWeixin;
//被推荐者买家手机号
private String wasBuyerPhone;
//奖励金额
private BigDecimal awardAmount;
//订单id
private Long tradeOrderId;
//子订单id
private Long tradeOrderLineId;
//create 创建, canceled 取消 , arrive，到账
private String status;
//创建时间戳
private Long createTimestamp;
//推荐id
private Long promoterAwardId;
private Long promoterTradeOrderAwardId;
/**
*
* @return
@ -146,18 +149,33 @@ private static final long serialVersionUID = 1L;
}
/**
* 奖励金额
* 创建时间戳
* @return
*/
public BigDecimal getAwardAmount() {
return awardAmount;
public Long getCreateTimestamp() {
return createTimestamp;
}
/**
* 奖励金额
* @param awardAmount
* 创建时间戳
* @param createTimestamp
*/
public void setAwardAmount(BigDecimal awardAmount) {
this.awardAmount = awardAmount;
public void setCreateTimestamp(Long createTimestamp) {
this.createTimestamp = createTimestamp;
}
/**
* 修改时间
* @return
*/
public Long getModifyTimestamp() {
return modifyTimestamp;
}
/**
* 修改时间
* @param modifyTimestamp
*/
public void setModifyTimestamp(Long modifyTimestamp) {
this.modifyTimestamp = modifyTimestamp;
}
/**
@ -325,6 +343,21 @@ private static final long serialVersionUID = 1L;
this.wasBuyerPhone = wasBuyerPhone;
}
/**
* 奖励金额
* @return
*/
public BigDecimal getAwardAmount() {
return awardAmount;
}
/**
* 奖励金额
* @param awardAmount
*/
public void setAwardAmount(BigDecimal awardAmount) {
this.awardAmount = awardAmount;
}
/**
* 订单id
* @return
@ -370,34 +403,19 @@ 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;
}
/**
* 推荐id
* @return
*/
public Long getPromoterAwardId() {
return promoterAwardId;
public Long getPromoterTradeOrderAwardId() {
return promoterTradeOrderAwardId;
}
/**
* 推荐id
* @param promoterAwardId
* @param promoterTradeOrderAwardId
*/
public void setPromoterAwardId(Long promoterAwardId) {
this.promoterAwardId = promoterAwardId;
public void setPromoterTradeOrderAwardId(Long promoterTradeOrderAwardId) {
this.promoterTradeOrderAwardId = promoterTradeOrderAwardId;
}
@Override
@ -407,7 +425,8 @@ private static final long serialVersionUID = 1L;
",isDelete=" + isDelete +
",createTime=" + createTime +
",modifyTime=" + modifyTime +
",awardAmount=" + awardAmount +
",createTimestamp=" + createTimestamp +
",modifyTimestamp=" + modifyTimestamp +
",activityId=" + activityId +
",activityName=" + activityName +
",promoterId=" + promoterId +
@ -419,11 +438,11 @@ private static final long serialVersionUID = 1L;
",wasBuyerName=" + wasBuyerName +
",wasBuyerWeixin=" + wasBuyerWeixin +
",wasBuyerPhone=" + wasBuyerPhone +
",awardAmount=" + awardAmount +
",tradeOrderId=" + tradeOrderId +
",tradeOrderLineId=" + tradeOrderLineId +
",status=" + status +
",createTimestamp=" + createTimestamp +
",promoterAwardId=" + promoterAwardId +
",promoterTradeOrderAwardId=" + promoterTradeOrderAwardId +
"}";
}
}

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

@ -49,7 +49,8 @@ public class MysqlMain_update {
List<TablesBean> list = new ArrayList<TablesBean>();
list.add(new TablesBean("vv_trade_order_line"));
list.add(new TablesBean("vv_promoter_trade_order_award"));
list.add(new TablesBean("vv_promoter_trade_order_line_award"));

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

@ -0,0 +1,43 @@
package com.heyu.api.alibaba.request.mm;
import lombok.Data;
@Data
public class VvPromoterTradeOrderRequest extends VVAdminBaseRequest {
//推广者id，唯一值
private String promoterId;
//订单id
private Long tradeOrderId;
//create 创建, canceled 取消 , arrive，到账
private String status;
//
private Long promoterBuyerId;
//买家名称
private String promoterBuyerName;
//买家微信
private String promoterBuyerWeixin;
//买家手机号
private String promoterBuyerPhone;
//被推荐者买家id
private Long wasBuyerId;
//被推荐者买家名称
private String wasBuyerName;
//被推荐者买家微信
private String wasBuyerWeixin;
//被推荐者买家手机号
private String wasBuyerPhone;
//创建时间撮
private Long minCreateTimestamp;
// 创建时间最小值
private Long maxCreateTimestamp;
/***
* 按创建时间排序,，传 ASC 或 DESC
*/
private String createTimestampSort;
}

19
api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/PromoterTradeOrderAwardDTO.java Normal file
View File

@ -0,0 +1,19 @@
package com.heyu.api.alibaba.request.mm.order;
import com.heyu.api.data.entity.vv.VvPromoterTradeOrderAwardEntity;
import com.heyu.api.data.entity.vv.VvPromoterTradeOrderLineAwardEntity;
import lombok.Data;
import java.util.List;
@Data
public class PromoterTradeOrderAwardDTO extends VvPromoterTradeOrderAwardEntity {
private List<VvPromoterTradeOrderLineAwardEntity> vvPromoterTradeOrderLineAwardEntityList;
}

2
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterController.java → api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterBuyerController.java
View File

@ -20,7 +20,7 @@ import java.util.List;
@Slf4j
@RestController
@RequestMapping("/mm/promoter/buyer")
public class AdminPromoterController {
public class AdminPromoterBuyerController {
@Autowired
private VvPromoterBuyerDao vvPromoterBuyerDao;

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

@ -0,0 +1,86 @@
package com.heyu.api.controller.mm;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.heyu.api.alibaba.request.mm.VvPromoterTradeOrderRequest;
import com.heyu.api.alibaba.request.mm.order.PromoterTradeOrderAwardDTO;
import com.heyu.api.common.annotation.Describe;
import com.heyu.api.data.dao.vv.VvPromoterTradeOrderAwardDao;
import com.heyu.api.data.dao.vv.VvPromoterTradeOrderLineAwardDao;
import com.heyu.api.data.entity.vv.VvPromoterTradeOrderAwardEntity;
import com.heyu.api.data.entity.vv.VvPromoterTradeOrderLineAwardEntity;
import com.heyu.api.data.utils.R;
import com.heyu.api.data.utils.SanUtils;
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;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
@Slf4j
@RestController
@RequestMapping("/mm/promoter/trade/order")
public class AdminPromoterTradeOrderController {
@Autowired
private VvPromoterTradeOrderAwardDao vvPromoterTradeOrderAwardDao;
@Autowired
private VvPromoterTradeOrderLineAwardDao vvPromoterTradeOrderLineAwardDao;
/***
* 列表
* http://localhost:8888/mm/promoter/trade/order/list
*/
@Describe("推广者列表")
@RequestMapping("/list")
public R list(@RequestBody VvPromoterTradeOrderRequest request) {
PPageUtils pageUtils = PPageUtils.startPage(request.getPageNum(), request.getPageSize())
.doSelect(new ISelect() {
@Override
public List doSelect(IPage page) {
return vvPromoterTradeOrderAwardDao.selectAdminByCondition(page,
request.getPromoterId(),
request.getPromoterBuyerId(),
request.getPromoterBuyerName(),
request.getPromoterBuyerWeixin(),
request.getPromoterBuyerPhone(),
request.getWasBuyerId(),
request.getWasBuyerName(),
request.getWasBuyerWeixin(),
request.getWasBuyerPhone(),
request.getMinCreateTimestamp(),
request.getMaxCreateTimestamp(),
request.getCreateTimestampSort()
);
}
});
List<VvPromoterTradeOrderAwardEntity> vvPromoterTradeOrderAwardEntities = pageUtils.getRows();
List<String> promoterIdList = SanUtils.list2FieldList(vvPromoterTradeOrderAwardEntities, VvPromoterTradeOrderAwardEntity::getPromoterId);
List<VvPromoterTradeOrderLineAwardEntity> promoterTradeOrderLineAwardList =
vvPromoterTradeOrderLineAwardDao.selectVvPromoterTradeOrderLineAwardByIdList(promoterIdList);
Map<String, List<VvPromoterTradeOrderLineAwardEntity>> promoterTradeOrderLineAwardMap =
SanUtils.groupByFiled2MapList(promoterTradeOrderLineAwardList, VvPromoterTradeOrderLineAwardEntity::getPromoterId);
for (VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAwardEntity : vvPromoterTradeOrderAwardEntities) {
PromoterTradeOrderAwardDTO promoterTradeOrderAwardDTO = new PromoterTradeOrderAwardDTO();
BeanUtils.copyProperties(vvPromoterTradeOrderAwardEntity, promoterTradeOrderAwardDTO);
promoterTradeOrderAwardDTO.setVvPromoterTradeOrderLineAwardEntityList(
promoterTradeOrderLineAwardMap.get(vvPromoterTradeOrderAwardEntity.getPromoterId()));
}
return R.ok().setData(pageUtils);
}
}