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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

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

@@ -27,6 +27,8 @@
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;

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

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

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

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

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

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

import com.yeshi.fanli.exception.order.CommonOrderException;

@@ -41,6 +43,7 @@
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;

@@ -95,10 +98,12 @@


   @Resource

   private UserSystemCouponRecordService userSystemCouponRecordService;

	


   @Resource

   private ConfigService configService;

	


   @Resource

   private UserOrderWeiQuanRecordService userOrderWeiQuanRecordService;



   /**

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

@@ -180,22 +185,22 @@
         List<Long> listShopId = null;

         List<Long> listGoodsId = null;

         // 风险

         if (riskType != null && !StringUtil.isNullOrEmpty(key) && keyType!= null && keyType == 2) {

         if (riskType != null && !StringUtil.isNullOrEmpty(key) && keyType != null && keyType == 2) {

            long uid = Long.parseLong(key);

            // 查询同店铺商品，同商品订单超过一定数量的

            List<Integer> typeList = new ArrayList<>();

            typeList.add(HongBaoV2.TYPE_ZIGOU);

				


            if (riskType == 1) {

               listGoodsId = commonOrderCountService.getSameGoodsOrderByUidAndHongBaoType(typeList, uid,

                     Integer.parseInt(configService.get("admin_min_same_goods_order_count")));

                     Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameGoodsOrderCount.getKey())));

               if (listGoodsId == null || listGoodsId.isEmpty()) {

                  JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无同商品订单"));

                  return;

               }

            } else if (riskType == 2) {

               listShopId  = commonOrderCountService.getSameShopOrderByUidAndHongBaoType(typeList, uid,

                     Integer.parseInt(configService.get("admin_min_same_shop_order_count")));

               listShopId = commonOrderCountService.getSameShopOrderByUidAndHongBaoType(typeList, uid,

                     Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameShopOrderCount.getKey())));

               if (listShopId == null || listShopId.isEmpty()) {

                  JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无同店铺订单"));

                  return;

@@ -205,7 +210,7 @@
               minTime = new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 180L);

            }

         }

			


         // 查询列表

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

               state, type, orderState, startTime, endTime, sourceType, listShopId, listGoodsId, minTime, money);

@@ -216,17 +221,17 @@


         // 查询是否维权

         for (CommonOrderVO order : list) {

            if (order.getUserInfo() == null || order.getUserInfo().getId() == null)

            if (order.getUserId() == null)

               continue;

				


            // 查询是否维权

            TaoBaoWeiQuanOrder weiQuanOrder = taoBaoWeiQuanOrderService.listByorderItemId(order.getTradeId());

            if (weiQuanOrder != null)// 有维权

            {

               order.setWeiQuanState(weiQuanOrder.getState());

               order.setState(CommonOrder.STATE_WQ);

               TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService.selectByOrderItemIdAndUid(weiQuanOrder.getOrderItemId(),

                     order.getUserInfo().getId());

               TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService.selectByOrderItemIdAndUid(

                     weiQuanOrder.getOrderItemId(), Long.parseLong(order.getUserId()));

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



                  // 计算退款资金

@@ -275,7 +280,14 @@
                  }



               } else {// 尚未退款

                  order.setWeiQuanBackMoney("-" + order.getHongBao());

                  UserOrderWeiQuanRecord record = userOrderWeiQuanRecordService.selectByOrderInfoAndUid(

                        Long.parseLong(order.getUserId()), weiQuanOrder.getOrderItemId(),

                        Constant.SOURCE_TYPE_TAOBAO);

                  if (record != null)

                     order.setWeiQuanBackMoney("-" + record.getMoney());

                  else {

                     order.setWeiQuanBackMoney("-" + order.getHongBao());

                  }

               }

            }

         }

@@ -370,156 +382,12 @@
      }

   }



   /**

    * 统计历史渠道产生订单的金额

    * 
    * @param callback

    * @param channelArray

    *            名字数组

    * @param type

    *            统计类型 1-24小时 2-所有

    * @param dateType

    *            类型 1日 2月 3年

    * @param year

    *            2018

    * @param startTime

    *            2018-12-01

    * @param endTime

    *            2018-12-01

    * @param out

    */

   @RequestMapping(value = "get24HOderChannelCharts")

   public void get24HOderChannelCharts(String callback, String channelArray, Integer dateType, String year,

         String startTime, String endTime, PrintWriter out) {



      String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);

      if (validateMsg != null) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));

         return;

      }



      if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {

         startTime = null;

         endTime = null;

      }



      List<String> channelList = null;

      if (channelArray != null && channelArray.trim().length() > 0) {

         Gson gson = new Gson();

         channelList = gson.fromJson(channelArray, new TypeToken<ArrayList<String>>() {

         }.getType());

      }



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

         channelList = new ArrayList<String>();

         channelList.add("all");

      }



      if (dateType == 1 && year != null) {

         year = null; // 设置为空

      } else if (dateType == 2) {

         if (startTime != null)

            startTime = null;



         if (endTime != null)

            endTime = null;



      } else if (dateType == 3) {

         if (year != null)

            year = null;



         if (startTime != null)

            startTime = null;



         if (endTime != null)

            endTime = null;

      }



      try {



         Gson gson = new Gson();

         Object objectDate = null;

         List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);



         JSONArray line_list = new JSONArray();



         for (String channel : channelList) {

            List<ChartTDO> list = hongBaoV2CountService.count24HOderByChannel(channel, dateType, year,

                  startTime, endTime);



            if ("all".equalsIgnoreCase(channel)) {

               channel = "总计";

            }



            JSONObject innerList = new JSONObject();

            innerList.put("name", channel);



            if (dateType != 3) {

               innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));

            } else {

               // 年视图

               Map<String, Object> map = AdminUtils.yearsDataFactory(list);



               if (objectDate == null) {

                  objectDate = map.get("date");

               }

               innerList.put("data", gson.toJson(map.get("value")));

            }



            line_list.add(innerList);

         }



         JSONObject data = new JSONObject();

         if (objectDate != null) {

            data.put("xAxis_list", gson.toJson(objectDate));

         } else {

            data.put("xAxis_list", gson.toJson(dateList));

         }



         data.put("line_list", line_list);



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



      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

         e.printStackTrace();

      }

   }



   /**

    * 统计提现申请总次数

    * 
    * @param callback

    * @param channelArray

    *            渠道名 为空是统计所有

    * @param dateType

    *            显示视图：日-1 、月-2、 年-3

    * @param state

    *            状态： 1-未到账 2-已到账 3-已失效

    * @param year

    * @param startTime

    * @param endTime

    * @param out

    */

   @RequestMapping(value = "getHongBaoNum")

   public void getHongBaoNum(String callback, String channelArray, Integer dateType, Integer state, String year,

         String startTime, String endTime, PrintWriter out) {



      String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);

      if (validateMsg != null) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));

         return;

      }



      try {

         JSONObject data = countHistoryHongBao(channelArray, dateType, state, year, startTime, endTime, 1);

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

      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("系统异常"));

         e.printStackTrace();

      }

   }



	
	
	
	
	
	
   /**

    * 统计提现申请总金额

    * 

@@ -715,8 +583,7 @@
      try {

         JSONArray line_list = new JSONArray();

         for (Integer type : channelList) {

            List<ChartTDO> list = hongBaoV2CountService.countHongBaoType(dateType, type, year, startTime,

                  endTime);

            List<ChartTDO> list = hongBaoV2CountService.countHongBaoType(dateType, type, year, startTime, endTime);

            JSONObject innerList = new JSONObject();

            if (type == 1) {

               innerList.put("name", "返利订单");

@@ -758,88 +625,6 @@
      }

   }



   /**

    * 订单跟踪准确率(板栗快省用户订单/淘宝联盟订单)

    * 
    * @param callback

    * @param dateType

    * @param year

    * @param startTime

    * @param endTime

    * @param out

    */

   @RequestMapping(value = "getTrackAccuracyRate")

   public void getTrackAccuracyRate(String callback, Integer dateType, String year, String startTime, String endTime,

         int sourceType, PrintWriter out) {



      if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {

         startTime = null;

         endTime = null;

      }



      if (dateType == 1 && year != null) {

         year = null; // 设置为空

      } else if (dateType == 2) {

         if (startTime != null)

            startTime = null;



         if (endTime != null)

            endTime = null;



      } else if (dateType == 3) {

         if (year != null)

            year = null;



         if (startTime != null)

            startTime = null;



         if (endTime != null)

            endTime = null;

      }



      try {



         Gson gson = new Gson();

         Object objectDate = null;

         List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);



         JSONArray line_list = new JSONArray();



         List<ChartTDO> list = commonOrderCountService.getTrackAccuracyRate(dateType, year, startTime,

               endTime, sourceType);



         JSONObject innerList = new JSONObject();

         innerList.put("name", "总计");



         if (dateType != 3) {

            innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));

         } else {

            // 年视图

            Map<String, Object> map = AdminUtils.yearsDataFactory(list);



            if (objectDate == null) {

               objectDate = map.get("date");

            }

            innerList.put("data", gson.toJson(map.get("value")));

         }



         line_list.add(innerList);



         JSONObject data = new JSONObject();

         if (objectDate != null) {

            data.put("xAxis_list", gson.toJson(objectDate));

         } else {

            data.put("xAxis_list", gson.toJson(dateList));

         }



         data.put("line_list", line_list);

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



      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

         e.printStackTrace();

      }

   }



   /**

    * 当前未收货订单数