From a69ec998d9fe8fa8ea6c40175bebc4e53a227d5b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 11 六月 2020 09:26:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java | 90 ++++++++++++++++++++++----------------------
1 files changed, 45 insertions(+), 45 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 7807105..c4172d6 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
@@ -236,56 +236,56 @@
}
}
- 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.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杩斿洖涓虹┖");
+// }
UserCloud newCloud = new UserCloud();
newCloud.setUid(uid);
newCloud.setOrderId(orderId);
- newCloud.setGroupNum(groupNum);
- newCloud.setRobotId(robotId);
+// 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 杞崲 鏅�氭椂闂�
+// if (renew) {
+// 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