赢家平台-我的团队(战队PEP活动量、战队业绩、战队销售业绩预测、团队成员),以前有部分数据是通过N22接口获取,现在都通过本地获取

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java

@@ -2804,7 +2804,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
             Integer time = requestVO.getTime();
             Integer time = requestVO.getTime();
             time = (time == null) ? 1 : time;
             time = (time == null) ? 1 : time;
             PageHelper.clearPage();//偶然遇到了这个问题，同一个查询结果一会是10个（预期），一会是真实个数（刷新/重启应用就又变成真实个数）  查看日志，发现了问题：结果为10个时查询SQL自动加上了Limit 10
             PageHelper.clearPage();//偶然遇到了这个问题，同一个查询结果一会是10个（预期），一会是真实个数（刷新/重启应用就又变成真实个数）  查看日志，发现了问题：结果为10个时查询SQL自动加上了Limit 10
-            String mobileNo = aclPractitionerDALService.findMobileNoByPractitionerId(practitionerId);
+//            String mobileNo = aclPractitionerDALService.findMobileNoByPractitionerId(practitionerId);
             double fypSum = 0D, fycSum = 0D;
             double fypSum = 0D, fycSum = 0D;
             int countSum = 0;
             int countSum = 0;
             SubordinateSystemStatisticInfo statisticInfo = new SubordinateSystemStatisticInfo();
             SubordinateSystemStatisticInfo statisticInfo = new SubordinateSystemStatisticInfo();
@@ -2812,11 +2812,11 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
             //银盾保险在线
             //银盾保险在线
             getMemberInfoForOnLine(memberInfoMap, practitionerId, time);
             getMemberInfoForOnLine(memberInfoMap, practitionerId, time);
             //N22
             //N22
-            try {
-                this.getMemberInfoFromN22(memberInfoMap, practitionerId, time, mobileNo);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+//            try {
+//                this.getMemberInfoFromN22(memberInfoMap, practitionerId, time, mobileNo);
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
             //20210303增加逻辑,已离职经纪人没有数据不显示
             //20210303增加逻辑,已离职经纪人没有数据不显示
             //查询这个团队已离职经纪人电话
             //查询这个团队已离职经纪人电话
             List<String> leaveOfficeList = aclPractitionerDALService.findLeaveOfficeByPractitionerId(practitionerId);
             List<String> leaveOfficeList = aclPractitionerDALService.findLeaveOfficeByPractitionerId(practitionerId);

yd-api/src/main/java/com/yd/api/practitioner/service/impl/ScheduleTrackServiceImpl.java

@@ -326,14 +326,12 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
 
 
             // 根据团队长经纪人id查询团队每个成员本日，本周，本月得分以及---线上本月FYC
             // 根据团队长经纪人id查询团队每个成员本日，本周，本月得分以及---线上本月FYC
             List<PersonalPEPScore> saleAndRecuit = scheduleTrackMapper.querySaleRecuitScoreFYC(practitionerIdList);
             List<PersonalPEPScore> saleAndRecuit = scheduleTrackMapper.querySaleRecuitScoreFYC(practitionerIdList);
-            // 获取nameList
-            List<String> nameList = new ArrayList<>();
-            saleAndRecuit.forEach(i->nameList.add(i.getName()));
-            List<PersonalOffLineFYC> personalOffLineFYCList = this.offLineFYC(nameList);
-
-
-            // 计算总FYC
-            this.computeTotalFYC(saleAndRecuit, personalOffLineFYCList);
+//            // 获取nameList
+//            List<String> nameList = new ArrayList<>();
+//            saleAndRecuit.forEach(i->nameList.add(i.getName()));
+//            List<PersonalOffLineFYC> personalOffLineFYCList = this.offLineFYC(nameList);
+//            // 计算总FYC
+//            this.computeTotalFYC(saleAndRecuit, personalOffLineFYCList);
 
 
             // 其他活动有长期固定，通过计算时间段内展示次数，算得总分
             // 其他活动有长期固定，通过计算时间段内展示次数，算得总分
             // 先获得每个人所有的其他活动
             // 先获得每个人所有的其他活动

yd-api/src/main/resources/mapper/customer/AclCustomerFortuneMapper.xml

@@ -972,10 +972,10 @@
         s.practitioner_level practitionerLevelId
         s.practitioner_level practitionerLevelId
       FROM
       FROM
       ((ag_acl_practitioner_setting s LEFT JOIN ag_acl_practitioner p ON s.practitioner_id = p.id)
       ((ag_acl_practitioner_setting s LEFT JOIN ag_acl_practitioner p ON s.practitioner_id = p.id)
-      INNER JOIN (select t.* from ag_acl_customer_fortune t where t.drop_option_code = 'S01' group by t.order_id ) f ON f.customer_id = p.customer_id)
+      INNER JOIN ag_acl_customer_fortune f ON f.customer_id = p.customer_id and f.drop_option_code in('S01','C01') )
       INNER JOIN ag_po_order o ON f.order_id = o.id
       INNER JOIN ag_po_order o ON f.order_id = o.id
       WHERE
       WHERE
-      o.status = 3 and o.order_price > 0
+      o.status = 3 and o.payment_status = 3 and o.order_price > 0
       <choose>
       <choose>
         <when test="time == 1">
         <when test="time == 1">
           and DATE_FORMAT(f.order_date, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
           and DATE_FORMAT(f.order_date, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )

yd-api/src/main/resources/mapper/marketing/ScheduleTrackMapper.xml

@@ -135,7 +135,7 @@
                    where o.`status` =3
                    where o.`status` =3
                    and  o.payment_status =3
                    and  o.payment_status =3
                    and o.fyc_amount>0
                    and o.fyc_amount>0
-                   and t.drop_option_code ='S01'
+                   and t.drop_option_code in('S01','C01')
                    and DATE_FORMAT(o.created_at, '%Y%m' ) = DATE_FORMAT( CURDATE() , '%Y%m' )
                    and DATE_FORMAT(o.created_at, '%Y%m' ) = DATE_FORMAT( CURDATE() , '%Y%m' )
                    group by t.customer_id
                    group by t.customer_id
         ) fyc
         ) fyc