|
|
@@ -1,37 +1,36 @@
|
|
|
package com.goafanti.order.controller;
|
|
|
|
|
|
|
|
|
-
|
|
|
-import java.io.IOException;
|
|
|
-import java.util.Comparator;
|
|
|
-import java.util.List;
|
|
|
-
|
|
|
-import javax.servlet.http.HttpServletRequest;
|
|
|
-import javax.servlet.http.HttpServletResponse;
|
|
|
-
|
|
|
+import com.goafanti.common.bo.Result;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
+import com.goafanti.common.constant.ErrorConstants;
|
|
|
+import com.goafanti.common.controller.CertifyApiController;
|
|
|
import com.goafanti.common.enums.AttachmentType;
|
|
|
-import com.goafanti.common.model.*;
|
|
|
+import com.goafanti.common.model.TOrderAssist;
|
|
|
+import com.goafanti.common.model.TOrderNew;
|
|
|
+import com.goafanti.common.model.TOrderNewWithBLOBs;
|
|
|
+import com.goafanti.common.model.TOrderRefundWithBLOBs;
|
|
|
import com.goafanti.common.utils.DateUtils;
|
|
|
+import com.goafanti.common.utils.excel.NewExcelUtil;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.order.bo.*;
|
|
|
+import com.goafanti.order.enums.ApprovalNewState;
|
|
|
+import com.goafanti.order.enums.OrderNewState;
|
|
|
import com.goafanti.order.enums.SalesTypes;
|
|
|
import com.goafanti.order.service.OrderAssistService;
|
|
|
+import com.goafanti.order.service.OrderNewService;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
-import org.springframework.cache.annotation.Cacheable;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
-import com.goafanti.common.bo.Result;
|
|
|
-import com.goafanti.common.constant.ErrorConstants;
|
|
|
-import com.goafanti.common.controller.CertifyApiController;
|
|
|
-import com.goafanti.common.utils.excel.NewExcelUtil;
|
|
|
-import com.goafanti.order.enums.ApprovalNewState;
|
|
|
-import com.goafanti.order.enums.OrderNewState;
|
|
|
-import com.goafanti.order.service.OrderNewService;
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
+import javax.servlet.http.HttpServletResponse;
|
|
|
+import java.io.IOException;
|
|
|
+import java.util.Comparator;
|
|
|
+import java.util.List;
|
|
|
|
|
|
@RestController
|
|
|
@RequestMapping(value = "/api/admin/newOrder")
|