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-22 11:57:34 +08:00
parent ca66b027bd
commit be08d95738
11 changed files with 395 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,4 +75,10 @@ public interface VvBuyerDao extends BaseMapper<VvBuyerEntity> {
VvBuyerEntity selectVvBuyerOpenId(String openid);
List<VvBuyerEntity> selectVvBuyerByIdList(@IN List<Long> id);
int updateVvBuyerByIdPromoterSumAmountPromoterNotArriveAmount(@Plus BigDecimal promoterSumAmount,@Plus BigDecimal promoterNotArriveAmount, Long id);
int updateVvBuyerByIdPromoterCanceledAmountPromoterNotArriveAmount(@Plus BigDecimal promoterCanceledAmount,@Sub BigDecimal promoterNotArriveAmount, Long id);
int updateVvBuyerByIdPromoterArriveAccountAmountPromoterNotArriveAmount(@Plus BigDecimal promoterArriveAccountAmount,@Sub BigDecimal promoterNotArriveAmount, Long id);
}

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

@ -58,4 +58,7 @@ public interface VvPromoterTradeOrderAwardDao extends BaseMapper<VvPromoterTrade
@IF @LE @Column(VvBuyerEntity.create_timestamp) Long maxCreateTimestamp,
@IF @Column(VvBuyerEntity.create_timestamp) String createTimestampSort
);
List<VvPromoterTradeOrderAwardEntity> selectVvPromoterTradeOrderAwardByPromoterId(String promoterId);
}

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

@ -38,4 +38,8 @@ public interface VvPromoterTradeOrderLineAwardDao extends BaseMapper<VvPromoterT
List<VvPromoterTradeOrderLineAwardEntity> selectVvPromoterTradeOrderLineAwardByIdList(@IN List<String> promoterId);
List<VvPromoterTradeOrderLineAwardEntity> selectVvPromoterTradeOrderLineAwardByPromoterId(String promoterId);
}

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

