修改代码

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileAgentVo.java

 package com.liquidnet.service.goblin.dto.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -35,11 +36,13 @@ public class SmileAgentVo {
     /**
      * 总代票提
      */
+    @ApiModelProperty(value = "总代票提")
     private BigDecimal totalCarry;
 
     /**
      * 普代票提
      */
+    @ApiModelProperty(value = "普代票提")
     private BigDecimal ordCarry;
 
 

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileUserVO.java

@@ -63,7 +63,7 @@ public class SmileUserVO implements Serializable {
      * 省key
      */
     @ApiModelProperty(value = "省key")
-    private String provinceKey;
+    private String provinceId;
 
     /**
      * 省
@@ -75,7 +75,7 @@ public class SmileUserVO implements Serializable {
      * 市key
      */
     @ApiModelProperty(value = "市key")
-    private String cityKey;
+    private String cityId;
 
     /**
      * 市
@@ -87,7 +87,7 @@ public class SmileUserVO implements Serializable {
      * 区key
      */
     @ApiModelProperty(value = "区key")
-    private String areaKey;
+    private String areaId;
 
     /**
      * 区
@@ -108,9 +108,9 @@ public class SmileUserVO implements Serializable {
     private String wechat;
 
     /**
-     * 代理类型（1：总代，2：普代）
+     *
      */
-    @ApiModelProperty(value = "代理类型（1：总代，2：普代）")
+    @ApiModelProperty(value = "代理类型（0：未审核，1：总代，2：普代，3：未认证）")
     private Integer type;
 
     /**
@@ -192,9 +192,9 @@ public class SmileUserVO implements Serializable {
     private Integer delTag;
     /**
      * 认证标识
-     */
+     *//*
     @ApiModelProperty(value = "（0:未审核，1：通过，2：未通过）")
-    private Integer authTag;
+    private Integer authTag;*/
 
     /**
      * 认证失败原因
@@ -205,6 +205,9 @@ public class SmileUserVO implements Serializable {
     @ApiModelProperty(value = "学校id")
     private String schoolId;
 
+    @ApiModelProperty(value = "票提信息")
+    SmileAgentVo smileAgentVo;
+
     private LocalDateTime createdDate;
 
     private LocalDateTime updatedDate;

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

@@ -100,6 +100,7 @@ global-auth:
     - ${liquidnet.info.context}/swagger-resources/**
     - ${liquidnet.info.context}/v2/api-docs*
     - ${liquidnet.info.context}/inner/**
+    - ${liquidnet.info.context}/frontNoLogin/**
 
 
   oncheck-url-pattern:

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/controller/SmileNoLoginController.java

+package com.liquidnet.service.controller;
+
+import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.constant.SmileRedisConst;
+import com.liquidnet.service.goblin.dto.vo.SmileAgentVo;
+import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
+import com.liquidnet.service.goblin.service.manage.SmileFrontService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+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.RestController;
+
+/**
+ * @author zhangfuxin
+ * @Description:用户接口
+ * @date 2021/12/27 下午6:25
+ */
+@Api(tags = "前端接口管理(需要登陆状态)")
+@RestController
+@RequestMapping("/frontNoLogin")
+@Slf4j
+public class SmileNoLoginController {
+    @Autowired
+    private RedisUtil redisUtil;
+    @Autowired
+    private SmileFrontService smileFrontService;
+
+    @GetMapping("getUser")
+    @ApiOperation("获取用户状态,并返回票提")
+    public ResponseDto<SmileUserVO> getUser(String userId,String performanceId,String ticketId) {
+        SmileUserVO smileUserVO= (SmileUserVO) redisUtil.get(SmileRedisConst.SMILE_USER.concat(userId));
+        if(redisUtil.hasKey(SmileRedisConst.SMILE_AGENT.concat(performanceId).concat(":").concat(ticketId))){
+            SmileAgentVo smileAgentVo= (SmileAgentVo) redisUtil.get(SmileRedisConst.SMILE_AGENT.concat(performanceId).concat(":").concat(ticketId));
+        }
+
+        return ResponseDto.success(smileUserVO);
+    }
+
+
+
+}

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/controller/SmileUserController.java

@@ -48,8 +48,8 @@ public class SmileUserController {
     public ResponseDto<List<SmileSchoolVo>> getSchool() {
         String userId = CurrentUtil.getCurrentUid();
         List<SmileSchoolVo> list=null;
-        if(redisUtil.hasKey(SmileRedisConst.SMILE_SCHOOL.concat(userId))){
-            list= (List<SmileSchoolVo>) redisUtil.get(SmileRedisConst.SMILE_SCHOOL.concat(userId));
+        if(redisUtil.hasKey(SmileRedisConst.SMILE_SCHOOL)){
+            list= (List<SmileSchoolVo>) redisUtil.get(SmileRedisConst.SMILE_SCHOOL);
         }
         return ResponseDto.success(list);
     }

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/service/impl/SmileFrontServiceImpl.java

@@ -47,22 +47,23 @@ public class SmileFrontServiceImpl implements SmileFrontService {
         return true;
     }
     public void insertUser(SmileUserVO smileUserVO){
+        smileUserVO.setType(0);
         LinkedList<String> sqls = CollectionUtil.linkedListString();
         sqls.add(SqlMapping.get("smile_service.insert_user"));
         LinkedList<Object[]> sqlData = CollectionUtil.linkedListObjectArr();
         sqlData.add(new Object[]{
                 smileUserVO.getImg(),smileUserVO.getName(),smileUserVO.getUid(),smileUserVO.getBirthday(),smileUserVO.getSex(),
-                smileUserVO.getPhone(),smileUserVO.getProvinceKey(),smileUserVO.getProvince(),smileUserVO.getCityKey(),smileUserVO.getCity(),
-                smileUserVO.getAreaKey(),smileUserVO.getArea(),smileUserVO.getAddress(),smileUserVO.getWechat(),smileUserVO.getType(),smileUserVO.getOrgId(),
+                smileUserVO.getPhone(),smileUserVO.getProvinceId(),smileUserVO.getProvince(),smileUserVO.getProvinceId(),smileUserVO.getCity(),
+                smileUserVO.getAreaId(),smileUserVO.getArea(),smileUserVO.getAddress(),smileUserVO.getWechat(),smileUserVO.getType(),smileUserVO.getOrgId(),
                 smileUserVO.getIdCard(),smileUserVO.getSchoolName(),smileUserVO.getSchoolMajor(),smileUserVO.getIdentity(),smileUserVO.getTag(),smileUserVO.getAgent(),
-                smileUserVO.getAuthTag(),smileUserVO.getErrorReason(),smileUserVO.getIntroduce(),smileUserVO.getSpecialty1(),smileUserVO.getSpecialty2(),
+                ,smileUserVO.getErrorReason(),smileUserVO.getIntroduce(),smileUserVO.getSpecialty1(),smileUserVO.getSpecialty2(),
                 smileUserVO.getSpecialty3(),smileUserVO.getState(),smileUserVO.getDelTag(),smileUserVO.getCreatedDate(),smileUserVO.getUpdatedDate(),smileUserVO.getSchoolId()
 
         });
         String sqlDatas = SqlMapping.gets(sqls, sqlData);
         queueUtils.sendMsgByRedis(MQConst.SmileQueue.SMILE_USER.getKey(), sqlDatas);
     }
-    public void updateUser(SmileUserVO smileUserVO){
+ /*   public void updateUser(SmileUserVO smileUserVO){
         LinkedList<String> sqls = CollectionUtil.linkedListString();
         sqls.add(SqlMapping.get("smile_service.update_user"));
         LinkedList<Object[]> sqlData = CollectionUtil.linkedListObjectArr();
@@ -77,11 +78,14 @@ public class SmileFrontServiceImpl implements SmileFrontService {
         });
         String sqlDatas = SqlMapping.gets(sqls, sqlData);
         queueUtils.sendMsgByRedis(MQConst.SmileQueue.SMILE_USER.getKey(), sqlDatas);
-    }
+    }*/
 
     public List<KylinPerformanceVo>  getPerformance(){
         ArrayList<KylinPerformanceVo> list= ObjectUtil.kylinPerformanceVoList();
-        String perforManceIds= (String) redisUtil.get(SmileRedisConst.SMILE_SHOW);
+        String perforManceIds="";
+        if(redisUtil.hasKey(SmileRedisConst.SMILE_SHOW)){
+             perforManceIds= (String) redisUtil.get(SmileRedisConst.SMILE_SHOW);
+        }
         if(StringUtil.isNotBlank(perforManceIds)){
             for(String id:perforManceIds.split(",")){
                 KylinPerformanceVo kylinPerformanceVo=smileMongoUtils.getPerFormance(id);
@@ -115,12 +119,12 @@ public class SmileFrontServiceImpl implements SmileFrontService {
         if(type.equals("1")){
             redisVo.setImg(smileUserVO.getImg());
             redisVo.setSex(smileUserVO.getSex());
-            redisVo.setProvinceKey(smileUserVO.getProvinceKey());
+            redisVo.setProvinceId(smileUserVO.getProvinceId());
             redisVo.setProvince(smileUserVO.getProvince());
             redisVo.setCity(smileUserVO.getCity());
-            redisVo.setCityKey(smileUserVO.getCityKey());
+            redisVo.setCityId(smileUserVO.getCityId());
             redisVo.setArea(smileUserVO.getArea());
-            redisVo.setAreaKey(smileUserVO.getAreaKey());
+            redisVo.setAreaId(smileUserVO.getAreaId());
             redisVo.setAddress(smileUserVO.getAddress());
             redisVo.setWechat(smileUserVO.getWechat());
             redisVo.setSchoolName(smileUserVO.getSchoolName());

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/resources/bootstrap-dev.yml

@@ -7,7 +7,7 @@ liquidnet:
     password: user123
   eureka:
     #127.0.0.1
-    host: 172.17.192.42:7001
+    host: 127.0.0.1:7001
 # end-dev-这里是配置信息基本值
 
 spring:

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/resources/sqlmap.properties

 #----                   服务支持信息
 goblin_service_support.insert_byreplace=REPLACE INTO goblin_service_support (ssid,name,`desc`,url,del_flg,created_by,created_at)VALUES(?,?,?,?,'0','-',sysdate()) 
 
-smile_service.insert_user= insert into smile_user(img,`name`,`uid`,birthday,sex,phone,province_key,province,city_key,city,area_key,area,address,wechat,`type`,org_id,id_card,school_name,school_major,`identity`,tag,agent,auth_tag,error_reason,introduce,specialty1,specialty2,specialty3,`state`,del_tag,created_date,updated_date,school_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+smile_service.insert_user= insert into smile_user(img,`name`,`uid`,birthday,sex,phone,province_id,province,city_id,city,area_id,area,address,wechat,`type`,org_id,id_card,school_name,school_major,`identity`,tag,agent,error_reason,introduce,specialty1,specialty2,specialty3,`state`,del_tag,created_date,updated_date,school_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 smile_service.update_user=  update smile_user  set img =?,`name`=?,birthday=?,sex =?,phone=?,province_key=?,province=?,city_key =?,city=?,area_key=?,area =?,address =?,wechat =?,`type`=?,org_id =?,id_card=?,school_name =?,school_major =?,`identity`=?,tag =?,agent =?,auth_tag =?,error_reason =?,introduce =?,specialty1 =?,specialty2 =?,specialty3 =?,`state`=?,updated_date=?,school_id=? where `uid`=?
 smile_service.delete_user= delete from smile_user where uid=?
\ No newline at end of file