提交 admin

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userList/list.html

@@ -100,10 +100,10 @@
                     title: '地区'
                 },
                 {
-                    field: 'agent',
+                    field: 'type',
                     title: '类型',
                     formatter: function(value, row, index) {
-                        if (type == 1) {
+                        if (value == 1) {
                             return '总代';
                         } else {
                             return '普代';

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

@@ -165,6 +165,9 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
     public AjaxResult updateUserCheckById(SmileUserCheckVo smileUserCheckVo) {
         //根据uid查询redis中的用户缓存信息
         SmileUserVO smileUserVO = getSmileUserVOFromRedis(smileUserCheckVo.getUid());
+        if(!smileUserVO.getType().equals(0)){
+            return AjaxResult.warn("已经审核过");
+        }
         //判断是否通过
         if (smileUserCheckVo.getType().equals(4)) {
             //申请被驳回
@@ -283,7 +286,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
     private void updateRedisSetUser(SmileUserVO smileUserVO, String uid, String reason) {
         //审核失败原因
         if (StringUtils.isNotNull(reason)) smileUserVO.setErrorReason(reason);
-        smileUserVO.setState(4);
+        smileUserVO.setType(4);
         //存入redis中
         smileRedisUtils.setSmileUserVO(uid, smileUserVO);
     }

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisDataSourceUtil.java

@@ -32,9 +32,6 @@ public class RedisDataSourceUtil {
     @Autowired
     private RedisCandyUtil redisCandyUtil;
 
-    @Autowired
-    private RedisSmileUtil redisSmileUtil;
-
     public AbstractRedisUtil getRedisKylinUtil() {
         return this.redisKylinUtil;
     }
@@ -62,8 +59,4 @@ public class RedisDataSourceUtil {
     public AbstractRedisUtil getRedisGoblinUtil() {
         return this.redisGoblinUtil;
     }
-
-    public AbstractRedisUtil getRedisSmileUtil() {
-        return this.redisSmileUtil;
-    }
 }

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisSmileUtil.java

-package com.liquidnet.common.cache.redis.util;
-
-import com.liquidnet.common.cache.redis.config.AbstractRedisConfig;
-import com.liquidnet.common.cache.redis.config.RedisSmileConfig;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * @author AnJiabin <jiabin.an@lightnet.io>
- * @version V1.0
- * @Description: Redis工具类
- * @class: RedisUtil
- * @Package com.liquidnet.stellar.utils
- * @Copyright: LightNet @ Copyright (c) 2020
- * @date 2020/8/26 13:11
- */
-@Slf4j
-@Component("redisSmileUtil")
-public final class RedisSmileUtil extends AbstractRedisUtil {
-    @Autowired
-    private RedisSmileConfig redisConfig;
-
-    @Override
-    public int getDbs() {
-        log.info("redisSmileUtil.totalDbs===", redisConfig.totalDbs);
-        return redisConfig.totalDbs;
-    }
-
-    @Override
-    AbstractRedisConfig getRedisConfig() {
-        return this.redisConfig;
-    }
-}

liquidnet-bus-config/liquidnet-config/liquidnet-service-smile.yml

@@ -75,10 +75,10 @@ spring:
       - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   redis:
     database: 15
-    dbs: ${liquidnet.redis.smile.dbs}
-    port: ${liquidnet.redis.smile.port}
-    host: ${liquidnet.redis.smile.host}
-    password: ${liquidnet.redis.smile.password}
+    dbs: ${liquidnet.redis.sweet.dbs}
+    port: ${liquidnet.redis.sweet.port}
+    host: ${liquidnet.redis.sweet.host}
+    password: ${liquidnet.redis.sweet.password}
     lettuce:
       pool:
         max-active: 16

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/docu/mongo_db_ddl.sql

@@ -6,5 +6,6 @@ db.createCollection("SmileSellDataVO");
 db.SmileSellDataDetailVO.createIndex({dataId:"hashed"});
 db.SmileSellDataVO.createIndex({sellDataId:"hashed"});
  ================================================== 创建分片
- sh.shardCollection("test_ln_scene.SmileSellDataDetailVO",{"dataId":"hashed"});
+sh.enableSharding("test_ln_scene");
+sh.shardCollection("test_ln_scene.SmileSellDataDetailVO",{"dataId":"hashed"});
 sh.shardCollection("test_ln_scene.SmileSellDataVO",{"sellDataId":"hashed"});
\ No newline at end of file