|
@@ -242,7 +242,7 @@ public class OrderLogic {
|
|
|
|
|
|
|
|
List<String> goodsIds = orderBuyBean.getBuyGoods().stream().map(BuyGood::getGoodsId).collect(Collectors.toList());
|
|
List<String> goodsIds = orderBuyBean.getBuyGoods().stream().map(BuyGood::getGoodsId).collect(Collectors.toList());
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
+ final Date curDate = DateUtil.date();
|
|
|
//购物车ids
|
|
//购物车ids
|
|
|
List<String> shoppingCartIds = orderBuyBean.getBuyGoods().stream().map(BuyGood::getShoppingCartId).collect(Collectors.toList());
|
|
List<String> shoppingCartIds = orderBuyBean.getBuyGoods().stream().map(BuyGood::getShoppingCartId).collect(Collectors.toList());
|
|
|
//如果用户存在,则判断是否为业务员,并更新相关信息
|
|
//如果用户存在,则判断是否为业务员,并更新相关信息
|
|
@@ -307,7 +307,7 @@ public class OrderLogic {
|
|
|
orderDetail.setNum(buyGood.getNum());
|
|
orderDetail.setNum(buyGood.getNum());
|
|
|
orderDetail.setTotalPrice(goodsSecPrice.multiply(new BigDecimal(buyGood.getNum())));
|
|
orderDetail.setTotalPrice(goodsSecPrice.multiply(new BigDecimal(buyGood.getNum())));
|
|
|
orderDetail.setImgUrl(goodsSpec.getImgUrl());
|
|
orderDetail.setImgUrl(goodsSpec.getImgUrl());
|
|
|
- orderDetail.setCreateTime(new Date());
|
|
|
|
|
|
|
+ orderDetail.setCreateTime(curDate);
|
|
|
orderDetail.setIsVr(goods.getIsVr());
|
|
orderDetail.setIsVr(goods.getIsVr());
|
|
|
orderDetail.setOrderSmallType(goods.getOrderSmallType());
|
|
orderDetail.setOrderSmallType(goods.getOrderSmallType());
|
|
|
orderDetail.setBrandId(goods.getBrandId());
|
|
orderDetail.setBrandId(goods.getBrandId());
|
|
@@ -359,6 +359,7 @@ public class OrderLogic {
|
|
|
if (orderBuyBean.getPayTypeId().equals(PayTypeEnum.CREDIT.getKey())) {
|
|
if (orderBuyBean.getPayTypeId().equals(PayTypeEnum.CREDIT.getKey())) {
|
|
|
orderInfo.setOrderStatus(OrderStatusEnum.DJH.toString());
|
|
orderInfo.setOrderStatus(OrderStatusEnum.DJH.toString());
|
|
|
orderInfo.setIsCreditOrder(true);
|
|
orderInfo.setIsCreditOrder(true);
|
|
|
|
|
+ orderInfo.setPayTime(curDate);
|
|
|
} else if (orderBuyBean.getPayTypeId().equals(PayTypeEnum.STORE.getKey())) {
|
|
} else if (orderBuyBean.getPayTypeId().equals(PayTypeEnum.STORE.getKey())) {
|
|
|
orderInfo.setOrderStatus(OrderStatusEnum.DQR.toString());
|
|
orderInfo.setOrderStatus(OrderStatusEnum.DQR.toString());
|
|
|
}
|
|
}
|
|
@@ -376,7 +377,7 @@ public class OrderLogic {
|
|
|
orderInfo.setStreet(userAddress.getStreet());
|
|
orderInfo.setStreet(userAddress.getStreet());
|
|
|
orderInfo.setHouseNo(userAddress.getHouseNo());
|
|
orderInfo.setHouseNo(userAddress.getHouseNo());
|
|
|
}
|
|
}
|
|
|
- orderInfo.setCreateTime(new Date());
|
|
|
|
|
|
|
+ orderInfo.setCreateTime(curDate);
|
|
|
orderInfo.setFreight(totalFreight);
|
|
orderInfo.setFreight(totalFreight);
|
|
|
orderInfo.setTotalAmount(totalPrice);
|
|
orderInfo.setTotalAmount(totalPrice);
|
|
|
orderInfo.setPayAmount(payAmount);
|
|
orderInfo.setPayAmount(payAmount);
|