Merge remote-tracking branch 'origin/dev_stone' into dev_stone

liquidnet-bus-feign/liquidnet-api-feign-adam/src/main/java/com/liquidnet/service/feign/adam/rsc/FeignAdamStoneClient.java

+package com.liquidnet.service.feign.adam.rsc;
+
+import com.liquidnet.service.base.ResponseDto;
+import feign.hystrix.FallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.HashMap;
+
+@Component
+@FeignClient(name = "liquidnet-service-stone",
+        contextId = "FeignAdamStoneClient", path = "stone",
+        url = "${liquidnet.service.stone.url}",
+        fallback = FallbackFactory.Default.class)
+public interface FeignAdamStoneClient {
+
+    @PostMapping("user/inner/doTask")
+    ResponseDto<HashMap<String, Object>> doTaskInner(@RequestParam(value = "taskId") Integer taskId,
+                                                     @RequestParam(value = "uid") String uid
+    );
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserInfoServiceImpl.java

@@ -17,6 +17,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.feign.adam.rsc.FeignAdamChimeClient;
+import com.liquidnet.service.feign.adam.rsc.FeignAdamStoneClient;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,9 +27,7 @@ import org.springframework.util.DigestUtils;
 
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -54,16 +53,21 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
 
     @Autowired
     private FeignAdamChimeClient feignAdamChimeClient;
+    @Autowired
+    private FeignAdamStoneClient feignAdamStoneClient;
 
     @Value("${liquidnet.reviewer.user-info}")
     private Boolean reviewUserInfo;
     // 用户注册IM的密码
     private static final String ppwd = "138CEF91A62088BD3EF329FA3A6176CB18A";
 
+    private static final List<String> defaultBackgroundList = Arrays.asList("https://img.zhengzai.tv/other/2021/07/27/150eeb0e20af4fc88e8a1ec57c46c362.png", "https://img.zhengzai.tv/files/2021/01/13/5ffeab3584b7d.png", "http://pic.zhengzai.tv/default/background.png", "http://img.zhengzai.tv/album/20171027/1509106243302.png");
+
     @Override
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public ResponseDto<AdamUserInfoVo> edit(AdamUserInfoVo existUserInfoVo, AdamUserInfoParam parameter) {
         Integer voIsComplete = existUserInfoVo.getIsComplete();
+        AdamTagVo sex = existUserInfoVo.getSex();
         int isComplete = voIsComplete == 0 ? 1 : voIsComplete;
 
         boolean syncChimeFlg = false;// 标识是否需要同步`service-chime`
@@ -140,6 +144,23 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
             log.debug("同步`chime`用户标签信息结果:{}", JsonUtils.toJson(chimeRegisterRstFlg));
         }
 
+        try {// 积分处理
+            if (null == sex && null != existUserInfoVo.getSex()) {
+                // 有效编辑个人信息
+                feignAdamStoneClient.doTaskInner(5, existUserInfoVo.getUid());
+            }
+            if (StringUtils.isNotBlank(existUserInfoVo.getBackground()) && !defaultBackgroundList.contains(existUserInfoVo.getBackground())) {
+                // 有效编辑个人照片
+                feignAdamStoneClient.doTaskInner(6, existUserInfoVo.getUid());
+            }
+            if (voIsComplete != 11 && existUserInfoVo.getIsComplete() == 11) {
+                // 已同步在场信息
+                feignAdamStoneClient.doTaskInner(8, existUserInfoVo.getUid());
+            }
+        } catch (Exception e) {
+            log.error("同步`stone`用户积分信息异常", e);
+        }
+
         LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
         LinkedList<Object[]> updateUserObjs = CollectionUtil.linkedListObjectArr(),
                 updateUserInfoObjs = CollectionUtil.linkedListObjectArr();