exit

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/constant/SmileRedisConst.java

@@ -9,6 +9,6 @@ public class SmileRedisConst {
 
     public static final String SMILE_SHOW = PREFIX.concat("show");  //演出key
 
-    public static final String SMILE_AGENT = PREFIX.concat("agent"); //代理:演出id：票种id
+    public static final String SMILE_AGENT = PREFIX.concat("agent:"); //代理:演出id：票种id
 
 }

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.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * <p>
@@ -27,12 +27,22 @@ public class SmileAgentController {
     @Autowired
     ISmileAgentService smileAgentService;
 
-    @GetMapping("/list")
+    @PostMapping("/list")
     @ApiOperation("获取票提")
     @ResponseBody
     public AjaxResult organizationList(String performanceId, String ticketId){
         return AjaxResult.success(smileAgentService.listAgentByShowIdAndTicketId(performanceId,ticketId));
     }
 
+    @PostMapping("/create")
+    @ApiOperation("创建/修改 票提")
+    @ResponseBody
+    public AjaxResult create(@RequestBody List<SmileAgent> smileAgents){
+        if (smileAgentService.create(smileAgents)){
+            return AjaxResult.success();
+        }
+        return AjaxResult.error();
+    }
+
 
 }

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

@@ -52,8 +52,10 @@ public class SmileUserController extends BaseController {
     @ApiOperation(value = "保存用户")
     @ResponseBody
     public AjaxResult create(@RequestBody SmileUser smileUser){
-        int id = iSmileUserService.create(smileUser);
-        return AjaxResult.success(id);
+        if (iSmileUserService.create(smileUser)){
+            return AjaxResult.success();
+        }
+        return AjaxResult.warn("用户已添加");
     }
 
     @GetMapping("/getUserListByOrgId")

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

@@ -3,8 +3,6 @@ package com.liquidnet.client.admin.zhengzai.smile.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
-
 /**
  * <p>
  * 
@@ -16,24 +14,10 @@ import javax.validation.constraints.NotNull;
 @Data
 public class SmileAgentParam{
 
-    @ApiModelProperty(value = "组织名称", example = "")
+    @ApiModelProperty(value = "演出id", example = "")
     private String performanceId;
 
-    @ApiModelProperty(value = "组织名称", example = "")
+    @ApiModelProperty(value = "票提id", 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

@@ -4,8 +4,12 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
+/**
+ * @author TT
+ */
 @Data
 public class SmileAgentVo {
+
     private Long id;
 
     /**

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

@@ -5,10 +5,6 @@ import lombok.*;
 import java.time.LocalDate;
 
 @Data
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
 public class SmileUserVo {
 
     private Long id;

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

@@ -4,6 +4,8 @@ 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,4 +18,6 @@ public interface ISmileAgentService extends IService<SmileAgent> {
 
     SmileAgent listAgentByShowIdAndTicketId(String showId,String ticketId);
 
+    boolean create(List<SmileAgent> smileAgents);
+
 }

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

@@ -16,7 +16,7 @@ public interface ISmileUserService  extends IService<SmileUser> {
 
     SmileUser getUserById(Long id);
 
-    int create(SmileUser smileUser);
+    Boolean create(SmileUser smileUser);
 
     List<SmileUserVoOrg> getUserListByOrgId(Long orgId, Long agentId);
 

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;
+import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
+import com.liquidnet.service.goblin.constant.SmileRedisConst;
 import com.liquidnet.service.smile.entity.SmileAgent;
 import com.liquidnet.service.smile.mapper.SmileAgentMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 服务实现类
@@ -18,17 +25,63 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-16
  */
 @Service
+@Slf4j
 public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAgent> implements ISmileAgentService {
 
     @Autowired
     SmileAgentMapper smileAgentMapper;
 
+    @Autowired
+    SmileRedisUtils smileRedisUtils;
+
     @Override
     public SmileAgent listAgentByShowIdAndTicketId(String performanceId, String ticketId) {
         if (StringUtils.isNotEmpty(performanceId) && StringUtils.isNotEmpty(ticketId)) {
-            SmileAgent smileAgent = smileAgentMapper.listAgentByShowIdAndTicketId(performanceId,ticketId);
+            SmileAgent smileAgent = smileAgentMapper.listAgentByShowIdAndTicketId(performanceId, ticketId);
             return smileAgent;
         }
         return null;
     }
+
+    @Override
+    public boolean create(List<SmileAgent> smileAgents) {
+        boolean result = true;
+        if (StringUtils.isNotEmpty(smileAgents)) {
+            for (SmileAgent agent : smileAgents) {
+                result = !StringUtils.isEmpty(agent.getPerformanceId()) && !StringUtils.isEmpty(agent.getTicketId());
+            }
+            if (result) {
+                try {
+                    smileAgents.forEach(smileAgent -> {
+                        //是否是修改票提
+                        LambdaQueryWrapper<SmileAgent> queryWrapper = Wrappers.lambdaQuery(SmileAgent.class);
+                        queryWrapper.eq(SmileAgent::getPerformanceId, smileAgent.getPerformanceId());
+                        queryWrapper.eq(SmileAgent::getTicketId, smileAgent.getTicketId());
+                        if (smileAgentMapper.selectOne(queryWrapper) != null) {
+                            //修改
+                            smileAgentMapper.update(smileAgent, queryWrapper);
+                            smileRedisUtils.set(SmileRedisConst.SMILE_AGENT.concat(smileAgent.getPerformanceId()).concat(":").concat(smileAgent.getTicketId()), smileAgent);
+                            log.debug("create update Agent id：{},PerformanceId:{},TicketId:{}",
+                                    smileAgent.getId(),
+                                    smileAgent.getPerformanceId(),
+                                    smileAgent.getTicketId());
+                        } else {
+                            //新增
+                            smileAgentMapper.insert(smileAgent);
+                            smileRedisUtils.set(SmileRedisConst.SMILE_AGENT.concat(smileAgent.getPerformanceId()).concat(":").concat(smileAgent.getTicketId()), smileAgent);
+                            log.debug("create create Agent id：{},PerformanceId:{},TicketId:{}",
+                                    smileAgent.getId(),
+                                    smileAgent.getPerformanceId(),
+                                    smileAgent.getTicketId());
+                        }
+                    });
+                    return true;
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    return false;
+                }
+            }
+        }
+        return false;
+    }
 }

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

@@ -8,7 +8,9 @@ import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserParam;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserVo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserVoOrg;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserService;
+import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
 import com.liquidnet.commons.lang.util.BeanUtil;
+import com.liquidnet.service.goblin.constant.SmileRedisConst;
 import com.liquidnet.service.smile.entity.SmileUser;
 import com.liquidnet.service.smile.mapper.SmileUserMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -29,6 +31,9 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
     @Autowired
     SmileUserMapper smileUserMapper;
 
+    @Autowired
+    SmileRedisUtils smileRedisUtils;
+
     @Override
     public PageInfo<SmileUserVo> userList(SmileUserParam smileUserParam) {
         PageInfo<SmileUserVo> pageInfo;
@@ -61,14 +66,23 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
     }
 
     @Override
-    public int create(SmileUser smileUser) {
+    public Boolean create(SmileUser smileUser) {
         smileUser.setCreatedDate(LocalDateTime.now());
         smileUser.setUpdatedDate(LocalDateTime.now());
         smileUser.setDelTag(0);
         log.debug("smileUser:{}", smileUser);
-        int id = smileUserMapper.insert(smileUser);
-        log.debug("return id:{}.", id);
-        return id;
+        LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
+        queryWrapper.eq(SmileUser::getUid,smileUser.getUid());
+        queryWrapper.eq(SmileUser::getDelTag,0);
+        //查询是否有重复uid用户
+        if (smileUserMapper.selectOne(queryWrapper)==null){
+            int id = smileUserMapper.insert(smileUser);
+            log.debug("return id:{}.", smileUser.getUid());
+            //存入redis中
+            smileRedisUtils.set(SmileRedisConst.SMILE_USER + smileUser.getUid(),smileUser);
+            return true;
+        }
+        return false;
     }
 
     @Override

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

@@ -179,7 +179,4 @@ public class SmileUser implements Serializable {
 
     private LocalDateTime updatedDate;
 
-    public SmileUser(String schoolName) {
-        this.schoolName = schoolName;
-    }
 }