Merge branch 'test6.9.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.5

@@ -3,6 +3,7 @@ package com.yohoufo.order.controller;
 import com.yohoufo.common.ApiResponse;
 import com.yohoufo.common.ApiResponse;
 import com.yohoufo.order.model.response.AssetsResp;
 import com.yohoufo.order.model.response.AssetsResp;
 import com.yohoufo.order.service.impl.AssetsService;
 import com.yohoufo.order.service.impl.AssetsService;
+import com.yohoufo.order.service.quartz.PreSaleOrderJob;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +22,22 @@ public class AssetsController {
     @Autowired
     @Autowired
     private AssetsService assetsService;
     private AssetsService assetsService;
 
 
+    @Autowired
+    private PreSaleOrderJob preSaleOrderJob;
+
+
+    /**
+     * 测试环境，定时任务手动触发
+     * 测试完之后去掉
+     * @return
+     */
+    @RequestMapping(params = "method=ufo.qc.test")
+    @ResponseBody
+    public ApiResponse getAssetsDetails(){
+        logger.info("in ufo.qc.test");
+        preSaleOrderJob.process("");
+        return new ApiResponse.ApiResponseBuilder().code(200).data(null).message("ok").build();
+    }
 
 
 
 
     @RequestMapping(params = "method=ufo.asssets.details")
     @RequestMapping(params = "method=ufo.asssets.details")