提交候
This commit is contained in:
parent
b8ac0e99ba
commit
bd6dabf89f
@ -175,7 +175,7 @@ public class AppOrderController {
|
||||
|
||||
|
||||
/***
|
||||
* 订单添加
|
||||
* 订单详情
|
||||
*
|
||||
* http://localhost:8888/app/order/detail
|
||||
*/
|
||||
@ -344,7 +344,8 @@ public class AppOrderController {
|
||||
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
|
||||
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.setPromoterId(tradeOrderLineEntity.getPromoterId());
|
||||
vvPromoterTradeOrderLineAwardEntity.setAwardAmount(vvActivityDTO.getAwardAmount());
|
||||
@ -358,10 +359,14 @@ public class AppOrderController {
|
||||
vvPromoterTradeOrderLineAwardEntity.setGmtCreate(new Date());
|
||||
vvPromoterTradeOrderLineAwardEntityList.add(vvPromoterTradeOrderLineAwardEntity);
|
||||
}
|
||||
|
||||
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)
|
||||
&& CollectionUtils.isNotEmpty(vvPromoterTradeOrderLineAwardEntityList)) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user