品牌

yujian

2019-11-07 c37e84a5bc4629475da4a38415a231f121d39c61

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

@@ -3,6 +3,7 @@
import java.io.PrintWriter;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Date;

import java.util.List;

import java.util.Map;



@@ -19,6 +20,7 @@
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;

@@ -28,6 +30,7 @@
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;

@@ -92,6 +95,10 @@


   @Resource

   private UserSystemCouponRecordService userSystemCouponRecordService;

	
   @Resource

   private ConfigService configService;

	


   /**

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

@@ -146,7 +153,7 @@
   @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 sourceType,

         PrintWriter out) {

         Integer riskType, PrintWriter out) {



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

         pageIndex = 1;

@@ -168,13 +175,44 @@
      }



      try {

         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("admin_min_same_goods_order_count")));

               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")));

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

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



         // 统计总数

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

               sourceType);

               sourceType, listShopId, listGoodsId, minTime, money);



         // 查询是否维权

         for (CommonOrderVO order : list) {