Merge branch 'master' of http://git.zthymaoyi.com/wangchao/businessCard

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICircleFriendsDetailService.java

@@ -41,6 +41,10 @@ public interface ICircleFriendsDetailService{
 	@HttpMethod(description = "删除",permissionName = "记录朋友圈互动信息管理")
 	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
 
+	@HttpMethod(description = "取消点赞",permissionName = "记录朋友圈互动信息管理")
+	public Boolean cancelLike(@NotNull @HttpParam(name = "circleFriendsId", type = HttpParamType.COMMON, description = "朋友圈id")Long circleFriendsId,
+							  @HttpParam(name = "commonId", type = HttpParamType.COMMON, description = "发表人id") Long commonId)throws ServiceException;
+
 	@HttpMethod(description = "修改",  permissionName = "记录朋友圈互动信息管理")
 	public Boolean update(@NotNull @HttpParam(name = "circleFriendsDetail", type = HttpParamType.COMMON, description = "记录朋友圈互动信息") CircleFriendsDetail circleFriendsDetail)throws ServiceException;
 

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICircleFriendsInfoService.java

@@ -25,8 +25,8 @@ public interface ICircleFriendsInfoService{
 	@HttpMethod(description = "列表",  permissionName = "记录朋友圈信息管理")
 	public Page<CircleFriendsInfo> list(
 								@HttpParam(name = "circleId", type = HttpParamType.COMMON, description = "圈子id") Long circleId,
-								@HttpParam(name = "commonId", type = HttpParamType.COMMON, description = "朋友圈发布人id") Long commonId,
 								@HttpParam(name = "currentCommonId", type = HttpParamType.COMMON, description = "当前登录人id") Long currentCommonId,
+								@HttpParam(name = "commonId", type = HttpParamType.COMMON, description = "朋友圈发布人id") Long commonId,
 								@HttpParam(name = "head", type = HttpParamType.COMMON, description = "头像") String head,
 							@HttpParam(name = "nickname", type = HttpParamType.COMMON, description = "昵称") String nickname,
 							@HttpParam(name = "content", type = HttpParamType.COMMON, description = "朋友圈内容") String content,

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CircleFriendsDetailServiceImpl.java

@@ -3,6 +3,7 @@ package com.iotechn.unimall.admin.api.card.impl;
 import java.util.List;
 
 import com.iotechn.unimall.admin.api.card.ICircleFriendsDetailService;
+import com.iotechn.unimall.data.domain.CardExchangeInfo;
 import com.iotechn.unimall.data.domain.CircleFriendsDetail;
 import com.iotechn.unimall.data.mapper.CircleFriendsDetailMapper;
 import org.apache.ibatis.session.RowBounds;
@@ -90,6 +91,22 @@ public class CircleFriendsDetailServiceImpl implements ICircleFriendsDetailServi
 		return true;
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public Boolean cancelLike(Long circleFriendsId, Long commonId) throws ServiceException {
+		CircleFriendsDetail circleFriendsDetail = new CircleFriendsDetail();
+		circleFriendsDetail.setCircleFriendsId(circleFriendsId);
+		circleFriendsDetail.setCommonId(commonId);
+		circleFriendsDetail.setInteractionFlag("1");
+		circleFriendsDetail.setDeleteFlag(0l);
+		CircleFriendsDetail circleFriendsDetail1=circleFriendsDetailMapper.selectOne(circleFriendsDetail);
+		if (circleFriendsDetail1!=null){
+			circleFriendsDetail1.setDeleteFlag(1l);
+			circleFriendsDetailMapper.updateById(circleFriendsDetail1);
+		}
+		return true;
+	}
+
 	@Override
 	public Boolean update(CircleFriendsDetail circleFriendsDetail) throws ServiceException {
 		Date now = new Date();

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CircleFriendsInfoServiceImpl.java

@@ -113,7 +113,7 @@ public class CircleFriendsInfoServiceImpl implements ICircleFriendsInfoService {
 						.eq("interaction_flag","2"));
 				if(!CollectionUtils.isEmpty(circleFriendsDetailList1)){
 					circleFriendsInfo.setCircleFriendsDetailList1(circleFriendsDetailList1);
-					circleFriendsInfo.setCount(circleFriendsDetailList1.size());
+					circleFriendsInfo.setCount1(circleFriendsDetailList1.size());
 				}
 			}
 		}