@ -10,7 +10,7 @@ import java.util.Date;import java.util.Date;
/**
*买家信息
* @author quyixiao
* @since 2025-11-21
* @since 2025-11-22
*/
@Data
@ -31,20 +31,19 @@ private static final long serialVersionUID = 1L;
public final static String create_timestamp = CLASS_NAME + "create_timestamp"; // 买家创建时间
public final static String modify_timestamp = CLASS_NAME + "modify_timestamp"; // 买家修改时间
public final static String is_test = CLASS_NAME + "is_test"; // 是否是测试账号
public final static String promoter_sum_amount = CLASS_NAME + "promoter_sum_amount"; // 总金额
public final static String promoter_draw_cash_success_amount = CLASS_NAME + "promoter_draw_cash_success_amount"; // 提现金额
public final static String promoter_arrive_account_mount = CLASS_NAME + "promoter_arrive_account_mount"; // 到账户余额
public final static String promoter_canceled_amount = CLASS_NAME + "promoter_canceled_amount"; // 取消金额
public final static String promoter_not_arrive_account = CLASS_NAME + "promoter_not_arrive_account"; // 未到账金额
public final static String promoter_canceled_account = CLASS_NAME + "promoter_canceled_account"; // 取消金额
public final static String promoter_buyer_count = CLASS_NAME + "promoter_buyer_count"; // 推荐的买家数量
public final static String promoter_draw_cash_success_count = CLASS_NAME + "promoter_draw_cash_success_count"; // 提现成功次数
public final static String promoter_draw_cash_failed_count = CLASS_NAME + "promoter_draw_cash_failed_count"; // 提现失败次数
public final static String promoter_draw_cash_failed_amount = CLASS_NAME + "promoter_draw_cash_failed_amount"; // 提现失败金额
public final static String promoter_apply_draw_cash_amount = CLASS_NAME + "promoter_apply_draw_cash_amount"; // 申请提现金额
public final static String avatar_ = CLASS_NAME + "avatar"; // 微信头像
public final static String session_key = CLASS_NAME + "session_key"; // 微信session_key
public final static String openid_ = CLASS_NAME + "openid"; // 微信open_id
public final static String promoter_sum_amount = CLASS_NAME + "promoter_sum_amount"; // 总金额
public final static String promoter_not_arrive_amount = CLASS_NAME + "promoter_not_arrive_amount"; // 未到账金额
public final static String promoter_arrive_account_amount = CLASS_NAME + "promoter_arrive_account_amount"; // 到账户余额
public final static String promoter_apply_draw_cash_amount = CLASS_NAME + "promoter_apply_draw_cash_amount"; // 申请提现金额
public final static String promoter_draw_cash_failed_amount = CLASS_NAME + "promoter_draw_cash_failed_amount"; // 提现失败金额
public final static String promoter_draw_cash_success_amount = CLASS_NAME + "promoter_draw_cash_success_amount"; // 提现金额
public final static String promoter_canceled_amount = CLASS_NAME + "promoter_canceled_amount"; // 取消金额
public final static String promoter_buyer_count = CLASS_NAME + "promoter_buyer_count"; // 推荐的买家数量
public final static String promoter_draw_cash_success_count = CLASS_NAME + "promoter_draw_cash_success_count"; // 提现成功次数
public final static String promoter_draw_cash_failed_count = CLASS_NAME + "promoter_draw_cash_failed_count"; // 提现失败次数
//
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@ -66,34 +65,32 @@ private static final long serialVersionUID = 1L;
private Long modifyTimestamp;
//是否是测试账号
private Integer isTest;
//总金额
private BigDecimal promoterSumAmount;
//提现金额
private BigDecimal promoterDrawCashSuccessAmount;
//到账户余额
private BigDecimal promoterArriveAccountMount;
//取消金额
private BigDecimal promoterCanceledAmount;
//未到账金额
private BigDecimal promoterNotArriveAccount;
//取消金额
private BigDecimal promoterCanceledAccount;
//推荐的买家数量
private Integer promoterBuyerCount;
//提现成功次数
private Integer promoterDrawCashSuccessCount;
//提现失败次数
private Integer promoterDrawCashFailedCount;
//提现失败金额
private BigDecimal promoterDrawCashFailedAmount;
//申请提现金额
private String promoterApplyDrawCashAmount;
//微信头像
private String avatar;
//微信session_key
private String sessionKey;
//微信open_id
private String openid;
//总金额
private BigDecimal promoterSumAmount;
//未到账金额
private BigDecimal promoterNotArriveAmount;
//到账户余额
private BigDecimal promoterArriveAccountAmount;
//申请提现金额
private BigDecimal promoterApplyDrawCashAmount;
//提现失败金额
private BigDecimal promoterDrawCashFailedAmount;
//提现金额
private BigDecimal promoterDrawCashSuccessAmount;
//取消金额
private BigDecimal promoterCanceledAmount;
//推荐的买家数量
private Integer promoterBuyerCount;
//提现成功次数
private Integer promoterDrawCashSuccessCount;
//提现失败次数
private Integer promoterDrawCashFailedCount;
/**
*
* @return
@ -244,6 +241,51 @@ private static final long serialVersionUID = 1L;
this.isTest = isTest;
}
/**
* 微信头像
* @return
*/
public String getAvatar() {
return avatar;
}
/**
* 微信头像
* @param avatar
*/
public void setAvatar(String avatar) {
this.avatar = avatar;
}
/**
* 微信session_key
* @return
*/
public String getSessionKey() {
return sessionKey;
}
/**
* 微信session_key
* @param sessionKey
*/
public void setSessionKey(String sessionKey) {
this.sessionKey = sessionKey;
}
/**
* 微信open_id
* @return
*/
public String getOpenid() {
return openid;
}
/**
* 微信open_id
* @param openid
*/
public void setOpenid(String openid) {
this.openid = openid;
}
/**
* 总金额
* @return
@ -259,6 +301,66 @@ private static final long serialVersionUID = 1L;
this.promoterSumAmount = promoterSumAmount;
}
/**
* 未到账金额
* @return
*/
public BigDecimal getPromoterNotArriveAmount() {
return promoterNotArriveAmount;
}
/**
* 未到账金额
* @param promoterNotArriveAmount
*/
public void setPromoterNotArriveAmount(BigDecimal promoterNotArriveAmount) {
this.promoterNotArriveAmount = promoterNotArriveAmount;
}
/**
* 到账户余额
* @return
*/
public BigDecimal getPromoterArriveAccountAmount() {
return promoterArriveAccountAmount;
}
/**
* 到账户余额
* @param promoterArriveAccountAmount
*/
public void setPromoterArriveAccountAmount(BigDecimal promoterArriveAccountAmount) {
this.promoterArriveAccountAmount = promoterArriveAccountAmount;
}
/**
* 申请提现金额
* @return
*/
public BigDecimal getPromoterApplyDrawCashAmount() {
return promoterApplyDrawCashAmount;
}
/**
* 申请提现金额
* @param promoterApplyDrawCashAmount
*/
public void setPromoterApplyDrawCashAmount(BigDecimal promoterApplyDrawCashAmount) {
this.promoterApplyDrawCashAmount = promoterApplyDrawCashAmount;
}
/**
* 提现失败金额
* @return
*/
public BigDecimal getPromoterDrawCashFailedAmount() {
return promoterDrawCashFailedAmount;
}
/**
* 提现失败金额
* @param promoterDrawCashFailedAmount
*/
public void setPromoterDrawCashFailedAmount(BigDecimal promoterDrawCashFailedAmount) {
this.promoterDrawCashFailedAmount = promoterDrawCashFailedAmount;
}
/**
* 提现金额
* @return
@ -274,21 +376,6 @@ private static final long serialVersionUID = 1L;
this.promoterDrawCashSuccessAmount = promoterDrawCashSuccessAmount;
}
/**
* 到账户余额
* @return
*/
public BigDecimal getPromoterArriveAccountMount() {
return promoterArriveAccountMount;
}
/**
* 到账户余额
* @param promoterArriveAccountMount
*/
public void setPromoterArriveAccountMount(BigDecimal promoterArriveAccountMount) {
this.promoterArriveAccountMount = promoterArriveAccountMount;
}
/**
* 取消金额
* @return
@ -304,36 +391,6 @@ private static final long serialVersionUID = 1L;
this.promoterCanceledAmount = promoterCanceledAmount;
}
/**
* 未到账金额
* @return
*/
public BigDecimal getPromoterNotArriveAccount() {
return promoterNotArriveAccount;
}
/**
* 未到账金额
* @param promoterNotArriveAccount
*/
public void setPromoterNotArriveAccount(BigDecimal promoterNotArriveAccount) {
this.promoterNotArriveAccount = promoterNotArriveAccount;
}
/**
* 取消金额
* @return
*/
public BigDecimal getPromoterCanceledAccount() {
return promoterCanceledAccount;
}
/**
* 取消金额
* @param promoterCanceledAccount
*/
public void setPromoterCanceledAccount(BigDecimal promoterCanceledAccount) {
this.promoterCanceledAccount = promoterCanceledAccount;
}
/**
* 推荐的买家数量
* @return
@ -379,81 +436,6 @@ private static final long serialVersionUID = 1L;
this.promoterDrawCashFailedCount = promoterDrawCashFailedCount;
}
/**
* 提现失败金额
* @return
*/
public BigDecimal getPromoterDrawCashFailedAmount() {
return promoterDrawCashFailedAmount;
}
/**
* 提现失败金额
* @param promoterDrawCashFailedAmount
*/
public void setPromoterDrawCashFailedAmount(BigDecimal promoterDrawCashFailedAmount) {
this.promoterDrawCashFailedAmount = promoterDrawCashFailedAmount;
}
/**
* 申请提现金额
* @return
*/
public String getPromoterApplyDrawCashAmount() {
return promoterApplyDrawCashAmount;
}
/**
* 申请提现金额
* @param promoterApplyDrawCashAmount
*/
public void setPromoterApplyDrawCashAmount(String promoterApplyDrawCashAmount) {
this.promoterApplyDrawCashAmount = promoterApplyDrawCashAmount;
}
/**
* 微信头像
* @return
*/
public String getAvatar() {
return avatar;
}
/**
* 微信头像
* @param avatar
*/
public void setAvatar(String avatar) {
this.avatar = avatar;
}
/**
* 微信session_key
* @return
*/
public String getSessionKey() {
return sessionKey;
}
/**
* 微信session_key
* @param sessionKey
*/
public void setSessionKey(String sessionKey) {
this.sessionKey = sessionKey;
}
/**
* 微信open_id
* @return
*/
public String getOpenid() {
return openid;
}
/**
* 微信open_id
* @param openid
*/
public void setOpenid(String openid) {
this.openid = openid;
}
@Override
public String toString() {
return "VvBuyerEntity{" +
@ -467,20 +449,19 @@ private static final long serialVersionUID = 1L;
",createTimestamp=" + createTimestamp +
",modifyTimestamp=" + modifyTimestamp +
",isTest=" + isTest +
",promoterSumAmount=" + promoterSumAmount +
",promoterDrawCashSuccessAmount=" + promoterDrawCashSuccessAmount +
",promoterArriveAccountMount=" + promoterArriveAccountMount +
",promoterCanceledAmount=" + promoterCanceledAmount +
",promoterNotArriveAccount=" + promoterNotArriveAccount +
",promoterCanceledAccount=" + promoterCanceledAccount +
",promoterBuyerCount=" + promoterBuyerCount +
",promoterDrawCashSuccessCount=" + promoterDrawCashSuccessCount +
",promoterDrawCashFailedCount=" + promoterDrawCashFailedCount +
",promoterDrawCashFailedAmount=" + promoterDrawCashFailedAmount +
",promoterApplyDrawCashAmount=" + promoterApplyDrawCashAmount +
",avatar=" + avatar +
",sessionKey=" + sessionKey +
",openid=" + openid +
",promoterSumAmount=" + promoterSumAmount +
",promoterNotArriveAmount=" + promoterNotArriveAmount +
",promoterArriveAccountAmount=" + promoterArriveAccountAmount +
",promoterApplyDrawCashAmount=" + promoterApplyDrawCashAmount +
",promoterDrawCashFailedAmount=" + promoterDrawCashFailedAmount +
",promoterDrawCashSuccessAmount=" + promoterDrawCashSuccessAmount +
",promoterCanceledAmount=" + promoterCanceledAmount +
",promoterBuyerCount=" + promoterBuyerCount +
",promoterDrawCashSuccessCount=" + promoterDrawCashSuccessCount +
",promoterDrawCashFailedCount=" + promoterDrawCashFailedCount +
"}";
}
}

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

