From 784af16411d97c3e14f81dd4ebf1380c8b9effb0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 31 七月 2019 10:33:18 +0800
Subject: [PATCH] 智能推荐修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
index 2ce75b7..712136c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
@@ -24,6 +24,7 @@
 import com.yeshi.fanli.entity.bus.user.UserMoneyExtra;
 import com.yeshi.fanli.entity.goods.CommonGoods;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
 import com.yeshi.fanli.exception.taobao.TaoKeApiException;
 import com.yeshi.fanli.exception.tlj.UserTaoLiJinRecordException;
 import com.yeshi.fanli.log.LogHelper;
@@ -228,8 +229,8 @@
 			throw new UserTaoLiJinRecordException(101, "绾㈠寘浣欓涓嶈冻");
 		}
 
-		// 杩囨湡
-		userTaoLiJinOriginService.overdueHongBao(uid);
+		// 杩囨湡 -鍙栨秷鏀跺洖
+		// userTaoLiJinOriginService.overdueHongBao(uid);
 		
 		// 鎬绘帹骞跨孩鍖�
 		BigDecimal totalMoney = MoneyBigDecimalUtil.mul(perface, new BigDecimal(totalNum));
@@ -253,7 +254,7 @@
 		TaoLiJinDTO taoLiJinDTO = null;
 		try {
 			taoLiJinDTO = TaoKeApiUtil.createTaoLiJin(auctionId, name, perface, totalNum, sendStartTime,
-					sendEndTime, useStartTime, useEndTime, pid);
+					sendEndTime, useStartTime, useEndTime,	new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET, pid));
 		} catch (TaoKeApiException e) {
 			LogHelper.errorDetailInfo(e);
 			executor.execute(new Runnable() {
@@ -374,9 +375,8 @@
 				
 				// 浣跨敤鎴愬姛娑堟伅
 				try {
-					String beizhu = "鏈棰嗗彇/浣跨敤鐨勯儴鍒嗗皢浼氶��鍥�";
-
-					SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd hh.mm");
+					String beizhu = "鏈棰嗗彇鎴栭鍙栧悗鏈娇鐢ㄩ儴鍒嗛��鍥�";
+					SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH.mm");
 					String time = sd.format(new Date());
 					MsgOtherTaoLiJinContentDTO content = new MsgOtherTaoLiJinContentDTO();
 					content.setState("绾㈠寘鎵i櫎");

--
Gitblit v1.8.0