Commit aa07254d authored by unset's avatar unset

添加通知信息

parent 512c4214
...@@ -54,6 +54,7 @@ public class ConfirmOrderService { ...@@ -54,6 +54,7 @@ public class ConfirmOrderService {
/** /**
* 确认订单 * 确认订单
*
* @param confirmOrderDto * @param confirmOrderDto
* @return * @return
*/ */
...@@ -68,9 +69,7 @@ public class ConfirmOrderService { ...@@ -68,9 +69,7 @@ public class ConfirmOrderService {
AtomicReference<Integer> number = new AtomicReference<>(0); AtomicReference<Integer> number = new AtomicReference<>(0);
AtomicReference<Double> amount = new AtomicReference<>((double) 0); AtomicReference<Double> amount = new AtomicReference<>((double) 0);
itemInfoDtoList.parallelStream().forEach(itemInfoDto -> { itemInfoDtoList.parallelStream().forEach(itemInfoDto -> {
switch (OrderTypeEnum.getByCode(itemInfoDto.getType())) { if (itemInfoDto.getType().equals(OrderTypeEnum.STANDARD_DATA.getType())) {
//标准数据
case STANDARD_DATA:
List<ImageDataVO> imageDataVOList = datacenterFeign.queryByIds(itemInfoDto.getId() + "").getData(); List<ImageDataVO> imageDataVOList = datacenterFeign.queryByIds(itemInfoDto.getId() + "").getData();
if (imageDataVOList != null && imageDataVOList.size() > 0) { if (imageDataVOList != null && imageDataVOList.size() > 0) {
ImageDataVO imageDataVO = imageDataVOList.get(0); ImageDataVO imageDataVO = imageDataVOList.get(0);
...@@ -86,8 +85,9 @@ public class ConfirmOrderService { ...@@ -86,8 +85,9 @@ public class ConfirmOrderService {
BigDecimal totalAmount = imageDataVO.getPrice().multiply(new BigDecimal(itemInfoDto.getNumber())); BigDecimal totalAmount = imageDataVO.getPrice().multiply(new BigDecimal(itemInfoDto.getNumber()));
amount.updateAndGet(v -> new Double((double) (v + totalAmount.doubleValue()))); amount.updateAndGet(v -> new Double((double) (v + totalAmount.doubleValue())));
} }
//行业应用 }
case INDUSTRY_INFO:
if (itemInfoDto.getType().equals(OrderTypeEnum.INDUSTRY_INFO.getType())) {
IndustryApplicationInfo industryApplicationInfo = industryApplicationInfoBiz.getOneById(itemInfoDto.getId().intValue()).getData(); IndustryApplicationInfo industryApplicationInfo = industryApplicationInfoBiz.getOneById(itemInfoDto.getId().intValue()).getData();
if (industryApplicationInfo != null) { if (industryApplicationInfo != null) {
ItemInfoVo itemInfoVo = new ItemInfoVo(); ItemInfoVo itemInfoVo = new ItemInfoVo();
...@@ -104,10 +104,11 @@ public class ConfirmOrderService { ...@@ -104,10 +104,11 @@ public class ConfirmOrderService {
BigDecimal totalAmount = industryApplicationInfo.getPrice().multiply(new BigDecimal(itemInfoDto.getNumber())); BigDecimal totalAmount = industryApplicationInfo.getPrice().multiply(new BigDecimal(itemInfoDto.getNumber()));
amount.updateAndGet(v -> new Double((double) (v + totalAmount.doubleValue()))); amount.updateAndGet(v -> new Double((double) (v + totalAmount.doubleValue())));
} }
//影像图库 }
case IMAGE_STORAGE:
if (itemInfoDto.getType().equals(OrderTypeEnum.IMAGE_STORAGE.getType())) {
ImageInfoRelation imageInfoRelation = imageInfoRelationBiz.selectById(itemInfoDto.getId()); ImageInfoRelation imageInfoRelation = imageInfoRelationBiz.selectById(itemInfoDto.getId());
if (imageInfoRelation != null ) { if (imageInfoRelation != null) {
ImageImgStorage imageImgStorage = imageImgStorageBiz.getDetail(itemInfoDto.getId().intValue()).getData(); ImageImgStorage imageImgStorage = imageImgStorageBiz.getDetail(itemInfoDto.getId().intValue()).getData();
if (imageImgStorage != null) { if (imageImgStorage != null) {
List<ImageInfoRelation> imageInfoRelationList = new ArrayList<>(); List<ImageInfoRelation> imageInfoRelationList = new ArrayList<>();
...@@ -128,8 +129,9 @@ public class ConfirmOrderService { ...@@ -128,8 +129,9 @@ public class ConfirmOrderService {
amount.updateAndGet(v -> new Double((double) (v + totalAmount.doubleValue()))); amount.updateAndGet(v -> new Double((double) (v + totalAmount.doubleValue())));
} }
} }
//购物车 }
case SHOPPING_CART_INFO:
if (itemInfoDto.getType().equals(OrderTypeEnum.SHOPPING_CART_INFO.getType())) {
ShoppingCartInfo shoppingCartInfo = shoppingCartInfoBiz.selectById(itemInfoDto.getId()); ShoppingCartInfo shoppingCartInfo = shoppingCartInfoBiz.selectById(itemInfoDto.getId());
if (shoppingCartInfo != null) { if (shoppingCartInfo != null) {
ItemInfoVo itemInfoVo = new ItemInfoVo(); ItemInfoVo itemInfoVo = new ItemInfoVo();
...@@ -145,8 +147,6 @@ public class ConfirmOrderService { ...@@ -145,8 +147,6 @@ public class ConfirmOrderService {
BigDecimal totalAmount = shoppingCartInfo.getTotalAmount(); BigDecimal totalAmount = shoppingCartInfo.getTotalAmount();
amount.updateAndGet(v -> new Double((double) (v + totalAmount.doubleValue()))); amount.updateAndGet(v -> new Double((double) (v + totalAmount.doubleValue())));
} }
default:
break;
} }
}); });
confirmOrderInfoVo.setTotalAmount(new BigDecimal(amount.get())); confirmOrderInfoVo.setTotalAmount(new BigDecimal(amount.get()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment