From 0f9a0a76b170bceac867dd5cd009e518ac6646e4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 20 十一月 2019 11:04:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/TBPidServiceImpl.java | 35 +++++++++--------------------------
1 files changed, 9 insertions(+), 26 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TBPidServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TBPidServiceImpl.java
index 0d23897..765bc4e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TBPidServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TBPidServiceImpl.java
@@ -12,16 +12,12 @@
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.NameValuePair;
import org.apache.commons.httpclient.methods.PostMethod;
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
-import org.springframework.orm.hibernate4.HibernateCallback;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.yeshi.utils.HttpUtil;
-import com.yeshi.fanli.dao.mybatis.TBPidMapper;
import com.yeshi.fanli.dao.mybatis.share.PidUserMapper;
-import com.yeshi.fanli.dao.taobao.TBPidDao;
+import com.yeshi.fanli.dao.mybatis.taobao.TBPidMapper;
import com.yeshi.fanli.entity.taobao.ClientTBPid;
import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.TBPid;
@@ -29,15 +25,12 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.TBPidService;
-import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.TaoBaoConstant;
import net.sf.json.JSONObject;
@Service
public class TBPidServiceImpl implements TBPidService {
-
- @Resource
- private TBPidDao tbPidDao;
@Resource
private TBPidMapper tbPidMapper;
@@ -80,13 +73,8 @@
e.printStackTrace();
}
- Long count = (Long) tbPidDao.excute(new HibernateCallback<Long>() {
-
- @Override
- public Long doInHibernate(Session session) throws HibernateException {
- return Long.parseLong(session.createQuery("select count(*) from TBPid").uniqueResult().toString());
- }
- });
+ Long count = tbPidMapper.count();
+
String name = "quanqudao_" + count;
String cookies = getCookie();
@@ -154,13 +142,8 @@
e.printStackTrace();
}
- Long count = (Long) tbPidDao.excute(new HibernateCallback<Long>() {
-
- @Override
- public Long doInHibernate(Session session) throws HibernateException {
- return Long.parseLong(session.createQuery("select count(*) from TBPid").uniqueResult().toString());
- }
- });
+ Long count = tbPidMapper.count();
+
String name = "tuiguang_" + count;
String cookies = getCookieBuXin();
@@ -223,7 +206,7 @@
tbPid.setCreatetime(System.currentTimeMillis());
tbPid.setName(name);
tbPid.setPid(pid);
- tbPidDao.create(tbPid);
+ tbPidMapper.insert(tbPid);
return true;
} else {
System.out.println(result);
@@ -373,8 +356,8 @@
@Override
public ClientTBPid getSharePid() {
- String pid = Constant.TAOBAO_RELATION_PID_DEFAULT;
- ClientTBPid clientTBPid = new ClientTBPid(Constant.TAOBAO_AUTH_APPKEY, pid, pid.split("_")[2],
+ String pid = TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT;
+ ClientTBPid clientTBPid = new ClientTBPid(TaoBaoConstant.TAOBAO_AUTH_APPKEY, pid, pid.split("_")[2],
pid.split("_")[3]);
return clientTBPid;
}
--
Gitblit v1.8.0