@ -10,7 +10,7 @@ import java.util.Date;import java.util.Date;
/**
*推广者获得奖品名细子单
* @author quyixiao
* @since 2025-11-21
* @since 2025-11-22
*/
@Data
@ -41,6 +41,10 @@ private static final long serialVersionUID = 1L;
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，到账
public final static String gmt_canceled = CLASS_NAME + "gmt_canceled"; // 取消时间
public final static String gmt_create = CLASS_NAME + "gmt_create"; // 创建时间
public final static String gmt_arrive = CLASS_NAME + "gmt_arrive"; // 到账时间
public final static String canceled_reason = CLASS_NAME + "canceled_reason"; // 取消原因
//
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@ -82,6 +86,14 @@ private static final long serialVersionUID = 1L;
private Long tradeOrderId;
//create 创建, canceled 取消 , arrive，到账
private String status;
//取消时间
private Date gmtCanceled;
//创建时间
private Date gmtCreate;
//到账时间
private Date gmtArrive;
//取消原因
private String canceledReason;
/**
*
* @return
@ -382,6 +394,66 @@ private static final long serialVersionUID = 1L;
this.status = status;
}
/**
* 取消时间
* @return
*/
public Date getGmtCanceled() {
return gmtCanceled;
}
/**
* 取消时间
* @param gmtCanceled
*/
public void setGmtCanceled(Date gmtCanceled) {
this.gmtCanceled = gmtCanceled;
}
/**
* 创建时间
* @return
*/
public Date getGmtCreate() {
return gmtCreate;
}
/**
* 创建时间
* @param gmtCreate
*/
public void setGmtCreate(Date gmtCreate) {
this.gmtCreate = gmtCreate;
}
/**
* 到账时间
* @return
*/
public Date getGmtArrive() {
return gmtArrive;
}
/**
* 到账时间
* @param gmtArrive
*/
public void setGmtArrive(Date gmtArrive) {
this.gmtArrive = gmtArrive;
}
/**
* 取消原因
* @return
*/
public String getCanceledReason() {
return canceledReason;
}
/**
* 取消原因
* @param canceledReason
*/
public void setCanceledReason(String canceledReason) {
this.canceledReason = canceledReason;
}
@Override
public String toString() {
return "VvPromoterTradeOrderAwardEntity{" +
@ -405,6 +477,10 @@ private static final long serialVersionUID = 1L;
",wasBuyerPhone=" + wasBuyerPhone +
",tradeOrderId=" + tradeOrderId +
",status=" + status +
",gmtCanceled=" + gmtCanceled +
",gmtCreate=" + gmtCreate +
",gmtArrive=" + gmtArrive +
",canceledReason=" + canceledReason +
"}";
}
}

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

