From e7920b14a9baab97035a1a529da85d124a2bcacd Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 16 六月 2020 10:54:29 +0800
Subject: [PATCH] 云发单对测试用户显示
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java | 94 +++++++++++++++++++++++------------------------
1 files changed, 46 insertions(+), 48 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 441a782..20cbc03 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
@@ -15,6 +15,7 @@
import com.aliyun.openservices.ons.api.Message;
import com.aliyun.openservices.ons.api.Producer;
import com.yeshi.fanli.dao.mybatis.user.cloud.UserCloudMapper;
+import com.yeshi.fanli.dto.aitaoker.RobotInfoDTO;
import com.yeshi.fanli.dto.aitaoker.WeiXinGroupDTO;
import com.yeshi.fanli.dto.jd.JDCouponInfo;
import com.yeshi.fanli.dto.jd.JDPingouInfo;
@@ -216,7 +217,6 @@
}
@Override
- @Transactional(rollbackFor = Exception.class)
public void openCloud(Long uid, Long orderId, CloudOrderMenuEnum menuEnum) throws UserCloudException {
UserCloud existCloud = userCloudMapper.getByOrderId(orderId);
if (existCloud != null) {
@@ -230,62 +230,60 @@
if (userCloud.getEndTime().getTime() > java.lang.System.currentTimeMillis())
renew = true;
// 楠岃瘉濂楅鏄惁鐩稿悓
- if (renew && userCloud.getRobotType() != menuEnum.getType()) {
+ if (renew && userCloud.getRobotType() != menuEnum.getRobotType()) {
LogHelper.cloudInfo("鏂规硶openCloud: [uid=" + uid + "][璁㈠崟ID=" + orderId + "]宸叉湁鍏朵粬浜戝彂鍗曞椁愯繕鏈粨鏉�");
throw new UserCloudException(1, "宸叉湁鍏朵粬浜戝彂鍗曞椁愯繕鏈粨鏉�");
}
}
-// RobotInfoDTO dto = null;
-// if (renew) { // 缁垂
-// dto = AitaokerApiUtil.robotRenewals(userCloud.getRobotId(), menuEnum.getMonth());
-// } else { // 鍒涘缓鏈哄櫒浜�
-// dto = AitaokerApiUtil.robotCreate(menuEnum.getMonth(), menuEnum.getType(), "wechatrobot", null);
-// }
-//
-// if (dto == null) {
-// LogHelper.cloudInfo("鏂规硶openCloud: [uid=" + uid + "][璁㈠崟ID=" + orderId + "]鏈哄櫒浜哄け璐ワ細 杩斿洖绌哄��");
-// throw new UserCloudException(1, "鏈哄櫒浜鸿幏鍙栧け璐�");
-// }
-//
-// String endTimeStr = dto.getEndTime();
-// if (StringUtil.isNullOrEmpty(endTimeStr)) {
-// LogHelper.cloudInfo("鏂规硶openCloud: [uid=" + uid + "][璁㈠崟ID=" + orderId + "]鏈哄櫒浜哄け璐ワ細 杩斿洖鏃堕棿涓虹┖");
-// throw new UserCloudException(1, "鏈哄櫒浜鸿繑鍥炴椂闂翠负绌�");
-// }
-//
-// long endTime = 0;
-// try {
-// endTime = Long.parseLong(endTimeStr);
-// } catch (Exception e) {
-// LogHelper.cloudInfo("鏂规硶openCloud: [uid=" + uid + "][璁㈠崟ID=" + orderId + "]鏈哄櫒浜哄け璐ワ細 杩斿洖鏃堕棿鏍煎紡涓嶆纭�");
-// throw new UserCloudException(1, "鏈哄櫒浜鸿繑鍥炴椂闂存牸寮忎笉姝ｇ‘");
-// }
-//
-// Integer robotId = dto.getId();
-// if (robotId == null) {
-// LogHelper.cloudInfo("鏂规硶openCloud: [uid=" + uid + "][璁㈠崟ID=" + orderId + "]鏈哄櫒浜哄け璐ワ細 鏈哄櫒浜篒D杩斿洖涓虹┖");
-// throw new UserCloudException(1, "鏈哄櫒浜篒D杩斿洖涓虹┖");
-// }
-//
-// Integer groupNum = dto.getGroupNum();
-// if (groupNum == null) {
-// LogHelper.cloudInfo("鏂规硶openCloud: [uid=" + uid + "][璁㈠崟ID=" + orderId + "]鏈哄櫒浜哄け璐ワ細 groupNum杩斿洖涓虹┖");
-// throw new UserCloudException(1, "groupNum杩斿洖涓虹┖");
-// }
+ RobotInfoDTO dto = null;
+ if (renew) { // 缁垂
+ dto = AitaokerApiUtil.robotRenewals(userCloud.getRobotId(), menuEnum.getMonth());
+ } else { // 鍒涘缓鏈哄櫒浜�
+ dto = AitaokerApiUtil.robotCreate(menuEnum.getMonth(), menuEnum.getRobotType(), "wechatrobot", null);
+ }
+
+ if (dto == null) {
+ LogHelper.cloudInfo("鏂规硶openCloud: [uid=" + uid + "][璁㈠崟ID=" + orderId + "]鏈哄櫒浜哄け璐ワ細 鏈哄櫒浜哄垱寤哄け璐�");
+ }
+
+ Integer robotId = dto.getId();
+ if (robotId == null) {
+ LogHelper.cloudInfo("鏂规硶openCloud: [uid=" + uid + "][璁㈠崟ID=" + orderId + "]鏈哄櫒浜哄け璐ワ細 鏈哄櫒浜篒D杩斿洖涓虹┖");
+ }
+
+ String endTimeStr = dto.getEndTime();
+ if (StringUtil.isNullOrEmpty(endTimeStr)) {
+ LogHelper.cloudInfo("鏂规硶openCloud: [uid=" + uid + "][璁㈠崟ID=" + orderId + "]鏈哄櫒浜哄け璐ワ細 杩斿洖鏃堕棿涓虹┖");
+ }
+
+ long endTime = 0;
+ try {
+ endTime = Long.parseLong(endTimeStr);
+ } catch (Exception e) {
+ LogHelper.cloudInfo("鏂规硶openCloud: [uid=" + uid + "][璁㈠崟ID=" + orderId + "]鏈哄櫒浜哄け璐ワ細 杩斿洖鏃堕棿鏍煎紡涓嶆纭�");
+ }
+
+ Integer groupNum = dto.getGroupNum();
+ if (groupNum == null) {
+ LogHelper.cloudInfo("鏂规硶openCloud: [uid=" + uid + "][璁㈠崟ID=" + orderId + "]鏈哄櫒浜哄け璐ワ細 groupNum杩斿洖涓虹┖");
+ }
UserCloud newCloud = new UserCloud();
newCloud.setUid(uid);
newCloud.setOrderId(orderId);
-// newCloud.setGroupNum(groupNum);
-// newCloud.setRobotId(robotId);
- newCloud.setRobotType(menuEnum.getType());
-// if (renew) {
-// newCloud.setStartTime(userCloud.getStartTime());
-// } else {
-// newCloud.setStartTime(new Date());
-// }
-// newCloud.setEndTime(new Date(endTime * 1000)); // Unix 杞崲 鏅�氭椂闂�
+ newCloud.setGroupNum(groupNum);
+ newCloud.setRobotId(robotId);
+ newCloud.setRobotType(menuEnum.getRobotType());
+ if (renew) {
+ newCloud.setWxId(userCloud.getWxId());
+ newCloud.setWxName(userCloud.getWxName());
+ newCloud.setWxPortrait(userCloud.getPortrait());
+ newCloud.setStartTime(userCloud.getStartTime());
+ } else {
+ newCloud.setStartTime(new Date());
+ }
+ newCloud.setEndTime(new Date(endTime * 1000)); // Unix 杞崲 鏅�氭椂闂�
newCloud.setCreateTime(new Date());
userCloudMapper.insertSelective(newCloud);
--
Gitblit v1.8.0