修改sql

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java

@@ -34,7 +34,7 @@ public final class RedisUtil extends AbstractRedisUtil{
 
     public static void main(String[] args) {
         String[] keys = {
-                "smile:sellDataCommission:1002264657154048003225953",
+                "smile:sellData:10022646571540480032259531001879371141365764109917",
         };
         for (String key : keys) {
             long value = key.hashCode();

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml

@@ -79,14 +79,14 @@
     </select>
     <select id="getUserPerformance" parameterType="String" resultType="java.util.Map">
         SELECT c.title as 'title' ,c.performanceId as 'performanceId', SUM(commiss) as 'commiss',c.timeEnd as 'timeEnd' FROM(
-        select o.performance_title as 'title',r.performance_id as 'performanceId' ,SUM(r.agent_distributions * (o.price-o.price_refund)) as 'commiss',kp.time_end as 'timeEnd'
+        select o.performance_title as 'title',r.performance_id as 'performanceId' ,SUM(r.agent_distributions * (o.price_actual-o.price_refund)) as 'commiss',kp.time_end as 'timeEnd'
         from (select * from kylin_order_tickets where created_at>DATE_SUB(CURDATE(), INTERVAL 6 MONTH)) as o
         LEFT JOIN kylin_order_ticket_status as s on o.order_tickets_id=s.order_id
         LEFT JOIN kylin_order_ticket_relations 	as r ON o.order_tickets_id=r.order_id
         LEFT JOIN kylin_performances as kp ON  r.performance_id= kp.performances_id
         where r.agent_id=#{agentId} and s.pay_status='1'  GROUP BY r.performance_id
         UNION
-        select o.performance_title as 'title',r.performance_id as 'performanceId' ,SUM(r.agent_distributions_master * (o.price-o.price_refund)) as 'commiss',kp.time_end as 'timeEnd'
+        select o.performance_title as 'title',r.performance_id as 'performanceId' ,SUM(r.agent_distributions_master * (o.price_actual-o.price_refund)) as 'commiss',kp.time_end as 'timeEnd'
         from (select * from kylin_order_tickets where created_at>DATE_SUB(CURDATE(), INTERVAL 6 MONTH)) as o
         LEFT JOIN kylin_order_ticket_status as s on o.order_tickets_id=s.order_id
         LEFT JOIN kylin_order_ticket_relations 	as r ON o.order_tickets_id=r.order_id
@@ -100,14 +100,14 @@
             time_end>DATE_SUB(CURDATE(), INTERVAL 6 MONTH) and s.`status` in (3,6,7,8,9,10);
     </select>
     <select id="getUserCommission" parameterType="String" resultType="java.util.Map">
-        select SUM(r.agent_distributions_master * (o.price-o.price_refund)) as 'commiss'
+        select SUM(r.agent_distributions * (o.price_actual-o.price_refund)) as 'commiss'
         from  (select * from kylin_order_tickets where created_at>DATE_SUB(CURDATE(), INTERVAL 6 MONTH)) as o
         LEFT JOIN kylin_order_ticket_status as s on  o.order_tickets_id=s.order_id
         LEFT JOIN kylin_order_ticket_relations as r ON o.order_tickets_id=r.order_id
-        where  r.agent_id_master=#{agentId}    and s.pay_status='1'
+        where  r.agent_id=#{agentId}    and s.pay_status='1'
     </select>
     <select id="getUserSellOneDate" parameterType="String" resultType="java.util.Map">
-      select t.title as 'title',ticket_id as 'ticketId',(SUM(number)-SUM(refund_number)) as 'number',(SUM(o.price)-SUM(o.price_refund)) as 'price',SUM(r.agent_distributions * (o.price-o.price_refund)) as 'commiss',r.agent_distributions as 'paioTi'
+      select t.title as 'title',ticket_id as 'ticketId',(SUM(number)-SUM(refund_number)) as 'number',(SUM(o.price_actual)-SUM(o.price_refund)) as 'price',SUM(r.agent_distributions * (o.price_actual-o.price_refund)) as 'commiss',r.agent_distributions as 'paioTi'
 	from  (select * from kylin_order_tickets where created_at>DATE_SUB(CURDATE(), INTERVAL 6 MONTH)) as o
 	LEFT JOIN kylin_order_ticket_status as s on  o.order_tickets_id=s.order_id
 	LEFT JOIN kylin_order_ticket_relations as r ON o.order_tickets_id=r.order_id
@@ -117,7 +117,7 @@
     </select>
     <select id="getUserSellAllDate" parameterType="String" resultType="java.util.Map">
     select sum(c.number) as 'number',SUM(c.price) as 'price',SUM(c.commiss) as 'commiss' from (
-    select t.title as 'title',ticket_id as 'ticketId',(SUM(number)-SUM(refund_number)) as 'number',(SUM(o.price)-SUM(o.price_refund)) as 'price',SUM(r.agent_distributions * (o.price-o.price_refund)) as 'commiss',r.agent_distributions as 'paioTi'
+    select t.title as 'title',ticket_id as 'ticketId',(SUM(number)-SUM(refund_number)) as 'number',(SUM(o.price_actual)-SUM(o.price_refund)) as 'price',SUM(r.agent_distributions * (o.price_actual-o.price_refund)) as 'commiss',r.agent_distributions as 'paioTi'
 	from  (select * from kylin_order_tickets where created_at>DATE_SUB(CURDATE(), INTERVAL 6 MONTH)) as o
 	LEFT JOIN kylin_order_ticket_status as s on  o.order_tickets_id=s.order_id
 	LEFT JOIN kylin_order_ticket_relations as r ON o.order_tickets_id=r.order_id

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/smile/SellDataInfoImpl.java

@@ -52,8 +52,8 @@ public class SellDataInfoImpl {
 
    public void setData(){
        int count=smileUserMapper.getCount();
-       int page=(count/1000);
-       int pageSize=1;
+       int pageSize=1000;
+       int page=(count/pageSize);
        for(int p=0;p<=page;p++){
            int offest=p*pageSize;
            log.info("用户{}",offest);
@@ -89,7 +89,9 @@ public class SellDataInfoImpl {
                             //佣金
                             sellDataOneVO.setCommission(new BigDecimal(a1.get("commiss")==null?"0":a1.get("commiss").toString()));
                             sellDataOneVO.setTicketId(a1.get("ticketId")==null?"":a1.get("ticketId").toString());
-                            sellDataOneVO.setChouChengCommission(new BigDecimal(commission.get("commiss")==null?"0":commission.get("commiss").toString()));
+                            if(null!=a){
+                                sellDataOneVO.setChouChengCommission(new BigDecimal(commission.get("commiss")==null?"0":commission.get("commiss").toString()));
+                            }
                             //sellDataOneVO
                             listSellDataOneVo.add(sellDataOneVO);
                             if(StringUtils.isNotBlank(sellDataOneVO.getTicketId())){