Merge remote-tracking branch 'origin/dev-smile' into dev-smile

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

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2022-03-11
+ */
+@ApiModel(value = "SellDataOneVO", description = "销量数据")
+@Data
+public class SellDataDetailVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+  /*  @ApiModelProperty(value = "订单id")
+    private String orderId;
+    @ApiModelProperty(value = "数量")
+    private String number   ;
+    @ApiModelProperty(value = "电话")
+    private String mobile;
+    @ApiModelProperty(value = "订单时间")
+    private String createAt;
+
+    private String dataId;*/
+   @ApiModelProperty(value = "orderId:订单id,number:数量，mobile：电话，createAt：订单时间")
+    List<Map> list;
+    private String dataId;
+
+    //private String
+    private static final SellDataDetailVO obj = new SellDataDetailVO();
+
+    public static SellDataDetailVO getNew() {
+        try {
+            return (SellDataDetailVO) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SellDataDetailVO();
+        }
+    }
+
+
+
+
+}

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

@@ -48,4 +48,5 @@ public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> {
     List<Map> getUserOrder(@Param("userId")String userId);
     List<Map> getUserSellOneDate(@Param("agentId")String agentId,@Param("performanceId")String performanceId);
     Map getUserSellAllDate(@Param("agentId")String agentId,@Param("performanceId")String performanceId);
+    List<Map> getUserSellDetail(@Param("agentId")String agentId,@Param("ticketId")String ticketId);
 }

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

@@ -101,6 +101,12 @@
     and r.agent_id=#{agentId} and r.performance_id=#{performanceId} and s.pay_status='1'  GROUP BY r.ticket_id
     ) as c
 
+    </select>
+    <select id="getUserSellDetail" parameterType="String" resultType="java.util.Map">
+    select o.user_mobile as 'mobile',o.order_tickets_id as 'orderId',(o.number-refund_number) as 'number',DATE_FORMAT(o.created_at,'%Y-%m-%d %H:%i:%s') as 'createTime' from kylin_order_tickets 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=#{agentId} and s.pay_status='1' and r.ticket_id=#{ticketId} and (o.number-refund_number)>0
     </select>
 
     <select id="getCanRefundOrderList" parameterType="java.lang.String"

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.platform.service.impl.smile;
 import com.liquidnet.common.cache.redis.util.RedisSmileUtil;
 import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.goblin.constant.SmileRedisConst;
+import com.liquidnet.service.goblin.dto.vo.SellDataDetailVO;
 import com.liquidnet.service.goblin.dto.vo.SellDataOneVO;
 import com.liquidnet.service.goblin.dto.vo.SellDataVO;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
@@ -10,6 +11,7 @@ import com.liquidnet.service.platform.utils.ObjectUtil;
 import com.liquidnet.service.smile.entity.SmileUser;
 import com.liquidnet.service.smile.mapper.SmileUserMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -70,6 +72,9 @@ public class SellDataInfoImpl {
                        sellDataOneVO.setCommission(new BigDecimal(a1.get("commiss")==null?"0":a1.get("").toString()));
                        sellDataOneVO.setTicketId(a1.get("ticketId")==null?"":a1.get("ticketId").toString());
                        listSellDataOneVo.add(sellDataOneVO);
+                       if(StringUtils.isNotBlank(sellDataOneVO.getTicketId())){
+                           setDataDetial(smileUser.getUid(),a1.get("ticketId").toString());
+                       }
                    }
                    Map allDate=orderTicketsMapper.getUserSellAllDate(smileUser.getUid(),performanceId);
                    SellDataVO sellDataVO=SellDataVO.getNew();
@@ -97,4 +102,15 @@ public class SellDataInfoImpl {
        }
    }
 
+    /**
+     * 设置票维度 的订单详情
+     */
+   public void setDataDetial(String agentId,String ticketId){
+       List<Map> list= orderTicketsMapper.getUserSellDetail(agentId,ticketId);
+       SellDataDetailVO sellDataDetailVO=SellDataDetailVO.getNew();
+       sellDataDetailVO.setDataId(agentId+ticketId);
+       sellDataDetailVO.setList(list);
+       // mongodb
+       mongoTemplate.insert(sellDataDetailVO,SellDataDetailVO.class.getSimpleName());
+   }
 }