From 8cb7ec4a35a38ae91d0eed17cde711e81d2b2bbf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:37:49 +0800
Subject: [PATCH] 合并
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 78 +++++++++++++++++++++++++++++++++++++-
1 files changed, 75 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
index d4a6051..85bccc3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.util;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -15,6 +16,7 @@
import org.yeshi.utils.tencentcloud.COSManager;
import org.yeshi.utils.tencentcloud.entity.COSInitParams;
+import com.yeshi.fanli.dto.money.UserMoneyChangeDTO;
import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
@@ -27,11 +29,15 @@
import com.yeshi.fanli.service.inter.lable.BoutiqueAutoRuleService;
import com.yeshi.fanli.service.inter.lable.LabelService;
import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
+import com.yeshi.fanli.service.inter.money.UserMoneyDebtService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.push.IOSPushService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.user.ExtractService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.util.cmq.ThreeSaleCMQManager;
+import com.yeshi.fanli.util.cmq.UserMoneyChangeCMQManager;
/**
* 绯荤粺鍒濆鍖�
@@ -72,6 +78,15 @@
@Resource
private ThreeSaleSerivce threeSaleSerivce;
+ @Resource
+ private TaoBaoOrderService taoBaoOrderService;
+
+ @Resource
+ private RedisManager redisManager;
+
+ @Resource
+ private UserMoneyDebtService userMoneyDebtService;
+
private static boolean isInited = false;
public void onApplicationEvent(ContextRefreshedEvent arg0) {
@@ -100,9 +115,10 @@
doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
doThreeSaleUserCouponJob();// 澶勭悊閭�璇烽槦鍒�
doUpdateGoodsJob();
+ doUserMoneyDebtJob();// 鍊哄姟鍋胯繕
} else if (!Constant.IS_TEST) {
initScheduler();// 鍚姩瀹氭椂浠诲姟
- //
+ //
}
}
@@ -165,7 +181,7 @@
*/
public void doTaoBaoOrders() {
// 鍚屾椂寮�鍚�3涓嚎绋嬪鐞�
- for (int i = 0; i < 3; i++) {
+ for (int i = 0; i < 1; i++) {
executor.execute(new Runnable() {
@Override
public void run() {
@@ -174,6 +190,13 @@
// 鍙�16涓鍗�
Map<String, List<TaoBaoOrder>> map = CMQManager.getInstance().consumeTaoBaoOrderMsg(16);
if (map != null) {
+ // 浠庡簱閲岄潰鏌ヨ
+ Iterator<String> its = map.keySet().iterator();
+ while (its.hasNext()) {
+ String orderId = its.next();
+ List<TaoBaoOrder> orderList = taoBaoOrderService.getTaoBaoOrderByOrderId(orderId);
+ map.put(orderId, orderList);
+ }
orderProcessService.processOrder(map);
}
} catch (Exception e) {
@@ -204,7 +227,15 @@
while (its.hasNext()) {
String handler = its.next();
try {
- orderProcessService.fanli(map.get(handler));
+ HongBaoV2 hongbao = map.get(handler);
+ if (hongbao != null) {
+ String key = "hongbao-fanli-" + hongbao.getId();
+ if (StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
+ // 澶勭悊涔嬪悗瑕侀殧2灏忔椂鍐嶆杩涜澶勭悊
+ redisManager.cacheCommonString(key, "1", 60 * 60 * 2);
+ orderProcessService.fanli(map.get(handler));
+ }
+ }
CMQManager.getInstance().deleteFanLiMsgNew(handler);
} catch (TaoBaoWeiQuanException e) {
try {
@@ -458,4 +489,45 @@
});
}
+
+ /**
+ * 鐢ㄦ埛鍊熻捶澶勭悊
+ */
+ public void doUserMoneyDebtJob() {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ try {
+ Map<String, UserMoneyChangeDTO> map = UserMoneyChangeCMQManager.getInstance()
+ .consumeQueueMsg(UserMoneyChangeCMQManager.QUEUE_DEBT, 16);
+ if (map != null) {
+
+ Iterator<String> its = map.keySet().iterator();
+ while (its.hasNext()) {
+ String key = its.next();
+ try {
+ UserMoneyChangeDTO dto = map.get(key);
+ if (dto != null && dto.getChangeMoney().compareTo(new BigDecimal(0)) > 0) {
+ userMoneyDebtService.repayDebt(dto.getUid());
+ }
+ UserMoneyChangeCMQManager.getInstance()
+ .deleteQueueMsg(UserMoneyChangeCMQManager.QUEUE_DEBT, key);
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ LogHelper.error("杩樻鍑洪敊:" + e.getMessage());
+
+ }
+ }
+ }
+ });
+ }
}
--
Gitblit v1.8.0