小黄条+ 首页弹框 版本区分

yujian

2020-01-08 81ed418ee16df24b768a3f78cd22d02f020d6314

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

@@ -1,7 +1,9 @@
package com.yeshi.fanli.controller.admin;



import java.io.PrintWriter;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Date;

import java.util.List;

import java.util.Map;



@@ -17,22 +19,34 @@
import com.google.gson.Gson;

import com.google.gson.reflect.TypeToken;

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

import com.yeshi.fanli.dto.ChartTDO;

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

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

import com.yeshi.fanli.entity.money.UserMoneyDebt.UserMoneyDebtTypeEnum;

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

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;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

import com.yeshi.fanli.service.inter.count.TaoBaoOrderCountService;

import com.yeshi.fanli.service.inter.money.UserMoneyDebtService;

import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;

import com.yeshi.fanli.service.inter.money.tb.TaoBaoWeiQuanDrawBackService;

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

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

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.taobao.TaoBaoOrderService;

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

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

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

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;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

@@ -75,6 +89,21 @@


   @Resource

   private OrderProcessService orderProcessService;



   @Resource

   private HongBaoOrderService hongBaoOrderService;



   @Resource

   private UserMoneyDebtService userMoneyDebtService;



   @Resource

   private UserSystemCouponRecordService userSystemCouponRecordService;



   @Resource

   private ConfigService configService;



   @Resource

   private UserOrderWeiQuanRecordService userOrderWeiQuanRecordService;



   /**

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

@@ -127,9 +156,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,

         Integer source, 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 sourceType,

         Integer riskType, PrintWriter out) {



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

         pageIndex = 1;

@@ -151,27 +180,58 @@
      }



      try {

         long count = 0;

         Date minTime = null;

         BigDecimal money = null;

         List<Long> listShopId = null;

         List<Long> listGoodsId = null;

         // 风险

         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(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(ConfigKeyEnum.adminMinSameShopOrderCount.getKey())));

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

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

                  return;

               }

            } else if (riskType == 3) {

               money = new BigDecimal(100);

               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, source);

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



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

            // 统计总数

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

         }

         // 统计总数

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

               sourceType, listShopId, listGoodsId, minTime, money);



         // 查询是否维权

         for (CommonOrderVO order : list) {

            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

                     .selectByOrderItemId(weiQuanOrder.getOrderItemId());

               TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService.selectByOrderItemIdAndUid(

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

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



                  // 计算退款资金

@@ -201,11 +261,33 @@
                     // 退款成功

                     order.setWeiQuanBackMoney(detail.getMoney().abs().toString());

                  } else {// 尚未退款

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

                     order.setWeiQuanBackMoney(drawBack.getDrawBackMoney().toString());

                     // 查询出对应的hongBaoId

                     CommonOrder commonOrder = commonOrderService.selectBySourceTypeAndTradeId(

                           Constant.SOURCE_TYPE_TAOBAO, drawBack.getOrderItemId());

                     if (commonOrder != null) {

                        HongBaoOrder hongBaoOrder = hongBaoOrderService

                              .selectDetailByCommonOrderId(commonOrder.getId());

                        if (hongBaoOrder != null) {

                           UserMoneyDebt debt = userMoneyDebtService.selectByTypeAndSourceId(

                                 UserMoneyDebtTypeEnum.order, hongBaoOrder.getHongBaoV2().getId());

                           if (debt != null && debt.getLeftMoney().compareTo(new BigDecimal(0)) > 0) {

                              order.setWeiQuanBackMoney(

                                    new BigDecimal(0).subtract(debt.getLeftMoney()).toString());// 未扣除

                           }

                        }

                     }

                  }



               } 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());

                  }

               }

            }

         }

@@ -374,8 +456,8 @@
         JSONArray line_list = new JSONArray();



         for (String channel : channelList) {

            List<Map<String, Object>> list = hongBaoV2CountService.count24HOderByChannel(channel, dateType, year,

                  startTime, endTime);

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

                  endTime);



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

               channel = "总计";

@@ -499,7 +581,6 @@
    */

   public JSONObject countHistoryHongBao(String channelArray, Integer dateType, Integer state, String year,

         String startTime, String endTime, int countType) throws Exception {



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

         startTime = null;

         endTime = null;

@@ -543,7 +624,7 @@


      JSONArray line_list = new JSONArray();

      for (String channel : channelList) {

         List<Map<String, Object>> list = null;

         List<ChartTDO> list = null;

         if (countType == 1) {

            list = hongBaoV2CountService.countHongBaoNum(channel, dateType, state, year, startTime, endTime);

         } else if (countType == 2) {

@@ -568,7 +649,6 @@
            }

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

         }



         line_list.add(innerList);

      }



@@ -578,9 +658,7 @@
      } else {

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

      }



      data.put("line_list", line_list);



      return data;

   }



@@ -600,7 +678,6 @@
   @RequestMapping(value = "getTypeNumber")

   public void getTypeNumber(String callback, Integer dateType, String typeArray, 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));

@@ -647,15 +724,10 @@
      Gson gson = new Gson();

      Object objectDate = null;

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



      try {



         JSONArray line_list = new JSONArray();

         for (Integer type : channelList) {



            List<Map<String, Object>> 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", "返利订单");

@@ -698,7 +770,7 @@
   }



   /**

    * 订单跟踪准确率(返利券用户订单/淘宝联盟订单)

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

    * 

    * @param callback

    * @param dateType

@@ -709,7 +781,7 @@
    */

   @RequestMapping(value = "getTrackAccuracyRate")

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

         PrintWriter out) {

         int sourceType, PrintWriter out) {



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

         startTime = null;

@@ -744,8 +816,8 @@


         JSONArray line_list = new JSONArray();



         List<Map<String, Object>> list = commonOrderCountService.getTrackAccuracyRate(dateType, year, startTime,

               endTime);

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

               sourceType);



         JSONObject innerList = new JSONObject();

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

@@ -908,7 +980,7 @@
      List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);



      JSONArray line_list = new JSONArray();

      List<Map<String, Object>> list = null;

      List<ChartTDO> list = null;

      if (countType == 1) {

         list = commonOrderCountService.countWeiQaunOrderNumber(dateType, year, startTime, endTime);

      } else if (countType == 2) {