exit

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinGoodsAnticipateService.java

@@ -16,8 +16,8 @@ public interface IGoblinGoodsAnticipateService {
     /**
      * 用户预约
      */
-    ResponseDto<Object> userAbout(String skuId, String uid, String phone);
+    ResponseDto<Object> userAbout(String skuId);
 
 
-    ResponseDto<Boolean> selectAnticipate(String skuId, String uid);
+    ResponseDto<Boolean> selectAnticipate(String skuId);
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinGoodsAnticipateController.java

@@ -9,8 +9,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * <p>
  * 预约表 前端控制器
@@ -30,16 +28,14 @@ public class GoblinGoodsAnticipateController {
 
     @ApiOperation("用户预约 （只能预约不能取消）")
     @PostMapping("/userAbout")
-    public ResponseDto<Object> userAbout(@RequestParam(name = "skuId", required = true) String skuId,
-                                         @RequestParam(name = "uid", required = true) String uid,
-                                         @RequestParam(name = "phone", required = true) String phone) {
-        return goblinGoodsAnticipateService.userAbout(skuId, uid, phone);
+    public ResponseDto<Object> userAbout(@RequestParam(name = "skuId", required = true) String skuId) {
+        return goblinGoodsAnticipateService.userAbout(skuId);
     }
 
     @ApiOperation("根据skuId和uid查询")
     @GetMapping("/selectAnticipateBySkuIdAndUid")
-    public ResponseDto<Boolean> selectAnticipate(@RequestParam(name = "skuId") String skuId,@RequestParam(name = "uid") String uid){
-        return goblinGoodsAnticipateService.selectAnticipate(skuId,uid);
+    public ResponseDto<Boolean> selectAnticipate(@RequestParam(name = "skuId") String skuId){
+        return goblinGoodsAnticipateService.selectAnticipate(skuId);
     }
 
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinGoodsAnticipateServiceImpl.java

 package com.liquidnet.service.goblin.service.impl;
 
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.CollectionUtil;
-import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.goblin.dto.manage.GoblinGoodsAnticipateAddParam;
-import com.liquidnet.service.goblin.dto.manage.GoblinGoodsAnticipateValueAddParam;
-import com.liquidnet.service.goblin.dto.manage.GoblinGoodsAnticipateValueParam;
-import com.liquidnet.service.goblin.dto.manage.vo.AnticipateValueVo;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinGoodsAnticipateValueVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodAnticipateUserVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinGoodsAnticipateVo;
 import com.liquidnet.service.goblin.service.IGoblinGoodsAnticipateService;
-import com.liquidnet.service.goblin.service.manage.IGoblinGoodsAnticipateMgService;
-import com.liquidnet.service.goblin.util.GoblinMongoUtils;
+import com.liquidnet.service.goblin.util.GoblinAnticipateUtils;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
 import com.liquidnet.service.goblin.util.QueueUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigInteger;
 import java.time.LocalDateTime;
-import java.util.HashMap;
 import java.util.LinkedList;
-import java.util.List;
 
 /**
  * <p>
@@ -50,7 +38,7 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
     QueueUtils queueUtils;
 
     @Override
-    public ResponseDto<Object> userAbout(String skuId, String uid, String phone) {
+    public ResponseDto<Object> userAbout(String skuId) {
         //查询该skuId是否能被预约
         GoblinGoodsAnticipateValueVo anticipateValueVo = goblinRedisUtils.getValueBySkuId(skuId);
         if (anticipateValueVo != null) {
@@ -58,29 +46,34 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
             if (!anticipateValueVo.getState().equals(1)) {
                 return ResponseDto.failure("该商品预约尚未开始或已经结束，不可预约！");
             }
+            GoblinAnticipateUtils goblinAnticipateUtils = new GoblinAnticipateUtils();
+            AdamUserInfoVo userInfo = goblinAnticipateUtils.getUserInfo();
+            if (userInfo==null){
+                return ResponseDto.failure("登陆信息有误");
+            }
             //查询该用户是否预
-            GoblinGoodAnticipateUserVo userVo = goblinRedisUtils.getUserAboutAut(skuId, uid);
+            GoblinGoodAnticipateUserVo userVo = goblinRedisUtils.getUserAboutAut(skuId, userInfo.getUid());
             LinkedList<Object[]> sqlValue = CollectionUtil.linkedListObjectArr();
             if (userVo == null) {
                 GoblinGoodAnticipateUserVo user = new GoblinGoodAnticipateUserVo();
-                user.setUid(uid);
+                user.setUid(userInfo.getUid());
                 user.setSkuId(skuId);
-                user.setPhone(phone);
+                user.setPhone(userInfo.getMobile());
                 user.setState(0);
                 //mongodb记录
                 goblinRedisUtils.setUserAboutSku(user);
                 //用户没有预约过
                 //发送redis消息修改mysql记录用户预约
                 sqlValue.add(new Object[]{
-                        uid,
+                        user.getUid(),
                         skuId,
-                        phone,
+                        user.getPhone(),
                         0
                 });
                 sendRedis("goblin_goods_anticipate_user", sqlValue);
                 goblinRedisUtils.setSkuIdPeople(skuId);
                 //储存用户头像
-                userAvatar(skuId);
+                goblinRedisUtils.setUserAvatar(skuId,userInfo.getAvatar());
             }
             return ResponseDto.success();
         }
@@ -88,8 +81,13 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
     }
 
     @Override
-    public ResponseDto<Boolean> selectAnticipate(String skuId, String uid) {
-        return ResponseDto.success(goblinRedisUtils.getUserAboutAut(skuId, uid) != null) ;
+    public ResponseDto<Boolean> selectAnticipate(String skuId) {
+        GoblinAnticipateUtils goblinAnticipateUtils = new GoblinAnticipateUtils();
+        AdamUserInfoVo userInfo = goblinAnticipateUtils.getUserInfo();
+        if (userInfo == null){
+            return ResponseDto.failure("登陆信息有误！");
+        }
+        return ResponseDto.success(goblinRedisUtils.getUserAboutAut(skuId,userInfo.getUid()) != null) ;
     }
 
     private Integer setState(LocalDateTime startDate, LocalDateTime endDate) {
@@ -111,11 +109,6 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
         return null;
     }
 
-    private void userAvatar(String skuId) {
-        //获取
-        goblinRedisUtils.setUserAvatar(skuId);
-    }
-
     public void sendRedis(String sqlKey, LinkedList<Object[]> sqlData) {
         LinkedList<String> sql = CollectionUtil.linkedListString();
         sql.add(SqlMapping.get(sqlKey));

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinGoodsAnticipateMgServiceImpl.java

@@ -243,11 +243,6 @@ public class GoblinGoodsAnticipateMgServiceImpl implements IGoblinGoodsAnticipat
         return valueVo;
     }
 
-    private void userAvatar(String skuId) {
-        //获取
-        goblinRedisUtils.setUserAvatar(skuId);
-    }
-
     public void sendRedis(String sqlKey, LinkedList<Object[]> sqlData) {
         LinkedList<String> sql = CollectionUtil.linkedListString();
         sql.add(SqlMapping.get(sqlKey));

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinAnticipateUtils.java

@@ -5,6 +5,7 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserProfileVo;
 import com.liquidnet.service.base.ResponseDto;
 import lombok.extern.slf4j.Slf4j;
@@ -24,22 +25,23 @@ public class GoblinAnticipateUtils {
 
     private final String avatar = "";
 
-    public String getUserInfo() {
+    public AdamUserInfoVo getUserInfo() {
         try {
             MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
             header.add("Authorization", "Bearer " + CurrentUtil.getToken());
             header.add("Accept", "application/json;charset=UTF-8");
 
-            String returnData = HttpUtil.post(adamUrl + " /adam/user/info", header);
+            String returnData = HttpUtil.post(adamUrl+"/adam/user/info",null, header);
+            log.info("post url:{}",adamUrl+" /adam/user/info");
             ResponseDto<AdamUserProfileVo> innerReturnVo = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<AdamUserProfileVo>>() {
             });
             if (innerReturnVo.getData()!=null){
-                return innerReturnVo.getData().getUserInfo().getAvatar();
+                return innerReturnVo.getData().getUserInfo();
             }
-            return avatar;
+            return null;
         } catch (Exception e) {
             log.error("获取用户头像失败", e);
-            return avatar;
+            return null;
         }
     }
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinRedisUtils.java

@@ -124,12 +124,11 @@ public class GoblinRedisUtils {
     /**
      * 保存用户头像
      */
-    public void setUserAvatar(String skuId) {
+    public void setUserAvatar(String skuId,String avatar) {
         List<String> list = (List) redisUtil.get(GoblinRedisConst.ANTICIPATE_SKUID_AVATAR.concat(skuId));
         List<String> urlList = list != null ? list : new ArrayList<String>();
         if (urlList.size()<=2){
-            GoblinAnticipateUtils goblinAnticipateUtils = new GoblinAnticipateUtils();
-            urlList.add(goblinAnticipateUtils.getUserInfo());
+            urlList.add(avatar);
             redisUtil.set(GoblinRedisConst.ANTICIPATE_SKUID_AVATAR.concat(skuId),urlList);
         }
     }