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-12-02 18:36:50 +08:00
parent b8ac0e99ba
commit bd6dabf89f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,7 +175,7 @@ public class AppOrderController {
/*** /***
* 订单添加 * 订单详情
* *
* http://localhost:8888/app/order/detail * http://localhost:8888/app/order/detail
*/ */
@ -344,7 +344,8 @@ public class AppOrderController {
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) { for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
tradeOrderLineEntity.setTradeOrderId(vvTradeOrderEntity.getId()); tradeOrderLineEntity.setTradeOrderId(vvTradeOrderEntity.getId());
// 如果在奖励金额 // 如果在奖励金额
if (tradeOrderLineEntity.getAwardAmount().compareTo(BigDecimal.ZERO) > 0) { if (tradeOrderLineEntity.getAwardAmount() != null
&& tradeOrderLineEntity.getAwardAmount().compareTo(BigDecimal.ZERO) > 0) {
VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAwardEntity = new VvPromoterTradeOrderLineAwardEntity(); VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAwardEntity = new VvPromoterTradeOrderLineAwardEntity();
vvPromoterTradeOrderLineAwardEntity.setPromoterId(tradeOrderLineEntity.getPromoterId()); vvPromoterTradeOrderLineAwardEntity.setPromoterId(tradeOrderLineEntity.getPromoterId());
vvPromoterTradeOrderLineAwardEntity.setAwardAmount(vvActivityDTO.getAwardAmount()); vvPromoterTradeOrderLineAwardEntity.setAwardAmount(vvActivityDTO.getAwardAmount());
@ -358,10 +359,14 @@ public class AppOrderController {
vvPromoterTradeOrderLineAwardEntity.setGmtCreate(new Date()); vvPromoterTradeOrderLineAwardEntity.setGmtCreate(new Date());
vvPromoterTradeOrderLineAwardEntityList.add(vvPromoterTradeOrderLineAwardEntity); vvPromoterTradeOrderLineAwardEntityList.add(vvPromoterTradeOrderLineAwardEntity);
} }
vvTradeOrderLineDao.insertOrUpdateVvTradeOrderLine(tradeOrderLineEntity); vvTradeOrderLineDao.insertOrUpdateVvTradeOrderLine(tradeOrderLineEntity);
} }
List<VvPromoterBuyerEntity> vvPromoterBuyerList = vvPromoterBuyerDao.selectVvPromoterBuyerByPromoterId(vvActivityDTO.getPromoterId()); List<VvPromoterBuyerEntity> vvPromoterBuyerList = null;
if (vvActivityDTO != null) {
vvPromoterBuyerList = vvPromoterBuyerDao.selectVvPromoterBuyerByPromoterId(vvActivityDTO.getPromoterId());
}
if (CollectionUtils.isNotEmpty(vvPromoterBuyerList) if (CollectionUtils.isNotEmpty(vvPromoterBuyerList)
&& CollectionUtils.isNotEmpty(vvPromoterTradeOrderLineAwardEntityList)) { && CollectionUtils.isNotEmpty(vvPromoterTradeOrderLineAwardEntityList)) {