|
@@ -149,6 +149,7 @@ public class ChannelOrderController extends BaseApiController {
|
|
|
|
|
|
// 订单金额计算
|
|
// 订单金额计算
|
|
Integer orderAmt = 0;
|
|
Integer orderAmt = 0;
|
|
|
|
+ Integer pkgNum = 0;
|
|
if (!CollectionUtils.isEmpty(param.getCartIds())){
|
|
if (!CollectionUtils.isEmpty(param.getCartIds())){
|
|
// 购物车里下单的
|
|
// 购物车里下单的
|
|
List<ChannelCart> channelCarts = channelCartService.listByIds(param.getCartIds());
|
|
List<ChannelCart> channelCarts = channelCartService.listByIds(param.getCartIds());
|
|
@@ -159,6 +160,7 @@ public class ChannelOrderController extends BaseApiController {
|
|
cartVO.setCartId(channelCart.getCartId());
|
|
cartVO.setCartId(channelCart.getCartId());
|
|
cartVO.setOrderNum(channelCart.getOrderNum());
|
|
cartVO.setOrderNum(channelCart.getOrderNum());
|
|
orderSettleVO.getItems().add(cartVO);
|
|
orderSettleVO.getItems().add(cartVO);
|
|
|
|
+ pkgNum += channelCart.getOrderNum();
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
TicketBox ticketBox = ticketBoxService.getById(param.getBoxId());
|
|
TicketBox ticketBox = ticketBoxService.getById(param.getBoxId());
|
|
@@ -166,10 +168,12 @@ public class ChannelOrderController extends BaseApiController {
|
|
ChannelCartVO cartVO = mapperFacade.map(ticketBox, ChannelCartVO.class);
|
|
ChannelCartVO cartVO = mapperFacade.map(ticketBox, ChannelCartVO.class);
|
|
cartVO.setOrderNum(param.getOrderNum());
|
|
cartVO.setOrderNum(param.getOrderNum());
|
|
orderSettleVO.getItems().add(cartVO);
|
|
orderSettleVO.getItems().add(cartVO);
|
|
|
|
+ pkgNum += param.getOrderNum();
|
|
}
|
|
}
|
|
orderSettleVO.setOrderAmt(orderAmt);
|
|
orderSettleVO.setOrderAmt(orderAmt);
|
|
// 当前没有运费和优惠,实付金额=订单金额
|
|
// 当前没有运费和优惠,实付金额=订单金额
|
|
orderSettleVO.setPayAmt(orderAmt);
|
|
orderSettleVO.setPayAmt(orderAmt);
|
|
|
|
+ orderSettleVO.setPkgNum(pkgNum);
|
|
|
|
|
|
// 缓存订单结算对象
|
|
// 缓存订单结算对象
|
|
redisCache.setCacheObject(CHANNEL_ORDER_CACHE_KEY + channelId, orderSettleVO, 10, TimeUnit.MINUTES);
|
|
redisCache.setCacheObject(CHANNEL_ORDER_CACHE_KEY + channelId, orderSettleVO, 10, TimeUnit.MINUTES);
|