Merge remote-tracking branch 'origin/dev_kid' into dev_kid

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileShowBaseController.java

@@ -10,6 +10,8 @@ import com.liquidnet.client.admin.zhengzai.smile.dto.SmilePriceParam;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -31,6 +33,9 @@ public class SmileShowBaseController extends BaseController {
 
     @GetMapping("/saleData/{performancesId}")
     @ApiOperation("销售数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "query", dataType = "Integer", name = "performancesId", value = "演出ID")
+    })
     public String saleData(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
         SaleDataVo saleDataVo = smileShowService.saleData(performancesId);
         mmap.put("saleDataVo", saleDataVo);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SaleDataVo.java

 package com.liquidnet.client.admin.zhengzai.smile.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -8,6 +9,7 @@ import java.util.List;
 /**
  * @author TT
  */
+@ApiModel(value = "SaleDataVo", description = "演出销售数据")
 @Data
 public class SaleDataVo {
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/ShowAgentVo.java

 package com.liquidnet.client.admin.zhengzai.smile.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -8,6 +9,7 @@ import java.math.BigDecimal;
 /**
  * @author TT
  */
+@ApiModel(value = "ShowAgentVo", description = "票提信息")
 @Data
 public class ShowAgentVo {
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/ShowVoById.java

 package com.liquidnet.client.admin.zhengzai.smile.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -8,6 +9,7 @@ import java.util.List;
 /**
  * @author TT
  */
+@ApiModel(value = "ShowVoById", description = "演出详情")
 @Data
 public class ShowVoById {
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/UserData.java

 package com.liquidnet.client.admin.zhengzai.smile.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -8,6 +9,7 @@ import java.util.List;
 /**
  * @author TT
  */
+@ApiModel(value = "UserData", description = "代理数据")
 @Data
 public class UserData {
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/UserDataAgentVo.java

 package com.liquidnet.client.admin.zhengzai.smile.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 
+@ApiModel(value = "UserDataAgentVo", description = "用户单票数据")
 @Data
 public class UserDataAgentVo {
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -258,6 +258,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         showVoById.setFieldName(kylinPerformanceVo.getFieldName());
         showVoById.setShowAgentVoList(showAgentVoList);
         showVoById.setShowTicketVoList(showTicketVoList);
+        showVoById.setDetails(kylinPerformanceVo.getDetails());
     }
 
     @Override