Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

Conflicts:
	src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
anderx 8 years ago
parent
commit
9731fffa6a

+ 1 - 1
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -420,7 +420,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		int i=achievementMapper.countInterest(a.getId());
 		a.setCountInterest(String.valueOf(i));
 		String uid=TokenManager.getUserId();
-		if(StringUtils.isNotBlank(TokenManager.getUserId())&&achievementInterestMapper.checkUidAndDid(uid,id)>0){
+		if(TokenManager.isLogin()&&achievementInterestMapper.checkUidAndDid(uid,id)>0){
 			a.setInterest("1");
 		}else {
 			a.setInterest("0");

+ 1 - 1
src/main/java/com/goafanti/business/service/impl/BusinessProjectServiceImpl.java

@@ -151,7 +151,7 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 	@Override
 	public ProjectDetailBo orgProject(String id) {
 		ProjectDetailBo pd=businessProjectMapper.selectAppProjectDetail(id);
-		if (StringUtils.isNotBlank(TokenManager.getUserId())&&projectInterestMapper.checkUidAndDid(id,TokenManager.getUserId())>0) {
+		if (TokenManager.isLogin()&&projectInterestMapper.checkUidAndDid(id,TokenManager.getUserId())>0) {
 			pd.setInterest("1");
 		}else {
 			pd.setInterest("0");

+ 6 - 0
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1233,6 +1233,11 @@
 		    ui.username as iOwnerName, ui.province, ui.city, ui.area, u.email as iOwnerEmail,
 			ui.id_number as iOwnerIdNumber, u.mobile as iOwnerMobile,j.easemob_name as easemobName,
 			ifnull(t.x,0) as orderIntentionCount ,ifnull(t2.x,0) as orderCount
+
+			ui.id_number as iOwnerIdNumber, u.mobile as iOwnerMobile,j.easemob_name as easemobName,a.remark,
+			ifnull(t.x,0) as orderIntentionCount ,ifnull(t2.x,0) as orderCount,ifnull(mm.effective,0) hot,a.boutique,
+			a.international_flag as internationalFlag
+
     from achievement a
     left join user_identity ui on a.owner_id = ui.uid
     left join field_glossory f on a.field_a=f.id
@@ -1247,6 +1252,7 @@
 				group by  tl.commodity_id) t2 on a.id=t2.commodity_id 
     left join jpush_easemob_account j on a.owner_id=j.uid
     left join user u on u.id = a.owner_id
+    left join marketing_management mm on a.id = mm.product_id
   where a.id =#{id,jdbcType=VARCHAR}
   </select>
   

+ 1 - 1
src/main/java/com/goafanti/common/mapper/NewsMapper.xml

@@ -231,7 +231,7 @@
   <select id="portalNewsList" resultType="com.goafanti.news.bo.NewsPortalList">
 		select
 			a.id,
-			DATE_FORMAT(a.create_time,'%Y-%d-%m') as createTime,
+			DATE_FORMAT(a.create_time,'%Y-%m-%d') as createTime,
 			a.title,
 			a.title_img as titleImg,
 			a.type,

+ 1 - 1
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -806,7 +806,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		int i=demandMapper.countInterest(d.getId());
 		d.setCountInterest(String.valueOf(i));
 		String uid=TokenManager.getUserId();
-		if(StringUtils.isNotBlank(TokenManager.getUserId())&&demandInterestMapper.checkUidAndDid(uid,id)>0){
+		if(TokenManager.isLogin()&&demandInterestMapper.checkUidAndDid(uid,id)>0){
 			d.setInterest("1");//已关注
 		}else {
 			d.setInterest("0");//未关注

+ 2 - 2
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -323,7 +323,7 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 			u.setCountInterest(String.valueOf(userInterestMapper.countByToUid(u.getUid())));
 		}
 		String id=TokenManager.getUserId();
-		if(userInterestMapper.checkUidAndDid(uid,id)>0){
+		if(TokenManager.isLogin()&&userInterestMapper.checkUidAndDid(uid,id)>0){
 			u.setInterest("1");
 		}else {
 			u.setInterest("0");
@@ -395,7 +395,7 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 	@Override
 	public consultantListBo consultantDetail(String id) {
 		consultantListBo c=userIdentityMapper.selectconsultantByUid(id);
-		if (StringUtils.isNotBlank(TokenManager.getUserId())&&userInterestMapper.checkUidAndDid(id, TokenManager.getUserId())>0) {
+		if (TokenManager.isLogin()&&userInterestMapper.checkUidAndDid(id, TokenManager.getUserId())>0) {
 			c.setInterest("1");
 		}else {
 			c.setInterest("0");

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/aboutUs.html

@@ -169,7 +169,7 @@
  		</div>
  		</div>
  		<div class="history container" id="development">
- 			<h4><img src="http://127.0.0.1/portal/2.0.6/img/aboutUs02.jpg'}" alt="" />发展历程     <span>DEVELOPMENT HISTORY</span></h4>
+ 			<h4><img th:src="${portalHost+'/img/aboutUs02.jpg'}" alt=""  />发展历程     <span>DEVELOPMENT HISTORY</span></h4>
  			<div class="historyBanner">
  				<ul>
  					<li>