From a39422f2a8ce45dd6cf65701ed5f9e65391c46c1 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 23 七月 2019 11:03:35 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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..9211ca6 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;
@@ -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("绾㈠寘鎵ｉ櫎");
--
Gitblit v1.8.0