修改逻辑

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

@@ -77,17 +77,20 @@
         </where>
         LIMIT 1
     </select>
-    <select id="getUserOrder" parameterType="String" resultType="java.util.Map">
+ <!--   <select id="getUserOrder" parameterType="String" resultType="java.util.Map">
         select performance_id as 'yanchuId'  from (select * from kylin_order_tickets where created_at>DATE_SUB(CURDATE(), INTERVAL 6 MONTH)) as o,
         kylin_order_ticket_status as s,kylin_order_ticket_relations as r where o.order_tickets_id=s.order_id
         and o.order_tickets_id=r.order_id and r.agent_id=#{userId} and s.pay_status='1' GROUP BY r.performance_id
+    </select>-->
+    <select id="getUserOrder" parameterType="String" resultType="java.util.Map">
+       select p.title as 'title',p.performances_id as 'yanchuId' from kylin_performances p ,kylin_performance_status s
+       where p.performances_id=s.performance_id  and time_end>DATE_SUB(CURDATE(), INTERVAL 6 MONTH) and s.`status` in (3,6,7,8,9,10);
     </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' from  (select * from kylin_order_tickets where created_at>DATE_SUB(CURDATE(), INTERVAL 6 MONTH)) as o
     , kylin_order_ticket_status as s,kylin_order_ticket_relations as r,kylin_tickets as t where o.order_tickets_id=s.order_id
     and o.order_tickets_id=r.order_id  and r.ticket_id=t.tickets_id
-    and r.agent_id=#{agentId} and r.performance_id=#{performanceId}  GROUP BY r.ticket_id
+    and r.agent_id=#{agentId} and r.performance_id=#{performanceId} and s.pay_status='1' GROUP BY r.ticket_id
 
     </select>
     <select id="getUserSellAllDate" parameterType="String" resultType="java.util.Map">
@@ -95,7 +98,7 @@
     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' from  (select * from kylin_order_tickets where created_at>DATE_SUB(CURDATE(), INTERVAL 6 MONTH)) as o
     , kylin_order_ticket_status as s,kylin_order_ticket_relations as r,kylin_tickets as t where o.order_tickets_id=s.order_id
     and o.order_tickets_id=r.order_id  and r.ticket_id=t.tickets_id
-    and r.agent_id=#{agentId} and r.performance_id=#{performanceId}  GROUP BY r.ticket_id
+    and r.agent_id=#{agentId} and r.performance_id=#{performanceId} and s.pay_status='1'  GROUP BY r.ticket_id
     ) as c
 
     </select>

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

@@ -45,13 +45,14 @@ public class SellDataInfoImpl {
    public void setData(){
        //1、查到用户
        List<SmileUser>  list=smileUserMapper.selectUserList(null);
-       mongoTemplate.remove(Query.query(Criteria.where("deltag").is(0)), SellDataVO.class, SellDataVO.class.getSimpleName());
+       //mongoTemplate.remove(Query.query(Criteria.where("deltag").is(0)), SellDataVO.class, SellDataVO.class.getSimpleName());
        for(SmileUser smileUser:list){
             //-- 看这个人有哪些演出维度的订单  (支付的、演出id，该用户的。)
            if(StringUtil.isNotBlank(smileUser.getUid())){
                List<Map> list1=orderTicketsMapper.getUserOrder(smileUser.getUid());
                for(Map a:list1){
                    String performanceId=a.get("yanchuId")==null?"":a.get("yanchuId").toString();
+                   String yanChuName=a.get("title")==null?"":a.get("title").toString();
                    //获取 该人下 该演出id 的 所有订单
                    List<Map> list2=orderTicketsMapper.getUserSellOneDate(smileUser.getUid(),performanceId);
                    ArrayList<SellDataOneVO> listSellDataOneVo= ObjectUtil.getSellDataOneVOArrayList();
@@ -72,19 +73,25 @@ public class SellDataInfoImpl {
                    }
                    Map allDate=orderTicketsMapper.getUserSellAllDate(smileUser.getUid(),performanceId);
                    SellDataVO sellDataVO=SellDataVO.getNew();
+                   if(null!=allDate){
                        //活动名称   需要再查 目前没有
                        sellDataVO.setDeltag(0);
                        sellDataVO.setSellDataId(smileUser.getUid().concat(performanceId));
-                   sellDataVO.setActiveName("");
+                       sellDataVO.setActiveName(yanChuName);
                        sellDataVO.setSellAmount(new BigDecimal(allDate.get("price")==null?"0":allDate.get("price").toString()));
                        sellDataVO.setSellNumber(new BigDecimal(allDate.get("number")==null?"0":allDate.get("number").toString()));
                        sellDataVO.setTotalCommission(new BigDecimal(allDate.get("commiss")==null?"0":allDate.get("commiss").toString()));
                        sellDataVO.setSellDataOneVO(listSellDataOneVo);
                        //redis 里面放入
                        redisSmileUtil.set(SmileRedisConst.SELL_DATA.concat(smileUser.getUid()).concat(performanceId),sellDataVO);
+                       if(mongoTemplate.exists(Query.query(Criteria.where("sellDataId").is(sellDataVO.getSellDataId())), SellDataVO.class, SellDataVO.class.getSimpleName())){
+                           mongoTemplate.remove(Query.query(Criteria.where("sellDataId").is(sellDataVO.getSellDataId())), SellDataVO.class, SellDataVO.class.getSimpleName());
+                       }
                        //mongodb 里面放入
                        mongoTemplate.insert(sellDataVO,SellDataVO.class.getSimpleName());
                    }
+
+               }
            }
 
        }