From 69bee82b81626b82b7f39f0e459e4f56b1699b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:02:16 +0800
Subject: [PATCH] 正式数据库修改
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 22eec15..a75cd85 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -23,6 +23,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.exception.TaoBaoWeiQuanException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.lable.BoutiqueAutoRuleService;
import com.yeshi.fanli.service.inter.lable.LabelService;
import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
@@ -67,6 +68,9 @@
@Resource
private UserSystemCouponService userSystemCouponService;
+
+ @Resource
+ private ThreeSaleSerivce threeSaleSerivce;
private static boolean isInited = false;
@@ -209,7 +213,7 @@
}
} catch (Exception e) {
try {
- LogHelper.errorDetailInfo(e,"HongBaoV2-ID:"+map.get(handler).getId(),"");
+ LogHelper.errorDetailInfo(e, "HongBaoV2-ID:" + map.get(handler).getId(), "");
} catch (Exception e1) {
e1.printStackTrace();
}
@@ -407,10 +411,8 @@
while (true) {
try {
-
Map<String, ThreeSale> map = ThreeSaleCMQManager.getInstance()
.consumeQueueMsg(ThreeSaleCMQManager.QUEUE_USER_COUPON, 16);
-
if (map != null) {
Iterator<String> its = map.keySet().iterator();
@@ -418,11 +420,21 @@
String key = its.next();
try {
ThreeSale threeSale = map.get(key);
+ if (threeSale != null)
+ threeSale = threeSaleSerivce.selectByPrimaryKey(threeSale.getId());
if (threeSale != null) {
if (threeSale.getState() != null && threeSale.getState() == true) {
// 閭�璇锋垚鍔� - 鍒告縺娲荤敓鏁�
+ LogHelper.test("doThreeSaleUserCouponJob-" + threeSale.getId());
+
Long bossId = threeSale.getBoss().getId();
- userSystemCouponService.activatedWelfareFreeCoupon(bossId);
+ // 涓嬬骇鏄电О
+
+ String workerNickName = userInfoService
+ .selectByPKey(threeSale.getWorker().getId()).getNickName();
+
+ userSystemCouponService.activatedWelfareFreeCoupon(bossId,
+ workerNickName);
}
}
ThreeSaleCMQManager.getInstance()
--
Gitblit v1.8.0