增加通用模板免单内容

admin

2019-08-19 27920d99bc5925de113aa4f0c22dbba3dcea672f

 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java

@@ -619,18 +619,20 @@
      return orderList;

   }



   public static WeiQuanOrderResult getTaoBaoRelationWeiQuanOrderList(Date startTime, int page, boolean third) {

   public static WeiQuanOrderResult getTaoBaoRelationWeiQuanOrderList(Date startTime, int searchType, int page,

         boolean third) {



      return getRelationAndSpecialWeiQuanOrderList(startTime, page, third, 1);

      return getRelationAndSpecialWeiQuanOrderList(startTime, searchType, page, third, 1);

   }



   public static WeiQuanOrderResult getTaoBaoSpecialWeiQuanOrderList(Date startTime, int page, boolean third) {

   public static WeiQuanOrderResult getTaoBaoSpecialWeiQuanOrderList(Date startTime, int searchType, int page,

         boolean third) {



      return getRelationAndSpecialWeiQuanOrderList(startTime, page, third, 2);

      return getRelationAndSpecialWeiQuanOrderList(startTime, searchType, page, third, 2);

   }



   private static WeiQuanOrderResult getRelationAndSpecialWeiQuanOrderList(Date startTime, int page, boolean third,

         int bizType) {

   private static WeiQuanOrderResult getRelationAndSpecialWeiQuanOrderList(Date startTime, int searchType, int page,

         boolean third, int bizType) {

      WeiQuanOrderResult finalResult = new WeiQuanOrderResult();



      List<TaoBaoWeiQuanOrder> list = new ArrayList<>();

@@ -639,7 +641,7 @@
      map.put("method", "taobao.tbk.relation.refund");



      JSONObject option = new JSONObject();

      option.put("search_type", 2);

      option.put("search_type", searchType);

      option.put("refund_type", third ? 2 : 1);

      option.put("start_time", TimeUtil.getGernalTime(startTime.getTime(), "yyyy-MM-dd HH:mm:ss"));

      option.put("page_no", page);

@@ -667,16 +669,16 @@
               order.setGoodsName(item.optString("tb_auction_title"));

               BigDecimal fanMoney = new BigDecimal(0);

               if (!StringUtil.isNullOrEmpty(item.optString("tk_subsidy_fee_refund3rd_pub"))) {

                  fanMoney=   fanMoney.add(new BigDecimal(item.optString("tk_subsidy_fee_refund3rd_pub")));

                  fanMoney = fanMoney.add(new BigDecimal(item.optString("tk_subsidy_fee_refund3rd_pub")));

               }

               if (!StringUtil.isNullOrEmpty(item.optString("tk_commission_fee_refund3rd_pub"))) {

                  fanMoney=      fanMoney.add(new BigDecimal(item.optString("tk_commission_fee_refund3rd_pub")));

                  fanMoney = fanMoney.add(new BigDecimal(item.optString("tk_commission_fee_refund3rd_pub")));

               }

               if (!StringUtil.isNullOrEmpty(item.optString("tk_subsidy_fee_refund_pub"))) {

                  fanMoney=   fanMoney.add(new BigDecimal(item.optString("tk_subsidy_fee_refund_pub")));

                  fanMoney = fanMoney.add(new BigDecimal(item.optString("tk_subsidy_fee_refund_pub")));

               }

               if (!StringUtil.isNullOrEmpty(item.optString("tk_commission_fee_refund_pub"))) {

                  fanMoney=   fanMoney.add(new BigDecimal(item.optString("tk_commission_fee_refund_pub")));

                  fanMoney = fanMoney.add(new BigDecimal(item.optString("tk_commission_fee_refund_pub")));

               }



               if (fanMoney.compareTo(new BigDecimal(0)) == 0)