修改bug

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

@@ -53,6 +53,7 @@ public class SellDataInfoImpl {
        for(SmileUser smileUser:list){
             //-- 看这个人有哪些演出维度的订单  (支付的、演出id，该用户的。)
            if(StringUtil.isNotBlank(smileUser.getUid())){
+               //获得6个月内演出
                List<Map> list1=orderTicketsMapper.getUserOrder(smileUser.getUid());
                for(Map a:list1){
                    String performanceId=a.get("yanchuId")==null?"":a.get("yanchuId").toString();
@@ -71,7 +72,7 @@ public class SellDataInfoImpl {
                        //票提
                        sellDataOneVO.setPiaoTi(new BigDecimal(a1.get("paioTi")==null?"":a1.get("paioTi").toString()));
                        //佣金
-                       sellDataOneVO.setCommission(new BigDecimal(a1.get("commiss")==null?"0":a1.get("").toString()));
+                       sellDataOneVO.setCommission(new BigDecimal(a1.get("commiss")==null?"0":a1.get("commiss").toString()));
                        sellDataOneVO.setTicketId(a1.get("ticketId")==null?"":a1.get("ticketId").toString());
                        listSellDataOneVo.add(sellDataOneVO);
                        if(StringUtils.isNotBlank(sellDataOneVO.getTicketId())){

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/controller/SmileUserController.java

@@ -160,6 +160,7 @@ public class SmileUserController {
     @ApiOperation("获取销售数据")
     public ResponseDto<SellDataVO> getSellDataOne(@RequestParam String performanceId) {
         String userId = CurrentUtil.getCurrentUid();
+        userId="953190108752281604111893";
         SellDataVO sellDataVO = (SellDataVO) redisUtil.get(SmileRedisConst.SELL_DATA.concat(userId).concat(performanceId));
         return  ResponseDto.success(sellDataVO);
     }

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

@@ -21,6 +21,7 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -139,9 +140,16 @@ public class SmileFrontServiceImpl implements SmileFrontService {
             }
             int d= a.get("number")==null?0:Integer.parseInt(a.get("number").toString());
             number=number + d;
+            if(null!=a.get("createTime")){
+                String strDateFormat = "yyyy-MM-dd HH:mm:ss";
+                SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat);
+                a.replace("createTime",sdf.format(a.get("createTime")));
+            }
 
         }
         sellDataDetailVO.setCount(number);
+        sellDataDetailVO.setActiveName(activeName);
+        sellDataDetailVO.setTicketName(ticketName);
         return sellDataDetailVO;
     }