From c7f33c32cfb169fb12de2256dcfef86e7a70ca91 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 19 六月 2020 12:00:32 +0800
Subject: [PATCH] 大淘客授权账号更改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java | 270 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 195 insertions(+), 75 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java
index 20cbc03..4b15830 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java
@@ -8,6 +8,7 @@
import javax.annotation.Resource;
+import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.yeshi.utils.BigDecimalUtil;
@@ -55,8 +56,11 @@
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsTextTemplateService;
+import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;
+import com.yeshi.fanli.service.inter.msg.UserSystemMsgService;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
+import com.yeshi.fanli.service.inter.push.PushService;
import com.yeshi.fanli.service.inter.user.QrCodeService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
@@ -159,6 +163,19 @@
@Resource(name = "producer")
private Producer producer;
+ @Resource
+ private UserOtherMsgNotificationService userOtherMsgNotificationService;
+
+ @Resource
+ private PushService pushService;
+
+ @Resource
+ private UserSystemMsgService userSystemMsgService;
+
+ @Resource(name = "taskExecutor")
+ private TaskExecutor executor;
+
+
@Override
public UserCloud getValidByUid(Long uid) {
@@ -197,6 +214,15 @@
if (userCloud == null)
throw new UserCloudException(1, "浜戝彂鍗曞凡杩囨湡");
+ // 妫�娴嬫槸鍚﹂渶瑕佹洿鏂� - 1鍒嗛挓闂撮殧
+ String key = "cloudLogin_" + uid;
+ String result = redisManager.getCommonString(key);
+ if (!StringUtil.isNullOrEmpty(result)) {
+ return;
+ }
+ redisManager.cacheCommonString(key , "true" , 60);
+
+
// 鏇存柊淇℃伅
UserCloud update = new UserCloud();
update.setId(userCloud.getId());
@@ -204,7 +230,24 @@
update.setWxName(wxName);
update.setWxPortrait(wxPortrait);
userCloudMapper.updateByPrimaryKeySelective(update);
-
+
+ try {
+ userOtherMsgNotificationService.cloudMsg(uid, "浜戝彂鍗曞井淇¤处鍙�", "寰俊璐﹀彿鐧诲綍鎴愬姛", "鍙互寮�鍚綘鐨勭兢鍙戝崟浜�");
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+
+ // 鏇存柊鎻愰啋鐘舵��
+ UserCloudManage cloudManage = userCloudManageService.selectForUpdate(uid);
+ if (cloudManage == null) {
+ userCloudManageService.save(uid, false, false);
+ } else {
+ UserCloudManage updateManage = new UserCloudManage();
+ updateManage.setId(uid);
+ updateManage.setOfflineNotice(false);
+ userCloudManageService.updateByPrimaryKeySelective(updateManage);
+ }
+
// 寰俊鍙峰彉鍖�-娓呯┖缇や俊鎭�
if (!wxId.equals(userCloud.getWxId())) {
userCloudGroupService.deleteGroupByUid(uid);
@@ -289,6 +332,19 @@
// 寮�鍚彂鍦堝姛鑳�
userCloudManageService.save(uid, null, null);
+
+ try {
+ String item = null;
+ if (renew) {
+ item = "鎴愬姛缁垂" + menuEnum.getDescShow();
+ } else {
+ item = "鎴愬姛寮�閫�" + menuEnum.getDescShow();
+ }
+ String desc = "瀹屾垚鍏呭�兼敮浠�"+ BigDecimal.valueOf(menuEnum.getMoney()).setScale(2, BigDecimal.ROUND_DOWN) +"鍏�";
+ userOtherMsgNotificationService.cloudMsg(uid, "浜戝彂鍗曞厖鍊�", item, desc);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
}
@Override
@@ -388,10 +444,6 @@
if (StringUtil.isNullOrEmpty(wxId))
throw new UserCloudException(1003, "寰俊鍙蜂笉瀛樺湪锛岃鍏堝井淇＄櫥褰�");
- if (!AitaokerApiUtil.onlineCheck(robotId)) {
- throw new UserCloudException(1003, "寰俊宸叉帀绾匡紝璇峰厛閲嶆柊鐧诲綍寰俊");
- }
-
// 楠岃瘉寮�鍚姸鎬�
List<UserCloudGroup> listGroup = userCloudGroupService.listByUid(uid);
if (listGroup == null || listGroup.size() == 0)
@@ -422,7 +474,10 @@
// 妫�娴嬪井淇℃槸鍚︾櫥褰曠姸鎬�
if (!AitaokerApiUtil.onlineCheck(robotId)) {
- throw new UserCloudException(1003, "璇烽噸鏂扮櫥褰曞井淇�");
+ // 閫氱煡鐧诲綍寰俊
+ offlineNotification(uid);
+
+ throw new UserCloudException(1003, "寰俊宸叉帀绾匡紝闇�瑕侀噸鏂版壂鎻忎簩缁寸爜鐧诲綍");
}
@@ -466,7 +521,6 @@
String qrCode = null;
- String cloudPic = null;
ImgInfo imgVideo = null;
List<String> listImg = new ArrayList<>();
@@ -477,26 +531,7 @@
imgVideo = imgInfo;
continue;
}
-
- if (imgInfo.getType() == ImgEnum.goods) {
- cloudPic = imgInfo.getUrl();
- }
listImg.add(imgInfo.getUrl());
-
- // 鍙栨秷浜岀淮鐮佸浘
-// GoodsDetailVO goodsVO = imgInfo.getGoodsVO();
-// if (goodsVO == null) {
-// listImg.add(imgInfo.getUrl());
-// } else {
-// String jumpLink = getJumpLink(goodsVO, user, relationId, inviteCode, imgInfo.getUrl());
-// if (!StringUtil.isNullOrEmpty(jumpLink)) {
-// qrCode = jumpLink;
-// }
-// }
- }
-
- if (cloudPic == null) {
- cloudPic = imgs.get(0).getUrl();
}
}
@@ -573,16 +608,23 @@
}
// 鍙戦�佸浘鐗�
- if (!StringUtil.isNullOrEmpty(cloudPic)) {
- try {
- String imgBase64 = ImageToBase64.NetImageToBase64(cloudPic);
- boolean macsend = AitaokerApiUtil.macsendImgBase64(robotId, cloudGroup.getGroupId(), imgBase64);
- if (macsend)
- sendContent.setPicUrl(cloudPic);
- } catch (Exception e) {
- LogHelper.errorDetailInfo(e);
- }
+ int num = 1;
+ String picNum = configService.get(ConfigKeyEnum.robotCloudGroupPictureNum.getKey());
+ if (!StringUtil.isNullOrEmpty(picNum)) {
+ num = Integer.parseInt(picNum);
}
+
+ if (listImg.size() > 0)
+ for (int i = 0; i < num && i < listImg.size(); i++) {
+ try {
+ String imgBase64 = ImageToBase64.NetImageToBase64(listImg.get(i));
+ boolean macsend = AitaokerApiUtil.macsendImgBase64(robotId, cloudGroup.getGroupId(), imgBase64);
+ if (macsend)
+ sendContent.setPicUrl(listImg.get(i));
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ }
// 璇勮鏂囨湰
List<String> list = new ArrayList<>();
@@ -697,11 +739,6 @@
if (StringUtil.isNullOrEmpty(wxId))
throw new UserCloudException(1002, "璇峰厛鐧诲綍寰俊");
- if (!AitaokerApiUtil.onlineCheck(robotId)) {
- throw new UserCloudException(1003, "寰俊宸叉帀绾匡紝璇峰厛閲嶆柊鐧诲綍寰俊");
- }
-
-
// 楠岃瘉寮�鍚姸鎬�
List<UserCloudGroup> listGroup = userCloudGroupService.listByUid(uid);
if (listGroup == null || listGroup.size() == 0)
@@ -720,9 +757,11 @@
// 妫�娴嬪井淇℃槸鍚︾櫥褰曠姸鎬�
if (!AitaokerApiUtil.onlineCheck(robotId)) {
- throw new UserCloudException(1003, "璇烽噸鏂扮櫥褰曞井淇�");
+ // 閫氱煡鐧诲綍寰俊
+ offlineNotification(uid);
+
+ throw new UserCloudException(1003, "寰俊宸叉帀绾匡紝闇�瑕侀噸鏂版壂鎻忎簩缁寸爜鐧诲綍");
}
-
// 淇濆瓨鍙戦�佽褰�
UserCloudSendRecord sendRecord = new UserCloudSendRecord();
@@ -1082,18 +1121,25 @@
}
// 鍙戦�佸浘鐗�
- String picurl = listImg.get(0);
- if (!StringUtil.isNullOrEmpty(picurl)) {
- try {
- String imgBase64 = ImageToBase64.NetImageToBase64(picurl);
- boolean macsend = AitaokerApiUtil.macsendImgBase64(robotId, cloudGroup.getGroupId(), imgBase64);
- if (macsend)
- sendContent.setPicUrl(picurl);
- } catch (Exception e) {
- LogHelper.errorDetailInfo(e);
+ int num = 1;
+ String picNum = configService.get(ConfigKeyEnum.robotCloudGroupPictureNum.getKey());
+ if (!StringUtil.isNullOrEmpty(picNum)) {
+ num = Integer.parseInt(picNum);
+ }
+
+ if (listImg.size() > 0)
+ for (int i = 0; i < num && i < listImg.size(); i++) {
+ try {
+ String imgBase64 = ImageToBase64.NetImageToBase64(listImg.get(i));
+ boolean macsend = AitaokerApiUtil.macsendImgBase64(robotId, cloudGroup.getGroupId(), imgBase64);
+ if (macsend)
+ sendContent.setPicUrl(listImg.get(i));
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
}
- }
+
// 璇勮鏂囨湰
List<String> list = new ArrayList<>();
boolean macsend = AitaokerApiUtil.macsendText(robotId, cloudGroup.getGroupId(), comment);
@@ -1107,43 +1153,58 @@
}
}
+
@Override
- public void fixedTimeSend(String id) {
- if (StringUtil.isNullOrEmpty(id))
+ public void fixedTimeSend(List<GoodsEvaluate> listActivity, List<GoodsEvaluate> listGoods) {
+ if (listGoods == null && listActivity == null)
return;
-
// 涓�涓皬鏃朵箣鍓�
- long time = java.lang.System.currentTimeMillis() - 1000 * 60 * 60 ;
- Date lastTime = new Date(time);
-
+ Date lastTime = new Date(java.lang.System.currentTimeMillis() - 1000 * 60 * 60);
for (int i = 0; i < 1000; i ++) {
// 鏌ヨ鍝簺鐢ㄦ埛寮�閫�
- List<Long> list = userCloudMapper.listValidUid(i*1000, 1000);
- if (list == null || list.size() == 0) {
+ List<Long> listUser = userCloudMapper.listValidUid(i*1000, 1000);
+ if (listUser == null || listUser.size() == 0) {
break;
}
- for (Long uid: list) {
- try {
- // 鍒ゆ柇鏄惁璇� 鍐呭宸插彂
- UserCloudSendRecord record = userCloudSendRecordService.getByUidAndSendId(uid, id);
- if (record != null)
+ // 閬嶅巻鐢ㄦ埛
+ for (Long uid: listUser) {
+ try {// 鍒ゆ柇鏄惁寮�閫氬畼鏂归噰闆�
+ UserCloudManage cloudManage = userCloudManageService.selectByPrimaryKey(uid);
+ if (cloudManage == null || cloudManage.getOfficial() == null || !cloudManage.getOfficial()) {
continue;
-
+ }
// 鏄惁鍦ㄤ竴涓皬鏃跺唴宸插彂閫佽繃
UserCloudSendRecord last = userCloudSendRecordService.getLastByUid(uid, lastTime);
if (last != null)
continue;
- boolean official = false;
- UserCloudManage cloudManage = userCloudManageService.selectByPrimaryKey(uid);
- if (cloudManage != null) {
- if (cloudManage.getOfficial() != null)
- official = cloudManage.getOfficial();
+ String evaluateId = null;
+ // 娲诲姩
+ if (listActivity != null && listActivity.size() > 0) {
+ for (GoodsEvaluate evaluate: listActivity) {
+ UserCloudSendRecord record = userCloudSendRecordService.getByUidAndSendId(uid, evaluate.getId());
+ if (record != null)
+ continue;
+
+ evaluateId = evaluate.getId();
+ break;
+ }
}
-
- if (!Constant.IS_TEST && official) {
- UserCloudMQMsg msg = new UserCloudMQMsg(uid, id, UserCloudMQMsg.TYPE_EVALUATE);
+ // 鍗曞搧
+ if (StringUtil.isNullOrEmpty(evaluateId) && listGoods != null && listGoods.size() > 0) {
+ for (GoodsEvaluate evaluate: listGoods) {
+ UserCloudSendRecord record = userCloudSendRecordService.getByUidAndSendId(uid, evaluate.getId());
+ if (record != null)
+ continue;
+
+ evaluateId = evaluate.getId();
+ break;
+ }
+ }
+
+ if(!StringUtil.isNullOrEmpty(evaluateId)) {
+ UserCloudMQMsg msg = new UserCloudMQMsg(uid, evaluateId, UserCloudMQMsg.TYPE_EVALUATE);
Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.userCloud, msg);
producer.send(message);
}
@@ -1152,6 +1213,65 @@
}
}
}
-
}
+
+ private void offlineNotification(Long uid) {
+ UserCloudManage cloudManage = userCloudManageService.selectForUpdate(uid);
+ if (cloudManage == null) {
+ return;
+ }
+
+ Boolean offlineNotice = cloudManage.getOfflineNotice();
+ if (offlineNotice != null && offlineNotice) {
+ return;
+ }
+
+ try {
+ userOtherMsgNotificationService.cloudMsg(uid, "浜戝彂鍗曞井淇¤处鍙�", "寰俊璐﹀彿鎺夌嚎", "闇�瑕佷綘閲嶆柊鎵弿浜岀淮鐮佺櫥褰�");
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+
+ // 绔欏唴淇￠�氱煡
+ offlineNotificationZNX(uid);
+
+ // 寤惰繜10鍒嗛挓鍐嶆鎻愰啋
+ if(!Constant.IS_TEST) {
+ UserCloudMQMsg msg = new UserCloudMQMsg(uid, UserCloudMQMsg.TYPE_PUSH);
+ Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.userCloud, msg);
+ message.setStartDeliverTime(java.lang.System.currentTimeMillis() + 1000 * 60 * 10);
+ producer.send(message);
+ }
+
+ // 鏇存柊宸叉彁閱�
+ UserCloudManage updateManage = new UserCloudManage();
+ updateManage.setId(uid);
+ updateManage.setOfflineNotice(true);
+ userCloudManageService.updateByPrimaryKeySelective(updateManage);
+ }
+
+ // 绔欏唴淇￠�氱煡
+ @Override
+ public void offlineNotificationZNX(Long uid) {
+ // 楠岃瘉鏄惁寮�閫�
+ UserCloud userCloud = userCloudMapper.getValidByUid(uid);
+ if (userCloud == null)
+ return;
+
+ Integer robotId = userCloud.getRobotId();
+ if (robotId == null)
+ return;
+
+ // 鐧诲綍鐘舵��
+ if (AitaokerApiUtil.onlineCheck(robotId)) {
+ return;
+ }
+
+ try {
+ pushService.pushZNX(uid, "銆愰噸瑕侀�氱煡銆戜綘鐨勪簯鍙戝崟寰俊宸叉帀绾裤��", "闇�瑕佷綘閲嶆柊鎵弿浜岀淮鐮佺櫥褰�", null, null);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0