From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/PreviewInfoServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/PreviewInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/PreviewInfoServiceImpl.java
index 3d914b5..0b57b02 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/PreviewInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/PreviewInfoServiceImpl.java
@@ -1,15 +1,19 @@
package com.yeshi.fanli.service.impl.user;
+import java.io.InputStream;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
+import java.util.UUID;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.yeshi.utils.entity.FileUploadResult;
+import org.yeshi.utils.tencentcloud.COSManager;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
@@ -23,6 +27,7 @@
import com.yeshi.fanli.service.inter.money.extract.BindingAccountService;
import com.yeshi.fanli.service.inter.user.PreviewInfoService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleDetailService;
+import com.yeshi.fanli.util.ImageUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
@@ -44,7 +49,6 @@
@Resource
private ThreeSaleDetailService threeSaleDetailService;
-
@Override
@@ -59,16 +63,16 @@
info.setUpdateTime(new Date());
previewInfoDao.save(info);
- if (type == PreviewEnum.extractRecord) {
+ if (type == PreviewEnum.extractRecord || type == PreviewEnum.moneyArrival) {
return;
}
+ // redis缂撳瓨
if (StringUtil.isNullOrEmpty(content)) {
removePreview(preUid, type);
} else {
adddPreview(preUid, type, content);
}
-
}
// 缂撳瓨10鍒嗛挓
@@ -242,22 +246,47 @@
@Override
- public String saveMoneyArrival(Long uid, BigDecimal money, String time,String orderNo) throws PreviewInfoException {
+ public String saveMoneyArrival(Long uid, BigDecimal money, String time,String orderNo, String platform)
+ throws PreviewInfoException,Exception {
if (uid == null )
throw new PreviewInfoException(1, "璇峰厛鐧诲綍");
if (money == null )
throw new PreviewInfoException(1, "璇疯緭鍏ラ噾棰�");
- if(StringUtil.isNullOrEmpty(time))
+ if(StringUtil.isNullOrEmpty(orderNo))
throw new PreviewInfoException(1, "璇疯緭鍏ヨ鍗曞彿");
if(StringUtil.isNullOrEmpty(time))
throw new PreviewInfoException(1, "璇疯緭鍏ュ垱寤烘椂闂�");
- Date parse = TimeUtil.parseDotCommon2(time);
- if (parse == null)
+ Date date = TimeUtil.parseDotCommon2(time);
+ if (date == null)
throw new PreviewInfoException(1, "璇疯緭鍏ユ纭殑鏃堕棿鏍煎紡锛屽锛�2020.01.01 01:01");
+ // 杞崲鏍煎紡
+ time = TimeUtil.formatYMDHHMM(date);
- String content = ""; // TODO
- // save(uid, PreviewEnum.moneyArrival, gson.toJson(infoVO));
- return content;
+ InputStream drawStream = null;
+ if ("ios".equalsIgnoreCase(platform)) {
+ drawStream = ImageUtil.drawAlipayIOS(money, orderNo, time);
+ } else {
+ drawStream = ImageUtil.drawAlipayAndroid(money, orderNo, time);
+ }
+
+ if (drawStream == null)
+ throw new PreviewInfoException(1, "棰勮鐢熸垚澶辫触");
+
+ // 涓婁紶鏂囦欢
+ String uuid = UUID.randomUUID().toString().replace("-", "");
+ String upPath = "/user/img/preview/" + uuid + "_" + System.currentTimeMillis() + ".png";
+ FileUploadResult result = COSManager.getInstance().uploadInputStream(drawStream, upPath);
+ if (result == null) {
+ throw new PreviewInfoException(1, "棰勮鐢熸垚澶辫触");
+ }
+
+ // 淇濆瓨淇℃伅
+ save(uid, uid, PreviewEnum.moneyArrival, result.getUrl());
+
+ return result.getUrl();
}
}
+
+
+
--
Gitblit v1.8.0