exit

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

@@ -3,13 +3,13 @@ package com.liquidnet.client.admin.web.controller.zhengzai.smile;
 
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileAgentService;
-import com.liquidnet.service.smile.entity.SmileAgent;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -27,12 +27,11 @@ public class SmileAgentController {
     @Autowired
     ISmileAgentService smileAgentService;
 
-    @PostMapping("/list")
+    @GetMapping("/list")
     @ApiOperation("获取票提")
     @ResponseBody
-    public AjaxResult organizationList(@RequestParam(name = "", required = false) String name){
-        List<SmileAgent> agents = smileAgentService.list();
-        return AjaxResult.success(agents);
+    public AjaxResult organizationList(String performanceId, String ticketId){
+        return AjaxResult.success(smileAgentService.listAgentByShowIdAndTicketId(performanceId,ticketId));
     }
 
 

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

@@ -60,7 +60,6 @@ public class SmileUserController extends BaseController {
     @ApiOperation(value = "根据组织ID查询相人员信息")
     @ResponseBody
     public AjaxResult getUserListByOrgId(@RequestParam(name = "orgId",required = true)Long orgId,@RequestParam(name = "agentId",required =true)Long agentId){
-        logger.info("orgId:{},agentId:{}",orgId,agentId);
         List<SmileUserVoOrg> userListByOrgId = iSmileUserService.getUserListByOrgId(orgId, agentId);
         return AjaxResult.success(userListByOrgId);
     }

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

+package com.liquidnet.client.admin.zhengzai.smile.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-16
+ */
+@Data
+public class SmileAgentParam{
+
+    @ApiModelProperty(value = "组织名称", example = "")
+    private String performanceId;
+
+    @ApiModelProperty(value = "组织名称", example = "")
+    private String ticketId;
+
+    @ApiModelProperty(value = "页数", example = "0")
+    @NotNull(message = "页数不能为空")
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "数量", example = "20")
+    @NotNull(message = "数量不能为空")
+    private Integer pageNum;
+
+    @ApiModelProperty(value = "排序字段", hidden = true)
+    private String orderItem;
+
+    @ApiModelProperty(value = "排序方式", hidden = true)
+    private String orderSc;
+
+}

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

+package com.liquidnet.client.admin.zhengzai.smile.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class SmileAgentVo {
+    private Long id;
+
+    /**
+     * 演出id
+     */
+    private String performanceId;
+
+    /**
+     * 票id
+     */
+    private String ticketId;
+
+
+    /**
+     * 总代票提
+     */
+    private BigDecimal totalCarry;
+
+    /**
+     * 普代票提
+     */
+    private BigDecimal ordCarry;
+}

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

 package com.liquidnet.client.admin.zhengzai.smile.dto;
 
-import lombok.*;
-
-import java.time.LocalDateTime;
+import lombok.Data;
 
 /**
  * <p>
@@ -77,8 +75,4 @@ public class SmileOrganizationVo{
      */
     private Integer delTag;
 
-    private LocalDateTime createdDate;
-
-    private LocalDateTime updatedDate;
-
 }

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

@@ -4,8 +4,6 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.smile.entity.SmileAgent;
 
-import java.util.List;
-
 /**
  * <p>
  *  服务类
@@ -16,7 +14,6 @@ import java.util.List;
  */
 public interface ISmileAgentService extends IService<SmileAgent> {
 
-    List<SmileAgent> listAgentByShowIdAndTicketId(String showId,String ticketId);
-
+    SmileAgent listAgentByShowIdAndTicketId(String showId,String ticketId);
 
 }

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

 package com.liquidnet.client.admin.zhengzai.smile.service.impl;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileAgentService;
@@ -11,11 +9,9 @@ import com.liquidnet.service.smile.mapper.SmileAgentMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author liquidnet
@@ -28,12 +24,10 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
     SmileAgentMapper smileAgentMapper;
 
     @Override
-    public List<SmileAgent> listAgentByShowIdAndTicketId(String performanceId, String ticketId) {
-        if (StringUtils.isNotEmpty(performanceId)&&StringUtils.isNotEmpty(ticketId)){
-            LambdaQueryWrapper<SmileAgent> queryWrapper = Wrappers.lambdaQuery(SmileAgent.class);
-            queryWrapper.eq(true,SmileAgent::getPerformanceId,performanceId);
-            queryWrapper.eq(true,SmileAgent::getTicketId,ticketId);
-            return smileAgentMapper.selectList(queryWrapper);
+    public SmileAgent listAgentByShowIdAndTicketId(String performanceId, String ticketId) {
+        if (StringUtils.isNotEmpty(performanceId) && StringUtils.isNotEmpty(ticketId)) {
+            SmileAgent smileAgent = smileAgentMapper.listAgentByShowIdAndTicketId(performanceId,ticketId);
+            return smileAgent;
         }
         return null;
     }

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/SmileAgent.java

@@ -32,11 +32,6 @@ public class SmileAgent implements Serializable {
      */
     private String ticketId;
 
-    /**
-     * 票种
-     */
-    private String ticketType;
-
 
     /**
      * 总代票提

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileAgentMapper.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.smile.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.liquidnet.service.smile.entity.SmileAgent;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -14,4 +15,5 @@ import com.liquidnet.service.smile.entity.SmileAgent;
  */
 public interface SmileAgentMapper extends BaseMapper<SmileAgent> {
 
+    SmileAgent listAgentByShowIdAndTicketId(@Param("performanceId") String performanceId,@Param("ticketId") String ticketId);
 }

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileAgentMapper.xml

@@ -2,4 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.liquidnet.service.smile.mapper.SmileAgentMapper">
 
+    <select id="listAgentByShowIdAndTicketId" resultType="com.liquidnet.service.smile.entity.SmileAgent">
+        select id,performance_id from smile_agent
+        <where>
+            <if test="performanceId!=''">
+                AND performance_id = #{performanceId}
+            </if>
+            <if test="ticketId!=''">
+                AND ticket_id = #{ticketId}
+            </if>
+        </where>
+    </select>
 </mapper>