修改计算比例

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SellDataOneVO.java

@@ -35,6 +35,7 @@ public class SellDataOneVO implements Serializable {
     @ApiModelProperty(value = "抽成总佣金")
     private BigDecimal chouChengCommission;
 
+
     private static final SellDataOneVO obj = new SellDataOneVO();
 
     public static SellDataOneVO getNew() {

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SellDataVO.java

 package com.liquidnet.service.goblin.dto.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -35,6 +38,10 @@ public class SellDataVO implements Serializable {
     @ApiModelProperty(value = "销售总佣金")
     private BigDecimal totalCommission;
 
+    @ApiModelProperty(value = "更新时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime updateTime;
+
     private int deltag;
 
     private static final SellDataVO obj = new SellDataVO();

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

@@ -78,13 +78,21 @@
         LIMIT 1
     </select>
     <select id="getUserPerformance" parameterType="String" resultType="java.util.Map">
-				select ss.*,kp.time_end 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'
-	        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=#{agentId} and s.pay_status='1'  GROUP BY r.performance_id)
-			as ss ,kylin_performances kp where ss.performanceId=kp.performances_id
+        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'
+        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'
+        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_master=#{agentId} and s.pay_status='1'  GROUP BY r.performance_id
+        ) as c GROUP BY  c.performanceId
     </select>
     <select id="getUserOrder" parameterType="String" resultType="java.util.Map">
             select p.title as 'title',p.performances_id as 'yanchuId' from kylin_performances p

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

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.sql.Date;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -89,6 +90,7 @@ 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()));
+                            //sellDataOneVO
                             listSellDataOneVo.add(sellDataOneVO);
                             if(StringUtils.isNotBlank(sellDataOneVO.getTicketId())){
                                 setDataDetial(smileUser.getUid(),a1.get("ticketId").toString());
@@ -105,6 +107,7 @@ public class SellDataInfoImpl {
                             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);
+                            sellDataVO.setUpdateTime(LocalDateTime.now());
                             //redis 里面放入
                             redisDataSourceUtil.getRedisSweetUtil().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())){