通用模板修改

admin

2019-08-19 e5e38de6745c8fcae91fa7e459898f3663d00001

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

@@ -10,8 +10,6 @@


import javax.annotation.Resource;



import net.sf.json.JSONObject;



import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Controller;

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

@@ -24,7 +22,6 @@
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

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

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

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

@@ -35,12 +32,12 @@
import com.yeshi.fanli.util.TimeUtil;

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



import net.sf.json.JSONObject;



@Controller

@RequestMapping("admin/new/api/v1/upload")

public class UploadController {



   @Resource

   private HongBaoService hongBaoService;



   @Resource

   private OrderService orderService;

@@ -164,7 +161,7 @@
                  }

               }



               CMQManager.getInstance().addTaoBaoOrderMsg(key, orders);

               CMQManager.getInstance().addTaoBaoOrderMsg(key);

               try {

                  // 6小时内不再处理

                  if (Constant.IS_OUTNET) {