@ -10,7 +10,7 @@ import java.util.Date;import java.util.Date;
/**
*推广者获得奖品名细子单
* @author quyixiao
* @since 2025-11-21
* @since 2025-11-22
*/
@Data
@ -43,6 +43,10 @@ private static final long serialVersionUID = 1L;
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
public final static String gmt_canceled = CLASS_NAME + "gmt_canceled"; // 取消时间
public final static String gmt_create = CLASS_NAME + "gmt_create"; // 创建时间
public final static String gmt_arrive = CLASS_NAME + "gmt_arrive"; // 到账时间
public final static String canceled_reason = CLASS_NAME + "canceled_reason"; //
//
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@ -88,6 +92,14 @@ private static final long serialVersionUID = 1L;
private String status;
//推荐id
private Long promoterTradeOrderAwardId;
//取消时间
private Date gmtCanceled;
//创建时间
private Date gmtCreate;
//到账时间
private Date gmtArrive;
//
private String canceledReason;
/**
*
* @return
@ -418,6 +430,66 @@ private static final long serialVersionUID = 1L;
this.promoterTradeOrderAwardId = promoterTradeOrderAwardId;
}
/**
* 取消时间
* @return
*/
public Date getGmtCanceled() {
return gmtCanceled;
}
/**
* 取消时间
* @param gmtCanceled
*/
public void setGmtCanceled(Date gmtCanceled) {
this.gmtCanceled = gmtCanceled;
}
/**
* 创建时间
* @return
*/
public Date getGmtCreate() {
return gmtCreate;
}
/**
* 创建时间
* @param gmtCreate
*/
public void setGmtCreate(Date gmtCreate) {
this.gmtCreate = gmtCreate;
}
/**
* 到账时间
* @return
*/
public Date getGmtArrive() {
return gmtArrive;
}
/**
* 到账时间
* @param gmtArrive
*/
public void setGmtArrive(Date gmtArrive) {
this.gmtArrive = gmtArrive;
}
/**
*
* @return
*/
public String getCanceledReason() {
return canceledReason;
}
/**
*
* @param canceledReason
*/
public void setCanceledReason(String canceledReason) {
this.canceledReason = canceledReason;
}
@Override
public String toString() {
return "VvPromoterTradeOrderLineAwardEntity{" +
@ -443,6 +515,10 @@ private static final long serialVersionUID = 1L;
",tradeOrderLineId=" + tradeOrderLineId +
",status=" + status +
",promoterTradeOrderAwardId=" + promoterTradeOrderAwardId +
",gmtCanceled=" + gmtCanceled +
",gmtCreate=" + gmtCreate +
",gmtArrive=" + gmtArrive +
",canceledReason=" + canceledReason +
"}";
}
}

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

