丢失订单修改

Administrator

2018-11-13 3f34b73a2504d2a182eeb454d32b2259087eb523

 fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java

@@ -12,6 +12,7 @@


import net.sf.json.JSONObject;



import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

@@ -27,6 +28,7 @@
import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.annotation.RequestNoLogin;

import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;



@Controller

@@ -44,6 +46,10 @@
   

   @Resource

   private AdminUserService adminUserService;

	
   @Resource(name = "taskExecutor")

   private TaskExecutor executor;

	
   



   // private static final String PAYSUCCESS = "支付成功";

@@ -146,6 +152,7 @@
    * @param response

    * @param out

    */

   @RequestNoLogin()

   @RequestMapping(value = "uploadOrderFile")

   public void uploadOrderFile(@RequestParam("file") CommonsMultipartFile file, Long uid,

          HttpServletRequest request, HttpServletResponse response, PrintWriter out) {

@@ -164,17 +171,31 @@
         return;

      }

      

      List<TaoBaoOrder> orderList = null ;

      try {

         List<TaoBaoOrder> orderList = TaoBaoOrderUtil.parseOrder(file.getInputStream());

			
         orderProcessService.processOrder(TaoBaoOrderUtil.classifyTaoBaoOrderByOrderId(orderList));

			
         out.print(JsonUtil.loadTrueResult("上传成功"));

		
         orderList = TaoBaoOrderUtil.parseOrder(file.getInputStream());

         out.print(JsonUtil.loadTrueResult("上传文件成功"));

      } catch (IOException e) {

         out.print(JsonUtil.loadFalseResult("上传文件失败"));

         e.printStackTrace();

         out.print(JsonUtil.loadFalseResult("上传异常"));

      }

		
      final List<TaoBaoOrder> list = orderList;

		
      executor.execute(new Runnable() {

         @Override

         public void run() {

            try {

					
               orderProcessService.processOrder(TaoBaoOrderUtil.classifyTaoBaoOrderByOrderId(list));

					
            } catch (Exception e) {

               e.printStackTrace();

            }



         }

      });

			
   }

   

}