Merge branch 'dev-smile' into pre

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

@@ -69,6 +69,14 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
             }
             if (result) {
                 try {
+                    for (SmileAgent smileAgent : smileAgents){
+                        SmileAgentVo agent = smileRedisUtils.getAgent(smileAgent.getPerformanceId(),smileAgent.getTicketId());
+                        if (agent!=null){
+                            log.info("SmileAgent:{}",agent);
+                            //修改过票提则无法再次修改
+                            return AjaxResult.warn("票提一但设置，无法修改！");
+                        }
+                    }
                     smileAgents.forEach(smileAgent -> {
                         //是否是修改票提
                         smileAgentMapper.updateAgentById(smileAgent.getId(),smileAgent.getTotalCarry(),smileAgent.getOrdCarry());
@@ -79,32 +87,6 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
                                 smileAgent.getId(),
                                 smileAgent.getPerformanceId(),
                                 smileAgent.getTicketId());
-
-                      /*  LambdaQueryWrapper<SmileAgent> queryWrapper = Wrappers.lambdaQuery(SmileAgent.class);
-                        queryWrapper.eq(SmileAgent::getPerformanceId, smileAgent.getPerformanceId());
-                        queryWrapper.eq(SmileAgent::getTicketId, smileAgent.getTicketId());
-                        queryWrapper.eq(SmileAgent::getDelTag,0);
-                        if (smileAgentMapper.selectOne(queryWrapper) != null) {
-                            //修改
-                            smileAgentMapper.update(smileAgent, queryWrapper);
-                            SmileAgentVo smileAgentVo = new SmileAgentVo();
-                            BeanUtils.copyProperties(smileAgent, smileAgentVo);
-                            smileRedisUtils.set(SmileRedisConst.SMILE_AGENT.concat(smileAgent.getPerformanceId()).concat(":").concat(smileAgent.getTicketId()), smileAgentVo);
-                            log.debug("create update Agent id：{},PerformanceId:{},TicketId:{}",
-                                    smileAgent.getId(),
-                                    smileAgent.getPerformanceId(),
-                                    smileAgent.getTicketId());
-                        } else {
-                            //新增
-                            smileAgentMapper.insert(smileAgent);
-                            SmileAgentVo smileAgentVo = new SmileAgentVo();
-                            BeanUtils.copyProperties(smileAgent, smileAgentVo);
-                            smileRedisUtils.set(SmileRedisConst.SMILE_AGENT.concat(smileAgent.getPerformanceId()).concat(":").concat(smileAgent.getTicketId()), smileAgentVo);
-                            log.debug("create create Agent id：{},PerformanceId:{},TicketId:{}",
-                                    smileAgent.getId(),
-                                    smileAgent.getPerformanceId(),
-                                    smileAgent.getTicketId());
-                        }*/
                     });
                     return AjaxResult.success();
                 } catch (Exception e) {

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

@@ -197,7 +197,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
                         return AjaxResult.success();
                     } else {
                         //有总代
-                        return AjaxResult.warn("该分组已经存在总代身份");
+                        return AjaxResult.warn("该分组已经存在总代人员");
                     }
                 }
                 if (smileUserCheckVo.getType().equals(2)) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/utils/SmileRedisUtils.java

@@ -131,6 +131,10 @@ public class SmileRedisUtils {
         redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_AGENT.concat(performancesId).concat(":").concat(ticketId), smileAgentVo);
     }
 
+    public SmileAgentVo getAgent(String performanceId, String ticketId) {
+        return (SmileAgentVo) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_AGENT.concat(performanceId).concat(":").concat(ticketId));
+    }
+
     public BigDecimal getUserTotalPrice(String uid) {
        return (redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid)))==null ? BigDecimal.valueOf(0) : (BigDecimal)redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid));
     }