utils包添加工具类，抖音广告修改

admin

2019-10-10 e19ce4be094d93f68bdb6ee1c28e9caa502bf2c4

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

@@ -30,15 +30,16 @@
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.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;

@@ -87,6 +88,9 @@


   @Resource

   private UserMoneyDebtService userMoneyDebtService;



   @Resource

   private UserSystemCouponRecordService userSystemCouponRecordService;



   /**

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

@@ -140,7 +144,8 @@
    */

   @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) {

         Integer state, Integer type, Integer orderState, String startTime, String endTime, Integer sourceType,

         PrintWriter out) {



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

         pageIndex = 1;

@@ -162,16 +167,13 @@
      }



      try {

         long count = 0;



         // 查询列表

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

               state, type, orderState, startTime, endTime);

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



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

            // 统计总数

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

         }

         // 统计总数

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

               sourceType);



         // 查询是否维权

         for (CommonOrderVO order : list) {

@@ -224,7 +226,7 @@
                                 UserMoneyDebtTypeEnum.order, hongBaoOrder.getHongBaoV2().getId());

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

                              order.setWeiQuanBackMoney(

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

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

                           }

                        }

                     }

@@ -724,7 +726,7 @@
   }



   /**

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

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

    * 

    * @param callback

    * @param dateType

@@ -735,7 +737,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;

@@ -771,7 +773,7 @@
         JSONArray line_list = new JSONArray();



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

               endTime);

               endTime, sourceType);



         JSONObject innerList = new JSONObject();

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