|
|
@@ -114,7 +114,9 @@ public class OrderInfoService {
|
|
|
orderInfo.setEnabled(true);
|
|
|
// orderInfo.setGoodsAmount(cart.getRealAmount().subtract(cart.getDeliveryAmount()));
|
|
|
|
|
|
- orderInfo.setOrderNo(user.getId() + new SimpleDateFormat("yyyyMMddHHmmss").format(LocalDateTime.now()));
|
|
|
+ DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
|
|
|
+ String localTime = df.format(LocalDateTime.now());
|
|
|
+ orderInfo.setOrderNo(user.getId() + localTime);
|
|
|
|
|
|
//如果未设置预计到达为15分钟
|
|
|
if (ObjectUtil.isEmpty(merchantSettings.getPreparationTime())) {
|
