From 21feddfa5f7d1482e7a8a9ef6c36379f0ee9a146 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 五月 2020 18:17:53 +0800
Subject: [PATCH] 支付宝订单号随机生成
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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..168319d 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,6 +36,7 @@
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;
@@ -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);
--
Gitblit v1.8.0