config

yujian

2019-07-30 ed390c70bfbafb399fe20e8b89efc02ca5be008d

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

@@ -10,12 +10,13 @@


import org.springframework.stereotype.Controller;

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

import org.springframework.web.multipart.MultipartFile;

import org.springframework.web.multipart.MultipartHttpServletRequest;

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.controller.admin.utils.AdminUtils;

import com.yeshi.fanli.entity.bus.user.HongBaoV2;

import com.yeshi.fanli.entity.money.UserMoneyDetail;

import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;

import com.yeshi.fanli.entity.order.CommonOrder;

@@ -26,6 +27,7 @@
import com.yeshi.fanli.service.inter.count.TaoBaoOrderCountService;

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

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

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

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

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

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

@@ -34,6 +36,7 @@
import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

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

import com.yeshi.fanli.vo.order.CommonOrderVO;



import net.sf.json.JSONArray;

@@ -69,6 +72,9 @@


   @Resource

   private UserMoneyDetailService userMoneyDetailService;



   @Resource

   private OrderProcessService orderProcessService;



   /**

    * 统计历史订单-淘宝订单

@@ -121,8 +127,9 @@
    * @param out

    */

   @RequestMapping(value = "getUserOrderList")

   public void getUserOrderList(String callback, Integer pageIndex, Integer pageSize, Integer keyType, String key,

         Integer state, Integer type, Integer orderState, String startTime, String endTime, PrintWriter out) {

   public void getUserOrderList(String callback, Integer pageIndex, Integer pageSize, Integer keyType, 
         String key,   Integer state, Integer type, Integer orderState, String startTime, String endTime,

         Integer source, PrintWriter out) {



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

         pageIndex = 1;

@@ -148,11 +155,11 @@


         // 查询列表

         List<CommonOrderVO> list = commonOrderService.listQuery((pageIndex - 1) * pageSize, pageSize, keyType, key,

               state, type, orderState, startTime, endTime);

               state, type, orderState, startTime, endTime, source);



         if (list != null && list.size() > 0) {

            // 统计总数

            count = commonOrderService.countQuery(keyType, key, state, type, orderState, startTime, endTime);

            count = commonOrderService.countQuery(keyType, key, state, type, orderState, startTime, endTime, source);

         }



         // 查询是否维权

@@ -166,7 +173,7 @@
               TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService

                     .selectByOrderItemId(weiQuanOrder.getOrderItemId());

               if (drawBack != null) {// 已经退款

						


                  // 计算退款资金

                  UserMoneyDetail detail = null;

                  switch (order.getHongBaoType()) {

@@ -937,4 +944,23 @@
      return data;

   }



   @RequestMapping(value = "uploadTaoBaoWeiQuanOrder")

   public void uploadWeiQuanOrder(String callback, HttpServletRequest request, PrintWriter out) {

      try {

         // 1. 先判断httpRequest 是否含有文件类型

         if (request instanceof MultipartHttpServletRequest) {

            MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;

            MultipartFile file = fileRequest.getFile("file");

            List<TaoBaoWeiQuanOrder> orderList = TaoBaoOrderUtil.getWeiQuanOrders(file.getInputStream());

            for (TaoBaoWeiQuanOrder order : orderList)

               taoBaoWeiQuanOrderService.addWeiQuanOrder(order);// 添加维权订单到数据库

            // 处理维权订单

            orderProcessService.weiQuanOrder(orderList);

         }

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("更新成功"));

      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("更新失败"));

      }

   }



}