Merge remote-tracking branch 'origin/div' into div

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

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

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


import javax.annotation.Resource;



import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

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

import org.yeshi.utils.JsonUtil;

@@ -20,7 +18,8 @@
import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;



import net.sf.json.JSONObject;



@Controller

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

@@ -29,49 +28,6 @@
   @Resource

   private LostOrderService lostOrderService;



   @RequestMapping("findLostOrderList")

   public void findLostOrderList(int page, String key, PrintWriter out) {

      List<LostOrder> list = lostOrderService.findLostOrderList(key, page);

      int count = lostOrderService.getCount(key);

      PageEntity pe = new PageEntity(page, Constant.PAGE_SIZE, count);

      JSONObject data = new JSONObject();

      data.put("pe", pe);

      data.put("lostOrderList", GsonUtil.toJsonByUserAp(list));

      out.print(JsonUtil.loadTrueResult(data));

   }



   @RequestMapping("pass")

   public void pass(long id, PrintWriter out) {

      LostOrder lostOrder = lostOrderService.getOne(id);

      if (lostOrder == null) {

         out.print(JsonUtil.loadFalseResult("不存在该查询订单"));

         return;

      }

      if (lostOrder.getState() != 0) {

         out.print(JsonUtil.loadFalseResult("该订单已处理"));

         return;

      }

      lostOrderService.pass(lostOrder);

      out.print(JsonUtil.loadTrueResult(""));

   }



   @RequestMapping("reject")

   public void reject(long id,String reason, PrintWriter out) {

      LostOrder lostOrder = lostOrderService.getOne(id);

      if (lostOrder == null) {

         out.print(JsonUtil.loadFalseResult("不存在该查询订单"));

         return;

      }

      if (lostOrder.getState() != 0) {

         out.print(JsonUtil.loadFalseResult("该订单已处理"));

         return;

      }

      lostOrder.setRemake(reason);

      lostOrderService.reject(lostOrder);

      out.print(JsonUtil.loadTrueResult(""));

   }



	
   /**

    * 新版后台 列表查询

    * @param callback

@@ -81,7 +37,7 @@
    */

   @RequestMapping("query")

   public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state, 

         Integer handleType, PrintWriter out) {

         Integer handleType, Integer type, PrintWriter out) {

      

      if (pageIndex == null || pageIndex < 0){

         pageIndex = 1;

@@ -93,7 +49,7 @@
      

      try {

         

         List<LostOrder> list = lostOrderService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state, handleType);

         List<LostOrder> list = lostOrderService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state, handleType, type);

         if (list == null || list.size() == 0) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无更多数据"));

            return;

@@ -102,12 +58,35 @@
         

         for (LostOrder lostOrder: list) {

            

            Integer stateOrder = lostOrder.getState();

            Integer resultCode = lostOrder.getResultCode();

            if (stateOrder != null && stateOrder == 1 && resultCode!= null) {

               switch(resultCode) {

                  case 1:

                     lostOrder.setRemake("等待爬取中");

                     break;

                  case 2:

                     lostOrder.setRemake("处理成功");

                     break;

                  case 3:

                     lostOrder.setState(2);

                     lostOrder.setRemake("处理失败");

                     break;

                  default:

                     break;

               }

            } else if (stateOrder != null && stateOrder == 2) {

               lostOrder.setRemake("已拒绝");

            }

				
				
            Order order = lostOrder.getOrder();

            if (order == null) {

               lostOrder.setOrder(new Order());

            }

            UserInfo userInfo = lostOrder.getUserInfo();

            

				
            UserInfo userInfo = lostOrder.getUserInfo();

            if (userInfo == null) {

               lostOrder.setUserInfo(new UserInfo());

            } else {

@@ -119,7 +98,7 @@
            }

         }

         

         long count = lostOrderService.countQuery(key, state, handleType);

         long count = lostOrderService.countQuery(key, state, handleType, type);

         int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

         PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);

         

@@ -214,4 +193,5 @@
      }

      

   }

	
}