Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -7,9 +7,6 @@


import javax.annotation.Resource;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

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

import org.yeshi.utils.JsonUtil;

@@ -24,8 +21,10 @@
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 com.yeshi.fanli.util.StringUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@Controller

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

@@ -34,49 +33,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

@@ -107,12 +63,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 {