@ -48,7 +48,7 @@ public class MysqlMain_update {
}
List<TablesBean> list = new ArrayList<TablesBean>();
list.add(new TablesBean("vv_trade_order_line_status_log"));
list.add(new TablesBean("vv_buyer"));
Map<String, String> map = MysqlUtil2ShowCreateTable.getComments();
for (int i = 0; i < list.size(); i++) {

1
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java
View File

@ -252,7 +252,6 @@ public class AdminOrderController {
try {
vvPackageService.selectVvKuaidiAndUpdateData(vvPackageEntity.getTrackNumber(), RoleEnums.admin.getRole(), false);
VvPackageEntity vvPackageEntityNew = vvPackageDao.selectVvPackageByTrackNumber(vvPackageEntity.getTrackNumber());
// 创建订阅

34
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java
View File

@ -4,6 +4,7 @@ package com.heyu.api.controller.mm;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.heyu.api.data.constants.ApiConstants;
import com.heyu.api.data.enums.AwardStatusEnums;
import com.heyu.api.data.enums.ShippingTypeEnums;
import com.heyu.api.data.kuaidi100.ActionDTO;
import com.heyu.api.alibaba.request.mm.reverse.VvApproveRequest;
@ -66,6 +67,16 @@ public class AdminReverseController {
@Autowired
private VvTradeOrderConvertService vvTradeOrderConvertService;
@Autowired
private VvPromoterTradeOrderAwardDao vvPromoterTradeOrderAwardDao;
@Autowired
private VvPromoterTradeOrderLineAwardDao vvPromoterTradeOrderLineAwardDao;
@Autowired
private VvBuyerDao vvBuyerDao;
/***
* 逆向列表 https://api.1024api.com/api-interface/mm/reverse/list
* @param vvReverseListRequest
@ -100,7 +111,7 @@ public class AdminReverseController {
for (VvReverseOrderEntity vvReverseOrderEntity : vvReverseOrderEntities) {
if (StringUtils.isNotEmpty(vvReverseOrderEntity.getTrackNumber())) {
trackNumbers.add(vvReverseOrderEntity.getTrackNumber());
vvPackageService.selectVvKuaidiAndUpdateData(vvReverseOrderEntity.getTrackNumber(), RoleEnums.admin.getRole(),true);
vvPackageService.selectVvKuaidiAndUpdateData(vvReverseOrderEntity.getTrackNumber(), RoleEnums.admin.getRole(), true);
}
}
@ -185,10 +196,12 @@ public class AdminReverseController {
vvReverseOrderEntity.setCloseUser(vvApproveRequest.getUserName());
vvReverseOrderEntity.setCloseReason(vvApproveRequest.getReason());
}
List<VvReverseOrderLineEntity> vvReverseOrderLineEntities = vvReverseOrderLineDao.selectVvReverseOrderLineByReverseOrderId(vvApproveRequest.getReverseOrderId());
List<Long> tradeOrderLineIds = SanUtils.list2FieldList(vvReverseOrderLineEntities, VvReverseOrderLineEntity::getTradeOrderLineId);
List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByIds(tradeOrderLineIds);
String promoterId = SanUtils.findAnyNotNull(vvTradeOrderLineEntityList, VvTradeOrderLineEntity::getPromoterId);
for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) {
vvTradeOrderLineEntity.setReverseStatus(vvReverseOrderEntity.getStatus());
vvTradeOrderLineDao.updateVvTradeOrderLineById(vvTradeOrderLineEntity);
@ -215,7 +228,26 @@ public class AdminReverseController {
vvReverseOrderEntity.setGmtPreRefund(new Date());
vvReverseOrderEntity.setStatus(ReverseStatusEnums.weixin_refunding.getStatus());
vvReverseOrderDao.updateVvReverseOrderById(vvReverseOrderEntity);
if (StringUtils.isNotEmpty(promoterId)) {
List<VvPromoterTradeOrderAwardEntity> vvPromoterTradeOrderAwardEntities = vvPromoterTradeOrderAwardDao.selectVvPromoterTradeOrderAwardByPromoterId(promoterId);
for (VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAwardEntity : vvPromoterTradeOrderAwardEntities) {
vvPromoterTradeOrderAwardEntity.setStatus(AwardStatusEnums.canceled.getStatus());
vvPromoterTradeOrderAwardEntity.setCanceledReason("订单退款");
vvPromoterTradeOrderAwardDao.updateVvPromoterTradeOrderAwardById(vvPromoterTradeOrderAwardEntity);
vvBuyerDao.updateVvBuyerByIdPromoterCanceledAmountPromoterNotArriveAmount(
vvPromoterTradeOrderAwardEntity.getAwardAmount()
,vvPromoterTradeOrderAwardEntity.getAwardAmount(),
vvPromoterTradeOrderAwardEntity.getPromoterBuyerId());
}
List<VvPromoterTradeOrderLineAwardEntity> vvPromoterTradeOrderLineAwardEntities = vvPromoterTradeOrderLineAwardDao.selectVvPromoterTradeOrderLineAwardByPromoterId(promoterId);
for (VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAwardEntity : vvPromoterTradeOrderLineAwardEntities) {
vvPromoterTradeOrderLineAwardEntity.setStatus(AwardStatusEnums.canceled.getStatus());
vvPromoterTradeOrderLineAwardEntity.setCanceledReason("订单退款");
vvPromoterTradeOrderLineAwardDao.updateVvPromoterTradeOrderLineAwardById(vvPromoterTradeOrderLineAwardEntity);
}
}
}
return R.ok();
}

18
api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java
View File

@ -126,6 +126,8 @@ public class AppOrderController {
@Autowired
private VvPromoterTradeOrderAwardDao vvPromoterTradeOrderAwardDao;
/***
* https://api.1024api.com/api-interface/app/order/list
*
@ -353,12 +355,20 @@ public class AppOrderController {
vvPromoterTradeOrderLineAwardEntity.setWasBuyerPhone(tradeOrderLineEntity.getBuyerPhone());
vvPromoterTradeOrderLineAwardEntity.setWasBuyerWeixin(tradeOrderLineEntity.getBuyerWeixin());
vvPromoterTradeOrderLineAwardEntity.setStatus(AwardStatusEnums.create.getStatus());
vvPromoterTradeOrderLineAwardEntity.setGmtCreate(new Date());
vvPromoterTradeOrderLineAwardEntityList.add(vvPromoterTradeOrderLineAwardEntity);
}
vvTradeOrderLineDao.insertOrUpdateVvTradeOrderLine(tradeOrderLineEntity);
}
List<VvPromoterBuyerEntity> vvPromoterBuyerList = vvPromoterBuyerDao.selectVvPromoterBuyerByPromoterId(vvActivityDTO.getPromoterId());
List<Long> promoterBuyerIdList = SanUtils.getFieldList(vvPromoterBuyerList, VvPromoterBuyerEntity::getPromoterBuyerId);
List<VvBuyerEntity> vvBuyerEntities = vvBuyerDao.selectVvBuyerByIdList(promoterBuyerIdList);
Map<Long, VvBuyerEntity> vvBuyerEntityMap = SanUtils.groupByFiled2Map(vvBuyerEntities, VvBuyerEntity::getId);
if (CollectionUtils.isNotEmpty(vvPromoterBuyerList)
&& CollectionUtils.isNotEmpty(vvPromoterTradeOrderLineAwardEntityList)) {
Map<Long,List<VvPromoterTradeOrderLineAwardEntity>> vvPromoterTradeOrderLineAwardMap = new HashMap<>();
@ -383,7 +393,7 @@ public class AppOrderController {
vvPromoterTradeOrderLineAwardDao.insertVvPromoterTradeOrderLineAward(promoterTradeOrderLineAwardNew);
List<VvPromoterTradeOrderLineAwardEntity> list = vvPromoterTradeOrderLineAwardMap.get(vvPromoterBuyer.getPromoterBuyerId());
if(list ==null){
if (list == null) {
list = new ArrayList<>();
}
list.add(promoterTradeOrderLineAwardNew);
@ -391,15 +401,17 @@ public class AppOrderController {
}
}
for( Map.Entry<Long,List<VvPromoterTradeOrderLineAwardEntity>> entry:vvPromoterTradeOrderLineAwardMap.entrySet()){
for (Map.Entry<Long, List<VvPromoterTradeOrderLineAwardEntity>> entry : vvPromoterTradeOrderLineAwardMap.entrySet()) {
VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAwardEntity = new VvPromoterTradeOrderAwardEntity();
VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAwardIndex_0 = vvPromoterTradeOrderLineAwardEntityList.get(0);
BeanUtils.copyProperties(vvPromoterTradeOrderLineAwardIndex_0, vvPromoterTradeOrderAwardEntity);
List<VvPromoterTradeOrderLineAwardEntity> vvPromoterTradeOrderLineAwardEntities = entry.getValue();
BigDecimal tradeOrderAward = SanUtils.sum(vvPromoterTradeOrderLineAwardEntities,VvPromoterTradeOrderLineAwardEntity::getAwardAmount );
BigDecimal tradeOrderAward = SanUtils.sum(vvPromoterTradeOrderLineAwardEntities, VvPromoterTradeOrderLineAwardEntity::getAwardAmount);
vvPromoterTradeOrderAwardEntity.setAwardAmount(tradeOrderAward);
vvPromoterTradeOrderAwardDao.insertVvPromoterTradeOrderAward(vvPromoterTradeOrderAwardEntity);
VvBuyerEntity promoterBuyerBuyer = vvBuyerEntityMap.get(vvPromoterTradeOrderAwardEntity.getPromoterBuyerId());
vvBuyerDao.updateVvBuyerByIdPromoterSumAmountPromoterNotArriveAmount(tradeOrderAward,tradeOrderAward,promoterBuyerBuyer.getId());
}
}

40
api-web/api-interface/src/main/java/com/heyu/api/listener/delay/handler/DeliveredHandler.java
View File

@ -2,15 +2,19 @@ package com.heyu.api.listener.delay.handler;
import com.alibaba.fastjson.JSONObject;
import com.heyu.api.data.dao.vv.VvPackageDao;
import com.heyu.api.data.dao.vv.VvTradeOrderLineDao;
import com.heyu.api.data.dao.vv.*;
import com.heyu.api.data.dto.PackageDelivedDelayDTO;
import com.heyu.api.data.entity.vv.VvPackageEntity;
import com.heyu.api.data.entity.vv.VvPromoterTradeOrderAwardEntity;
import com.heyu.api.data.entity.vv.VvPromoterTradeOrderLineAwardEntity;
import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
import com.heyu.api.data.enums.AwardStatusEnums;
import com.heyu.api.data.enums.OrderStatusEnums;
import com.heyu.api.data.enums.RoleEnums;
import com.heyu.api.data.service.vv.VvTradeOrderConvertService;
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.listener.BaseDelayedHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@ -34,13 +38,21 @@ public class DeliveredHandler extends BaseDelayedHandler {
@Autowired
private VvTradeOrderConvertService vvTradeOrderConvertService;
@Autowired
private VvPromoterTradeOrderAwardDao vvPromoterTradeOrderAwardDao;
@Autowired
private VvPromoterTradeOrderLineAwardDao vvPromoterTradeOrderLineAwardDao;
@Autowired
private VvBuyerDao vvBuyerDao;
@Override
public R handler(String message) {
log.info("DeliveredHandler receive message:{}", message);
PackageDelivedDelayDTO packageDelivedDelayDTO = JSONObject.parseObject(message, PackageDelivedDelayDTO.class);
// 更新包信息
VvPackageEntity vvPackage = vvPackageDao.selectVvPackageById(packageDelivedDelayDTO.getPackageId());
vvPackage.setIscheck("3");
@ -61,13 +73,27 @@ public class DeliveredHandler extends BaseDelayedHandler {
-1L,
RoleEnums.system.getRole()
);
}
String promoterId = SanUtils.findAnyNotNull(vvTradeOrderLineEntityList,VvTradeOrderLineEntity::getPromoterId );
if(StringUtils.isNotEmpty(promoterId)){
List<VvPromoterTradeOrderAwardEntity> vvPromoterTradeOrderAwardEntities = vvPromoterTradeOrderAwardDao.selectVvPromoterTradeOrderAwardByPromoterId(promoterId);
for (VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAwardEntity : vvPromoterTradeOrderAwardEntities) {
vvPromoterTradeOrderAwardEntity.setStatus(AwardStatusEnums.arrive.getStatus());
vvPromoterTradeOrderAwardDao.updateVvPromoterTradeOrderAwardById(vvPromoterTradeOrderAwardEntity);
vvBuyerDao.updateVvBuyerByIdPromoterArriveAccountAmountPromoterNotArriveAmount(
vvPromoterTradeOrderAwardEntity.getAwardAmount()
,vvPromoterTradeOrderAwardEntity.getAwardAmount(),
vvPromoterTradeOrderAwardEntity.getPromoterBuyerId());
}
List<VvPromoterTradeOrderLineAwardEntity> vvPromoterTradeOrderLineAwardEntities = vvPromoterTradeOrderLineAwardDao.selectVvPromoterTradeOrderLineAwardByPromoterId(promoterId);
for (VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAwardEntity : vvPromoterTradeOrderLineAwardEntities) {
vvPromoterTradeOrderLineAwardEntity.setStatus(AwardStatusEnums.arrive.getStatus());
vvPromoterTradeOrderLineAwardDao.updateVvPromoterTradeOrderLineAwardById(vvPromoterTradeOrderLineAwardEntity);
}
}
return R.ok();
}
}