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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/controller/admin/order/TaoBaoOrderController.java

@@ -21,9 +21,11 @@
import com.google.gson.JsonSerializationContext;

import com.google.gson.JsonSerializer;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.job.order.taobao.UpdateOrderJob;

import com.yeshi.fanli.job.order.taobao.UpdateTBRelationAndSpecialOrderJob;

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

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

@@ -37,6 +39,9 @@


   @Resource

   private TaoBaoOrderService taoBaoOrderService;



   @Resource

   private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService;



   @Resource

   private UpdateTBRelationAndSpecialOrderJob updateRelationAndSpecialOrderJob;

@@ -140,4 +145,48 @@
      }

   }



   @RequestMapping(value = "listTaoBaoWQOrder")

   public void listTaoBaoWeiQuanOrder(String callback, String key, Integer pageIndex, PrintWriter out) {

      try {

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

            pageIndex = 1;

         }

         List<TaoBaoWeiQuanOrder> orderList = null;

         Long count = null;

         if (!StringUtil.isNullOrEmpty(key)) {

            orderList = taoBaoWeiQuanOrderService.listByOrderId(key);

            count = (long) orderList.size();

         } else {

            orderList = taoBaoWeiQuanOrderService.listByState(null, pageIndex, Constant.PAGE_SIZE);

            count = taoBaoWeiQuanOrderService.countByState(null);

         }



         int pageSize = Constant.PAGE_SIZE;



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

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



         Gson gson = new GsonBuilder().registerTypeAdapter(Date.class, new JsonSerializer<Date>() {

            @Override

            public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {

               if (value == null) {

                  return new JsonPrimitive("");

               } else {

                  return new JsonPrimitive(TimeUtil.getGernalTime(value.getTime(), "yyyy-MM-dd HH:mm:ss"));

               }

            }

         }).create();



         JSONObject data = new JSONObject();

         data.put("pe", pe);

         data.put("result_list", gson.toJson(orderList));



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));



      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("查询失败"));

         e.printStackTrace();

      }

   }



}