|
|
@@ -10,42 +10,35 @@
|
|
|
|
|
|
package com.yami.shop.api.controller;
|
|
|
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
-import java.util.*;
|
|
|
-import java.util.stream.Collectors;
|
|
|
-
|
|
|
-import javax.validation.Valid;
|
|
|
-
|
|
|
-
|
|
|
-import cn.hutool.core.date.DateTime;
|
|
|
+import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import com.google.common.collect.Lists;
|
|
|
import com.yami.shop.bean.app.dto.*;
|
|
|
+import com.yami.shop.bean.app.param.OrderParam;
|
|
|
import com.yami.shop.bean.app.param.OrderPayInfoParam;
|
|
|
+import com.yami.shop.bean.app.param.OrderShopParam;
|
|
|
+import com.yami.shop.bean.app.param.SubmitOrderParam;
|
|
|
import com.yami.shop.bean.event.ConfirmOrderEvent;
|
|
|
import com.yami.shop.bean.event.PlatformConfirmOrderEvent;
|
|
|
import com.yami.shop.bean.event.ScoreConfirmOrderEvent;
|
|
|
import com.yami.shop.bean.event.SubmitSeckillOrderEvent;
|
|
|
import com.yami.shop.bean.model.*;
|
|
|
-import com.yami.shop.common.exception.YamiShopBindException;
|
|
|
-import com.yami.shop.seckill.comment.service.SeckillOrderService;
|
|
|
+import com.yami.shop.common.exception.GlobalException;
|
|
|
+import com.yami.shop.common.util.Arith;
|
|
|
import com.yami.shop.security.api.util.SecurityUtils;
|
|
|
import com.yami.shop.service.*;
|
|
|
+import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
|
+import io.swagger.annotations.ApiOperation;
|
|
|
+import ma.glasnost.orika.MapperFacade;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.context.ApplicationContext;
|
|
|
import org.springframework.http.ResponseEntity;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
-import com.yami.shop.bean.app.param.OrderParam;
|
|
|
-import com.yami.shop.bean.app.param.OrderShopParam;
|
|
|
-import com.yami.shop.bean.app.param.SubmitOrderParam;
|
|
|
-import com.yami.shop.common.util.Arith;
|
|
|
-
|
|
|
-import cn.hutool.core.collection.CollectionUtil;
|
|
|
-import io.swagger.annotations.Api;
|
|
|
-import io.swagger.annotations.ApiOperation;
|
|
|
-import ma.glasnost.orika.MapperFacade;
|
|
|
+import javax.validation.Valid;
|
|
|
+import java.util.*;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
@RestController
|
|
|
@RequestMapping("/p/order")
|
wangming