From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java
index 1596847..9083263 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java
@@ -21,6 +21,7 @@
import com.yeshi.fanli.dto.push.PushContentDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.Extract;
+import com.yeshi.fanli.entity.bus.user.PayInfo;
import com.yeshi.fanli.entity.bus.user.PreviewInfo;
import com.yeshi.fanli.entity.bus.user.PreviewInfo.PreviewEnum;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -35,13 +36,14 @@
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.OrderMoneyDailyCountService;
import com.yeshi.fanli.service.inter.push.PushService;
+import com.yeshi.fanli.service.inter.user.PayInfoService;
import com.yeshi.fanli.service.inter.user.PreviewInfoService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import org.yeshi.utils.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.TimeUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.vo.money.MoneyPredictVO;
import com.yeshi.fanli.vo.money.MoneyStatisticVO;
@@ -76,6 +78,9 @@
@Resource
private PushService pushService;
+
+ @Resource
+ private PayInfoService payInfoService;
/**
* 淇濆瓨璧勯噾淇℃伅
@@ -403,8 +408,12 @@
*/
@RequestMapping(value = "saveMoneyArrival")
public void saveMoneyArrival(String callback, AcceptData acceptData, Long uid, BigDecimal money, String dayTime,
- String orderNo, PrintWriter out) {
+ PrintWriter out) {
try {
+ // 鏌ヨ鏈�鏂颁竴鏉℃敮浠樺疂璁㈠崟鍙�
+ PayInfo payInfo = payInfoService.getNearInfo();
+ String orderNo = getAlipayNo(payInfo.getOrderId());
+
String link = previewInfoService.saveMoneyArrival(uid, money, dayTime, orderNo, acceptData.getPlatform());
JSONObject object = new JSONObject();
object.put("link", link);
@@ -417,6 +426,16 @@
}
}
+ private String getAlipayNo(String payNo) {
+ // 鏇挎崲鍓�8浣�
+ String newNo = payNo.substring(9, payNo.length());
+ newNo = TimeUtil.getyyyyMMdd(java.lang.System.currentTimeMillis()) + newNo;
+ // 闅忔満鐢熸垚鏇挎崲鍚�6浣�
+ newNo = newNo.substring(0, payNo.length() - 6);
+ newNo += (long) ((Math.random() * 9 + 1) * 100000);
+ return newNo;
+ }
+
@RequestMapping(value = "getMoneyArrivalImg")
public void getMoneyArrivalImg(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
PreviewInfo previewInfo = previewInfoService.get(uid, PreviewEnum.moneyInfo);
@@ -473,7 +492,7 @@
PushContentDTO dto = PushMsgFactory.createInviteOrderStatisticed(Constant.SOURCE_TYPE_TAOBAO, orderId,
BigDecimal.ZERO);
try {
- pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);
+ pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null,acceptData.getSystem());
} catch (NumberFormatException e) {
e.printStackTrace();
} catch (PushException e) {
--
Gitblit v1.8.0