|
|
@@ -34,6 +34,7 @@ import lombok.AllArgsConstructor;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.LocalTime;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
@@ -113,7 +114,7 @@ public class OrderInfoService {
|
|
|
orderInfo.setEnabled(true);
|
|
|
// orderInfo.setGoodsAmount(cart.getRealAmount().subtract(cart.getDeliveryAmount()));
|
|
|
|
|
|
- orderInfo.setOrderNo(user.getId() + "" + LocalDateTime.parse(now.toString(), DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
|
|
|
+ orderInfo.setOrderNo(user.getId() + new SimpleDateFormat("yyyyMMddHHmmss").format(LocalDateTime.now()));
|
|
|
|
|
|
//如果未设置预计到达为15分钟
|
|
|
if (ObjectUtil.isEmpty(merchantSettings.getPreparationTime())) {
|
