唯品会订单bug修复，APP端佣金比例展示错误bug修复

admin

2020-06-10 271ae63c20fcbe28d29c47f1881138ff6551a2a1

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java

@@ -1040,7 +1040,6 @@
         int darenMonth = 0;

         int highVIPMonth = 0;

         int superVIPMonth = 0;

         Date date = new Date();

         Date minTime = TimeUtil.parseYYYYMMDD(firstday);

         Date maxTime = TimeUtil.parseYYYYMMDD_HHMMSS(lastday + " 23:59:59");

         List<TeamDailyRecord> listMonth = teamDailyRecordService.sumGroupByYearMonth(uid, minTime, maxTime);

@@ -1202,14 +1201,24 @@
      if (directNum > 0) {

         indirectNum = threeSaleSerivce.countSecondTeam(workerId);

      }



      data.put("fansNum", "直接粉丝： " + directNum + "人\n" + "间接粉丝： " + indirectNum + "人");

		
      // 订单统计

      long countTB = commonOrderCountService.countOrderBySourceAndNearDay(workerId, Constant.SOURCE_TYPE_TAOBAO, 60);

      long countJD = commonOrderCountService.countOrderBySourceAndNearDay(workerId, Constant.SOURCE_TYPE_JD, 60);

      long countPDD = commonOrderCountService.countOrderBySourceAndNearDay(workerId, Constant.SOURCE_TYPE_PDD, 60);



      data.put("fansNum", "直接粉丝： " + directNum + "人\n" + "间接粉丝： " + indirectNum + "人");

      data.put("orderInfo", "淘宝 (" + countTB + "笔)\n" + "京东 (" + countJD + "笔)\n" + "拼多多 (" + countPDD + "笔)");

		
      StringBuilder builder = new StringBuilder();

      builder.append("淘宝 (" + countTB + "笔)");

      builder.append("\n京东 (" + countJD + "笔)");

      builder.append("\n拼多多 (" + countPDD + "笔)");

      if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {

         long countVip = commonOrderCountService.countOrderBySourceAndNearDay(workerId, Constant.SOURCE_TYPE_VIP, 60);

         long countSL = commonOrderCountService.countOrderBySourceAndNearDay(workerId, Constant.SOURCE_TYPE_SUNING, 60);

         builder.append("\n唯品会 (" + countVip + "笔)");

         builder.append("\n苏宁 (" + countSL + "笔)");

      }

      data.put("orderInfo", builder.toString());

      out.print(JsonUtil.loadTrueResult(data));

   }



@@ -1335,14 +1344,24 @@
      if (directNum > 0) {

         indirectNum = threeSaleSerivce.countSecondTeam(fansId);

      }

      data.put("fansNum", "直接粉丝： " + directNum + "人\n" + "间接粉丝： " + indirectNum + "人");



      // 订单统计

      long countTB = commonOrderCountService.countOrderBySourceAndNearDay(fansId, Constant.SOURCE_TYPE_TAOBAO, 60);

      long countJD = commonOrderCountService.countOrderBySourceAndNearDay(fansId, Constant.SOURCE_TYPE_JD, 60);

      long countPDD = commonOrderCountService.countOrderBySourceAndNearDay(fansId, Constant.SOURCE_TYPE_PDD, 60);



      data.put("fansNum", "直接粉丝： " + directNum + "人\n" + "间接粉丝： " + indirectNum + "人");

      data.put("orderInfo", "淘宝 (" + countTB + "笔)\n" + "京东 (" + countJD + "笔)\n" + "拼多多 (" + countPDD + "笔)");

      StringBuilder builder = new StringBuilder();

      builder.append("淘宝 (" + countTB + "笔)");

      builder.append("\n京东 (" + countJD + "笔)");

      builder.append("\n拼多多 (" + countPDD + "笔)");

      if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {

         long countVip = commonOrderCountService.countOrderBySourceAndNearDay(fansId, Constant.SOURCE_TYPE_VIP, 60);

         long countSL = commonOrderCountService.countOrderBySourceAndNearDay(fansId, Constant.SOURCE_TYPE_SUNING, 60);

         builder.append("\n唯品会 (" + countVip + "笔)");

         builder.append("\n苏宁 (" + countSL + "笔)");

      }

      data.put("orderInfo", builder.toString());

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

   }